branch: externals/org
commit 784838b4f9c481385965631cf0fd05ef5e8176c6
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>

    testing/lisp/test-ob-maxima.el: Do not load user rc file for tests
    
    * testing/lisp/test-ob-maxima.el (ob-maxima--without-rc): New helper
    macro.
    (ob-maxima/integer-input):
    (ob-maxima/string-input):
    (ob-maxima/simple-list-input):
    (ob-maxima/list-input):
    (ob-maxima/table-input1):
    (ob-maxima/table-input2):
    (ob-maxima/matrix-output):
    (ob-maxima/batch+verbatim+quiet):
    (ob-maxima/batch+verbatim+:lisp):
    (ob-maxima/batch+verbatim+empty-string):
    (ob-maxima/batch+verbatim+whitespace-string):
    (ob-maxima/batch+verbatim+syntax-error):
    (ob-maxima/batch+verbatim+eof-error): Update the tests.
---
 testing/lisp/test-ob-maxima.el | 73 +++++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 29 deletions(-)

diff --git a/testing/lisp/test-ob-maxima.el b/testing/lisp/test-ob-maxima.el
index 4320c46137..49bf48c68c 100644
--- a/testing/lisp/test-ob-maxima.el
+++ b/testing/lisp/test-ob-maxima.el
@@ -22,49 +22,64 @@
 (unless (featurep 'ob-maxima)
   (signal 'missing-test-dependency '("Support for Maxima code blocks")))
 
+(defmacro ob-maxima--without-rc (&rest body)
+  "Run body arranging maxima calls to ignore init file."
+  (declare (debug (body)))
+  `(let ((org-babel-maxima--command-arguments-default
+          (concat org-babel-maxima--command-arguments-default
+                  " --norc")))
+     ,@body))
+
 (ert-deftest ob-maxima/integer-input ()
   "Test of integer input"
-  (org-test-at-id "b5842ed4-8e8b-4b18-a1c9-cef006b6a6c8"
-    (org-babel-next-src-block)
-    (should (equal 4 (org-babel-execute-src-block)))))
+  (ob-maxima--without-rc
+   (org-test-at-id "b5842ed4-8e8b-4b18-a1c9-cef006b6a6c8"
+     (org-babel-next-src-block)
+     (should (equal 4 (org-babel-execute-src-block))))))
 
 (ert-deftest ob-maxima/string-input ()
   "Test of string input"
-  (org-test-at-id "b5842ed4-8e8b-4b18-a1c9-cef006b6a6c8"
-    (org-babel-next-src-block 2)
-    (should (equal "- sin(x)" (org-babel-execute-src-block)))))
+  (ob-maxima--without-rc
+   (org-test-at-id "b5842ed4-8e8b-4b18-a1c9-cef006b6a6c8"
+     (org-babel-next-src-block 2)
+     (should (equal "- sin(x)" (org-babel-execute-src-block))))))
 
 (ert-deftest ob-maxima/simple-list-input ()
   "Test of flat list input"
-  (org-test-at-id "b5561c6a-73cd-453a-ba5e-62ad84844de6"
-    (org-babel-next-src-block)
-    (should (equal "[1, 2, 3] " (org-babel-execute-src-block)))))
+  (ob-maxima--without-rc
+   (org-test-at-id "b5561c6a-73cd-453a-ba5e-62ad84844de6"
+     (org-babel-next-src-block)
+     (should (equal "[1, 2, 3] " (org-babel-execute-src-block))))))
 
 (ert-deftest ob-maxima/list-input ()
   "Test of list input"
-  (org-test-at-id "b5561c6a-73cd-453a-ba5e-62ad84844de6"
-    (org-babel-next-src-block 2)
-    (should (equal "[2, [2, 3], 4] " (org-babel-execute-src-block)))))
+  (ob-maxima--without-rc
+   (org-test-at-id "b5561c6a-73cd-453a-ba5e-62ad84844de6"
+     (org-babel-next-src-block 2)
+     (should (equal "[2, [2, 3], 4] " (org-babel-execute-src-block))))))
 
 (ert-deftest ob-maxima/table-input1 ()
   "Test of table input"
-  (org-test-at-id "400ee228-6b12-44fd-8097-7986f0f0db43"
-    (org-babel-next-src-block)
-    (should (equal "[[2.0], [3.0]] " (org-babel-execute-src-block)))))
+  (ob-maxima--without-rc
+   (org-test-at-id "400ee228-6b12-44fd-8097-7986f0f0db43"
+     (org-babel-next-src-block)
+     (should (equal "[[2.0], [3.0]] " (org-babel-execute-src-block))))))
 
 (ert-deftest ob-maxima/table-input2 ()
   "Test of table input"
-  (org-test-at-id "400ee228-6b12-44fd-8097-7986f0f0db43"
-    (org-babel-next-src-block 2)
-    (should (equal "[[2.0, 3.0]] " (org-babel-execute-src-block)))))
+  (ob-maxima--without-rc
+   (org-test-at-id "400ee228-6b12-44fd-8097-7986f0f0db43"
+     (org-babel-next-src-block 2)
+     (should (equal "[[2.0, 3.0]] " (org-babel-execute-src-block))))))
 
 (ert-deftest ob-maxima/matrix-output ()
   "Test of table output"
-  (org-test-at-id "cc158527-b867-4b1d-8ae0-b8c713a90fd7"
-    (org-babel-next-src-block)
-    (should
-     (equal
-      '((1 2 3) (2 3 4) (3 4 5)) (org-babel-execute-src-block)))))
+  (ob-maxima--without-rc
+   (org-test-at-id "cc158527-b867-4b1d-8ae0-b8c713a90fd7"
+     (org-babel-next-src-block)
+     (should
+      (equal
+       '((1 2 3) (2 3 4) (3 4 5)) (org-babel-execute-src-block))))))
 
 
 ;; 6 tests to test the :batch header argument
@@ -86,7 +101,7 @@ Since `--quiet' is set, the input and output are printed with
 labels."
   (org-test-with-temp-text
       (format "#+name: ob-maxima/batch+verbatim
-#+begin_src maxima :results verbatim :batch batch :cmdline --quiet
+#+begin_src maxima :results verbatim :batch batch :cmdline --quiet --norc
 (assume(z>0),
 integrate(exp(-t)*t^z, t, 0, inf));
 #+end_src")
@@ -98,7 +113,7 @@ integrate(exp(-t)*t^z, t, 0, inf));
 Since `--quiet' is set, the output is printed (as a lisp form)."
   (org-test-with-temp-text
       (format "#+name: ob-maxima/batch+verbatim+:lisp
-#+begin_src maxima :results verbatim :batch batch :cmdline --quiet
+#+begin_src maxima :results verbatim :batch batch :cmdline --quiet --norc
 :lisp #$(assume(z>0),integrate(exp(-t)*t^z, t, 0, inf));#$
 #+end_src
 ")
@@ -122,7 +137,7 @@ Since `--quiet' is set, the input and output are printed 
with
 labels."
   (org-test-with-temp-text
       (format "#+name: ob-maxima/batch+verbatim+empty-string
-#+begin_src maxima :results verbatim :batch batch :cmdline --quiet
+#+begin_src maxima :results verbatim :batch batch :cmdline --quiet --norc
 \"\";
 #+end_src
 ")
@@ -134,7 +149,7 @@ Since `--quiet' is set, the input and output are printed 
with
 labels."
   (org-test-with-temp-text
       (format "#+name: ob-maxima/batch+verbatim+whitespace-string
-#+begin_src maxima :results verbatim :batch batch :cmdline --quiet
+#+begin_src maxima :results verbatim :batch batch :cmdline --quiet --norc
 \" \";
 #+end_src
 ")
@@ -146,7 +161,7 @@ labels."
 Send empty input line to Maxima."
   (org-test-with-temp-text
       (format "#+name: ob-maxima/batch+verbatim+syntax-error
-#+begin_src maxima  :results verbatim :batch batch :cmdline --quiet
+#+begin_src maxima  :results verbatim :batch batch :cmdline --quiet --norc
 ;
 #+end_src
 ")
@@ -158,7 +173,7 @@ Send empty input line to Maxima."
 Send an incomplete expression to Maxima."
   (org-test-with-temp-text
       (format "#+name: ob-maxima/batch+verbatim+eof-error
-#+begin_src maxima  :results verbatim :batch batch :cmdline --quiet
+#+begin_src maxima  :results verbatim :batch batch :cmdline --quiet --norc
 x:
 #+end_src
 ")

Reply via email to