mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 04:02:51 +00:00
2ba45fcb78
* (org-babel-header-args:maxima): Document the two new header arguments (batch and graphics-pkg) that are specific to ob-maxima. * (org-babel-maxima--command-arguments-default): A new variable storing the default command-line argument(s). This value was hard-coded in `org-babel-maxima:execute'. * (org-babel-maxima--graphic-package-options): A new variable that stores an alist of Maxima graphics packages and the Maxima code to set up that package. * (org-babel-maxima--default-epilogue): A new variable that stores an alist of the clean-up code that is run at end of a `graphical-output' or `non-graphical-output' source block. * (org-babel-maxima--output-filter-regexps): A new variable that stores a list of regexps to identify "bad" output lines to be removed from Maxima's output. Source-code comments document each regexp's purpose. Two additional regexps have been added: one filters un-wanted output from `batch' and the other removes empty input lines that `batch'-ed output may spuriously produce (actual empty input lines are syntax errors, see the new tests below). * (org-babel-maxima--output-filter): A new function that takes a single line of Maxima output. It returns nil if the line has zero length or matches a regexp in `org-babel-maxima--output-filter-regexps'; otherwise, it returns the line. This function and regexp replace the hard-coded filter in `org-babel-execute:maxima'. * (org-babel-maxima-expand): Prepare the source block for execution, depending on whether it is producing graphical output or not. In case of graphical output, use the `graphics-pkg' header to set the graphics package and use `org-babel-maxima--graphic-package-options' to set-up the package. Grovel the graphics terminal from the output filename. * (org-babel-execute:maxima): Use the :batch header argument and `org-babel-maxima--command-arguments-default' to execute the source block. Replace the existing, in-line output filter and its regexps with `org-babel-maxima--output-filter' and `org-babel-maxima--output-filter-regexps'. * testing/examples/ob-maxima-test.org: Add test examples. Include examples of the batch-related tests from testing/lisp/test-ob-maxima.el. Provide an example of the `:graphics-pkg' header argument with the `draw' package. * testing/lisp/test-ob-maxima.el: Introduce six new, batch-related test functions. Each test exercises the :batch header argument. The response to unusual inputs is tested (empty strings, strings with just whitespace, input with the `:lisp' reader, and two syntax-related errors). link: https://list.orgmode.org/87cyz1ivzw.fsf@t14.reltub.ca/
173 lines
6.3 KiB
EmacsLisp
173 lines
6.3 KiB
EmacsLisp
;;; test-ob-maxima.el --- tests for ob-maxima.el -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (c) 2010-2014, 2019 Sergey Litvinov
|
|
;; Authors: Sergey Litvinov
|
|
|
|
;; This file is not part of GNU Emacs.
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
(org-test-for-executable "maxima")
|
|
(unless (featurep 'ob-maxima)
|
|
(signal 'missing-test-dependency "Support for Maxima code blocks"))
|
|
|
|
(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)))))
|
|
|
|
(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)))))
|
|
|
|
(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)))))
|
|
|
|
(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)))))
|
|
|
|
(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)))))
|
|
|
|
(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)))))
|
|
|
|
(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)))))
|
|
|
|
|
|
;; 6 tests to test the :batch header argument
|
|
(ert-deftest ob-maxima/batch+verbatim ()
|
|
"Exercise the `:batch' header argument.
|
|
Since `--very-quiet' is set, the input and output are printed
|
|
without labels."
|
|
(org-test-with-temp-text
|
|
(format "#+begin_src maxima :results verbatim :batch batch
|
|
(assume(z>0),
|
|
integrate(exp(-t)*t^z, t, 0, inf));
|
|
#+end_src")
|
|
(should (equal (org-babel-execute-src-block)
|
|
"(assume(z > 0),integrate(exp(-t)*t^z,t,0,inf))\n gamma(z + 1)"))))
|
|
|
|
(ert-deftest ob-maxima/batch+verbatim+quiet ()
|
|
"Exercise the `:batch' header argument.
|
|
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
|
|
(assume(z>0),
|
|
integrate(exp(-t)*t^z, t, 0, inf));
|
|
#+end_src")
|
|
(should (equal (org-babel-execute-src-block)
|
|
"(%i1) (assume(z > 0),integrate(exp(-t)*t^z,t,0,inf))\n(%o1) gamma(z + 1)"))))
|
|
|
|
(ert-deftest ob-maxima/batch+verbatim+:lisp ()
|
|
"Exercise the `:batch' header argument with `:lisp' reader.
|
|
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
|
|
:lisp #$(assume(z>0),integrate(exp(-t)*t^z, t, 0, inf));#$
|
|
#+end_src
|
|
")
|
|
(should (equal (org-babel-execute-src-block)
|
|
"((%GAMMA SIMP) ((MPLUS SIMP) 1 $Z))"))))
|
|
|
|
(ert-deftest ob-maxima/batch+verbatim+empty-string-vq ()
|
|
"Exercise the `:batch' header argument with empty string input.
|
|
Since `--very-quiet' is set, the output is printed."
|
|
(org-test-with-temp-text
|
|
(format "#+name: ob-maxima/batch+verbatim+empty-string-vq
|
|
#+begin_src maxima :results verbatim :batch batch :cmdline --very-quiet
|
|
\"\";
|
|
#+end_src
|
|
")
|
|
(should (equal (org-babel-execute-src-block) "\"\"\n "))))
|
|
|
|
(ert-deftest ob-maxima/batch+verbatim+empty-string ()
|
|
"Exercise the `:batch' header argument with empty string input.
|
|
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
|
|
\"\";
|
|
#+end_src
|
|
")
|
|
(should (equal (org-babel-execute-src-block) "(%i1) \"\"\n(%o1) "))))
|
|
|
|
(ert-deftest ob-maxima/batch+verbatim+whitespace-string ()
|
|
"Exercise the `:batch' header argument with whitespace input.
|
|
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
|
|
\" \";
|
|
#+end_src
|
|
")
|
|
(should (equal (org-babel-execute-src-block)
|
|
"(%i1) \" \"\n(%o1) "))))
|
|
|
|
(ert-deftest ob-maxima/batch+verbatim+syntax-error ()
|
|
"Exercise the `:batch' header argument with syntax error.
|
|
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
|
|
;
|
|
#+end_src
|
|
")
|
|
(should (string-match "incorrect syntax: Premature termination of input at ;\\."
|
|
(org-babel-execute-src-block)))))
|
|
|
|
(ert-deftest ob-maxima/batch+verbatim+eof-error ()
|
|
"Exercise the `:batch' header argument with syntax error.
|
|
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
|
|
x:
|
|
#+end_src
|
|
")
|
|
(should (string-match "end of file while scanning expression\\."
|
|
(org-babel-execute-src-block)))))
|
|
|
|
|
|
|
|
(provide 'test-ob-maxima)
|
|
|
|
;;; test-ob-maxima.el ends here
|