mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 21:37:50 +00:00
ob-java.el: Change the default back to scripting mode
* lisp/ob-java.el (org-babel-default-header-args:java): Change the default to scripting mode. * testing/lisp/test-ob-java.el: Modify the first test to use the default for `:results' and all others to specify it. A recent commit added functional mode and made it default, but this would break java source blocks for anyone that relied on the old default. This sets the default back to scripting mode.
This commit is contained in:
parent
ad2115f2c1
commit
ce02d52bc4
|
@ -35,8 +35,14 @@
|
|||
|
||||
(defvar org-babel-temporary-directory) ; from ob-core
|
||||
|
||||
(defvar org-babel-default-header-args:java '()
|
||||
"Default header args for java source blocks.")
|
||||
(defvar org-babel-default-header-args:java '((:results . "output"))
|
||||
"Default header args for java source blocks.
|
||||
The docs say functional mode should be the default [1], but
|
||||
ob-java didn't support functional mode until recently, so we keep
|
||||
scripting mode as the default for now to maintain existing
|
||||
behavior.
|
||||
|
||||
[1] https://orgmode.org/manual/Results-of-Evaluation.html")
|
||||
|
||||
(defconst org-babel-header-args:java '((imports . :any))
|
||||
"Java-specific header arguments.")
|
||||
|
|
|
@ -37,9 +37,10 @@
|
|||
; simple tests
|
||||
|
||||
(ert-deftest ob-java/simple ()
|
||||
"Hello world program that writes output."
|
||||
"Hello world program that writes output. Also tests that
|
||||
ob-java defaults to scripting mode."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :results output silent
|
||||
"#+begin_src java :results silent
|
||||
System.out.print(42);
|
||||
#+end_src"
|
||||
(should (string= "42" (org-babel-execute-src-block)))))
|
||||
|
@ -63,7 +64,7 @@ System.out.print(\"\\\"42\\\"\");
|
|||
(ert-deftest ob-java/simple-return-int ()
|
||||
"Hello world program that returns an int value."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :results silent
|
||||
"#+begin_src java :results value silent
|
||||
return 42;
|
||||
#+end_src"
|
||||
(should (eq 42 (org-babel-execute-src-block)))))
|
||||
|
@ -71,7 +72,7 @@ return 42;
|
|||
(ert-deftest ob-java/simple-return-float ()
|
||||
"Hello world program that returns a float value."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :results silent
|
||||
"#+begin_src java :results value silent
|
||||
return 42.0;
|
||||
#+end_src"
|
||||
(should (equal 42.0 (org-babel-execute-src-block)))))
|
||||
|
@ -79,7 +80,7 @@ return 42.0;
|
|||
(ert-deftest ob-java/simple-return-string ()
|
||||
"Hello world program that returns a string value."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :results silent
|
||||
"#+begin_src java :results value silent
|
||||
return \"forty two\";
|
||||
#+end_src"
|
||||
(should (string= "forty two" (org-babel-execute-src-block)))))
|
||||
|
@ -291,7 +292,7 @@ System.out.print(String.format(\"%s, len=%d\", a, a.length()));
|
|||
(ert-deftest ob-java/return-vector-using-list ()
|
||||
"Return a vector using a list."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :results vector silent
|
||||
"#+begin_src java :results value vector silent
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
List<List<Integer>> a = Arrays.asList(Arrays.asList(4),
|
||||
|
@ -304,7 +305,7 @@ return a;
|
|||
(ert-deftest ob-java/return-vector-using-array ()
|
||||
"Return a vector using an array."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :results vector silent
|
||||
"#+begin_src java :results value vector silent
|
||||
Integer[][] a = {{4}, {2}};
|
||||
return a;
|
||||
#+end_src"
|
||||
|
@ -314,7 +315,7 @@ return a;
|
|||
(ert-deftest ob-java/read-return-list ()
|
||||
"Read and return a list."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :var a=java_list :results silent
|
||||
"#+begin_src java :var a=java_list :results value silent
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
List<String> b = Arrays.asList(a.get(0).get(0),
|
||||
|
@ -331,7 +332,7 @@ return b;
|
|||
(ert-deftest ob-java/read-list-return-array ()
|
||||
"Read a list and return an array."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :var a=java_list :results silent
|
||||
"#+begin_src java :var a=java_list :results value silent
|
||||
String[] b = {a.get(0).get(0), a.get(1).get(0)};
|
||||
return b;
|
||||
#+end_src
|
||||
|
@ -345,7 +346,7 @@ return b;
|
|||
(ert-deftest ob-java/read-return-list-with-package ()
|
||||
"Return a vector."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :var a=java_list :results silent
|
||||
"#+begin_src java :var a=java_list :results value silent
|
||||
package pkg;
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
@ -375,7 +376,7 @@ System.out.println(\"forty two\");
|
|||
(ert-deftest ob-java/list-var ()
|
||||
"Read and write a list variable."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :var a='(\"forty\" \"two\") :results silent
|
||||
"#+begin_src java :var a='(\"forty\" \"two\") :results value silent
|
||||
import java.util.List;
|
||||
List<String> b = a;
|
||||
return b;
|
||||
|
@ -386,7 +387,7 @@ return b;
|
|||
(ert-deftest ob-java/vector-var ()
|
||||
"Read and write a vector variable."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :var a='[\"forty\" \"two\"] :results silent
|
||||
"#+begin_src java :var a='[\"forty\" \"two\"] :results value silent
|
||||
import java.util.List;
|
||||
List<String> b = a;
|
||||
return b;
|
||||
|
@ -397,7 +398,7 @@ return b;
|
|||
(ert-deftest ob-java/matrix-var ()
|
||||
"Read and write matrix variable."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :var a=java_matrix :results silent
|
||||
"#+begin_src java :var a=java_matrix :results value silent
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
List<List<Integer>> b = Arrays.asList(Arrays.asList(a.get(0).get(0), a.get(1).get(0)),
|
||||
|
@ -455,7 +456,7 @@ for (int ii=0; ii<a.size(); ii++) {
|
|||
(ert-deftest ob-java/inhomogeneous_table ()
|
||||
"Read and write an inhomogeneous table."
|
||||
(org-test-with-temp-text
|
||||
"#+begin_src java :var a=java_table :results silent
|
||||
"#+begin_src java :var a=java_table :results value silent
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
List<List> b = Arrays.asList(Arrays.asList(a.get(0).get(0),
|
||||
|
|
Loading…
Reference in a new issue