mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity
org-mode/testing/lisp/test-ob-lob.el

287 lines
8.3 KiB
EmacsLisp
Raw Permalink Normal View History

testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
;;; test-ob-lob.el --- test for ob-lob.el -*- lexical-binding: t; -*-
ob-lob: now working with the new ob-get-src-block-info ob-get-src-block-info wasn't correctly returning the name of the code block * lisp/ob-lob.el (org-babel-lob-ingest): now returns the count of ingested code blocks * lisp/ob.el (org-babel-get-src-block-info): walks up possible additional header arg lines before checking for the code block name (org-babel-merge-params): can now handle empty variables gracefully
2010-10-16 00:42:26 +00:00
Update copyright year
2019-01-01 10:50:56 +00:00
;; Copyright (c) 2010-2015, 2019 Eric Schulte
ob-lob: now working with the new ob-get-src-block-info ob-get-src-block-info wasn't correctly returning the name of the code block * lisp/ob-lob.el (org-babel-lob-ingest): now returns the count of ingested code blocks * lisp/ob.el (org-babel-get-src-block-info): walks up possible additional header arg lines before checking for the code block name (org-babel-merge-params): can now handle empty variables gracefully
2010-10-16 00:42:26 +00:00
;; Authors: Eric Schulte
Fix copyright notices for test files.
2012-12-13 16:24:19 +00:00
;; This file is not part of GNU Emacs.
ob-lob: now working with the new ob-get-src-block-info ob-get-src-block-info wasn't correctly returning the name of the code block * lisp/ob-lob.el (org-babel-lob-ingest): now returns the count of ingested code blocks * lisp/ob.el (org-babel-get-src-block-info): walks up possible additional header arg lines before checking for the code block name (org-babel-merge-params): can now handle empty variables gracefully
2010-10-16 00:42:26 +00:00
Fix copyright notices for test files.
2012-12-13 16:24:19 +00:00
;; 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
Prefer HTTPS to HTTP for links to gnu.org
2021-03-20 07:27:57 +00:00
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
ob-lob: now working with the new ob-get-src-block-info ob-get-src-block-info wasn't correctly returning the name of the code block * lisp/ob-lob.el (org-babel-lob-ingest): now returns the count of ingested code blocks * lisp/ob.el (org-babel-get-src-block-info): walks up possible additional header arg lines before checking for the code block name (org-babel-merge-params): can now handle empty variables gracefully
2010-10-16 00:42:26 +00:00
test files: use cl- prefixed functions, and require cl-lib
2018-05-10 03:18:04 +00:00
(eval-and-compile (require 'cl-lib))
testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
(require 'ob-lob)
test files: use cl- prefixed functions, and require cl-lib
2018-05-10 03:18:04 +00:00
ob-lob: now working with the new ob-get-src-block-info ob-get-src-block-info wasn't correctly returning the name of the code block * lisp/ob-lob.el (org-babel-lob-ingest): now returns the count of ingested code blocks * lisp/ob.el (org-babel-get-src-block-info): walks up possible additional header arg lines before checking for the code block name (org-babel-merge-params): can now handle empty variables gracefully
2010-10-16 00:42:26 +00:00
;;; Tests
correctly resolving load-path in testing files * testing/lisp/test-org.el (testing-lisp-dir): Require all files with load-path set. * testing/lisp/test-ob-lob.el (expand-file-name): Relative load path. * testing/lisp/test-ob-fortran.el (load-path): Relative load path.
2011-09-06 17:11:12 +00:00
(org-babel-lob-ingest
(expand-file-name
"library-of-babel.org"
(expand-file-name
fix test failure introduced by moving library-of-babel.org in 321f806faf * testing/lisp/test-ob-lob.el: The file library-of-babel.org has been moved from contrib/babel to doc, change the code to track that move.
2013-03-06 20:27:13 +00:00
"doc"
correctly resolving load-path in testing files * testing/lisp/test-org.el (testing-lisp-dir): Require all files with load-path set. * testing/lisp/test-ob-lob.el (expand-file-name): Relative load path. * testing/lisp/test-ob-fortran.el (load-path): Relative load path.
2011-09-06 17:11:12 +00:00
(expand-file-name
".."
(expand-file-name
".."
(file-name-directory
fix test failure introduced by moving library-of-babel.org in 321f806faf * testing/lisp/test-ob-lob.el: The file library-of-babel.org has been moved from contrib/babel to doc, change the code to track that move.
2013-03-06 20:27:13 +00:00
(or load-file-name buffer-file-name)))))))
correctly resolving load-path in testing files * testing/lisp/test-org.el (testing-lisp-dir): Require all files with load-path set. * testing/lisp/test-ob-lob.el (expand-file-name): Relative load path. * testing/lisp/test-ob-fortran.el (load-path): Relative load path.
2011-09-06 17:11:12 +00:00
ob-lob: now working with the new ob-get-src-block-info ob-get-src-block-info wasn't correctly returning the name of the code block * lisp/ob-lob.el (org-babel-lob-ingest): now returns the count of ingested code blocks * lisp/ob.el (org-babel-get-src-block-info): walks up possible additional header arg lines before checking for the code block name (org-babel-merge-params): can now handle empty variables gracefully
2010-10-16 00:42:26 +00:00
(ert-deftest test-ob-lob/ingest ()
Turn org-mode into Org or Org mode Use Org or Org mode instead of org-mode or Org-mode according to "Documentation standards".
2016-08-23 20:13:56 +00:00
"Test the ingestion of an Org file."
ob-lob: now working with the new ob-get-src-block-info ob-get-src-block-info wasn't correctly returning the name of the code block * lisp/ob-lob.el (org-babel-lob-ingest): now returns the count of ingested code blocks * lisp/ob.el (org-babel-get-src-block-info): walks up possible additional header arg lines before checking for the code block name (org-babel-merge-params): can now handle empty variables gracefully
2010-10-16 00:42:26 +00:00
(should (< 0 (org-babel-lob-ingest
(expand-file-name "babel.org" org-test-example-dir)))))
ob-lob: now working with the new variable resolution setup * lisp/ob-lob.el (org-babel-lob-execute): now expanding variable references before execution * lisp/ob.el (org-babel-merge-params): better indentation, and finally sorted out the proper replacement of conflicting variable definitions
2010-10-16 16:02:57 +00:00
(ert-deftest test-ob-lob/call-with-header-arguments ()
"Test the evaluation of a library of babel #+call: line."
test files: use cl- prefixed functions, and require cl-lib
2018-05-10 03:18:04 +00:00
(cl-letf (((symbol-function 'org-babel-insert-result)
ob: Remove `org-babel-lob-execute' * lisp/ob-lob.el (org-babel-lob-execute): Remove function (org-babel-lob-execute-maybe): * lisp/ob-ref.el (org-babel-ref-resolve): * testing/lisp/test-ob-header-arg-defaults.el (test-ob-header-arg-defaults/global/call): (test-ob-header-arg-defaults/tree/overwrite/call): (test-ob-header-arg-defaults/tree/accumulate/call): (test-ob-header-arg-defaults/tree/complex/call): * testing/lisp/test-ob-lob.el (test-ob-lob/named-caching-call-line): (test-ob-lob/caching-call-line): (test-ob-lob/call-with-header-arguments): Apply removal.
2016-06-16 21:32:58 +00:00
(symbol-function 'ignore)))
Fix failing test * testing/lisp/test-ob-lob.el (test-ob-lob/call-with-header-arguments): Fix failing test.
2017-08-19 17:12:08 +00:00
(let ((org-babel-library-of-babel
(org-test-with-temp-text-in-file
"
#+name: echo
#+begin_src emacs-lisp :var input=\"echo'd\"
input
#+end_src
#+name: lob-minus
#+begin_src emacs-lisp :var a=0 :var b=0
(- a b)
#+end_src"
(org-babel-lob-ingest)
org-babel-library-of-babel)))
(org-test-at-id "fab7e291-fde6-45fc-bf6e-a485b8bca2f0"
(move-beginning-of-line 1)
(forward-line 6)
(message (buffer-substring (point-at-bol) (point-at-eol)))
(should
(string= "testing" (org-babel-execute-src-block
nil (org-babel-lob-get-info))))
(forward-line 1)
(should
(string= "testing" (caar (org-babel-execute-src-block
nil (org-babel-lob-get-info)))))
(forward-line 1)
(should
(string= "testing" (org-babel-execute-src-block
nil (org-babel-lob-get-info))))
(forward-line 1)
(should
(string= "testing" (caar (org-babel-execute-src-block
nil (org-babel-lob-get-info)))))
(forward-line 1)
(should
(string= "testing" (org-babel-execute-src-block
nil (org-babel-lob-get-info))))
(forward-line 1)
(should
(string= "testing" (caar (org-babel-execute-src-block
nil (org-babel-lob-get-info)))))
(forward-line 1) (beginning-of-line) (forward-char 27)
(should
(string= "testing" (org-babel-execute-src-block
nil (org-babel-lob-get-info))))
(forward-line 1) (beginning-of-line) (forward-char 27)
(should
(string= "testing" (caar (org-babel-execute-src-block
nil (org-babel-lob-get-info)))))
(forward-line 1) (beginning-of-line)
(should
(= 4 (org-babel-execute-src-block nil (org-babel-lob-get-info))))
(forward-line 1)
(should
(string= "testing" (org-babel-execute-src-block
nil (org-babel-lob-get-info))))
(forward-line 1)
(should (string= "123" (org-babel-execute-src-block
nil (org-babel-lob-get-info))))))))
ob-lob: now working with the new variable resolution setup * lisp/ob-lob.el (org-babel-lob-execute): now expanding variable references before execution * lisp/ob.el (org-babel-merge-params): better indentation, and finally sorted out the proper replacement of conflicting variable definitions
2010-10-16 16:02:57 +00:00
test: more tests of exporting call lines in a variety of situations
2011-06-27 18:34:00 +00:00
(ert-deftest test-ob-lob/export-lob-lines ()
"Test the export of a variety of library babel call lines."
test: Fixes for running tests interactively. * testing/examples/babel.org: Change spaces to dashes in #+name lines. * testing/lisp/test-ob-exp.el (org-test-with-expanded-babel-code): (ob-exp/evaluate-all-executables-in-order): (ob-exp/exports-inline-code): (ob-exp/exports-inline): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-exp/use-case-of-reading-entry-properties): (ob-exp/export-from-a-temp-buffer): (ob-export/export-with-results-before-block): (ob-export/export-under-commented-headline): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1): (test-org-babel/inline-src_blk-default-results-replace-line-2): (test-org-babel/inline-src_blk-manual-results-replace): (test-org-babel/inline-src_blk-results-scalar): (test-org-babel/inline-src_blk-results-verbatim): (test-org-babel/inline-src_blk-preceded-punct-preceded-by-point): * testing/lisp/test-ox.el (test-org-export/export-scope): Bind ‘org-babel-inline-result-wrap’ and/or ‘org-export-babel-evaluate’ so tests work when users have customized these variables. * testing/lisp/test-ob-exp.el (ob-export/export-with-results-before-block): Add ‘org-trim’ where an extra newline was creeping in. * testing/lisp/test-ob-lob.el (test-ob-lob/call-with-header-arguments): Neutralize org-babel-insert-result, which was stomping on the buffer contents and disrupting the test * testing/lisp/test-org-element.el (test-org-element/block-switches): Replace (should (and ...)) with multiple (should ...). This gives more precise indications of what is wrong when a test fails. (test-org-element/link-parser): Require org-docview. * testing/lisp/test-org-timer.el (test-org-timer/other-timer-error): Add the error type for ‘should-error’. * testing/lisp/test-ox.el (test-org-export/set-title): (test-org-export/handle-options): (test-org-export/with-timestamps): (test-org-export/comment-tree): (test-org-export/handle-inlinetasks): Let ‘org-export-filter-body-functions’ and ‘org-export-filter-final-output-functions’ to nil where an empty string is the expected result. ‘org-export-filter-apply-functions’ treats an empty string as special, and changes it to nil. This creates test failures when the user has customized these variables. * testing/org-test.el (org-test-with-temp-text): Let ‘org-mode-hook’ to nil. (org-test-table-target-expect): Require ert since this function calls some of its should* functions.
2015-01-22 05:59:04 +00:00
(let ((org-babel-inline-result-wrap "=%s=")
Replace `org-export-babel-evaluate' with `org-export-use-babel' * lisp/ob-exp.el (org-babel-exp-process-buffer): Change variable name `org-export-babel-evaluate' to `org-export-use-babel'. Also change the name in its `defcustom' and set the `:safe' key. * lisp/ox-icalendar.el (org-icalendar-export-current-agenda): Change variable name. * lisp/ox.el (org-export-as): Change variable name. * doc/org.texi (Exporting code blocks): Change variable name. Amplify the explanation of what the variable does. Add variable index entry. * testing/lisp/test-ob-exp.el: Change variable name. * testing/lisp/test-ob-lob.el: Change variable name. * testing/lisp/test-ox.el: Change variable name. Users were often confused that setting this variable to `nil' will cause header arguments to be ignored in addition to preventing code from being evaluated. It is hoped that the documentation changes and the name `org-export-use-babel' will better convey that everything babel does can be switched off with this variable.
2016-11-13 02:54:20 +00:00
(org-export-use-babel t))
test: Fixes for running tests interactively. * testing/examples/babel.org: Change spaces to dashes in #+name lines. * testing/lisp/test-ob-exp.el (org-test-with-expanded-babel-code): (ob-exp/evaluate-all-executables-in-order): (ob-exp/exports-inline-code): (ob-exp/exports-inline): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-exp/use-case-of-reading-entry-properties): (ob-exp/export-from-a-temp-buffer): (ob-export/export-with-results-before-block): (ob-export/export-under-commented-headline): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1): (test-org-babel/inline-src_blk-default-results-replace-line-2): (test-org-babel/inline-src_blk-manual-results-replace): (test-org-babel/inline-src_blk-results-scalar): (test-org-babel/inline-src_blk-results-verbatim): (test-org-babel/inline-src_blk-preceded-punct-preceded-by-point): * testing/lisp/test-ox.el (test-org-export/export-scope): Bind ‘org-babel-inline-result-wrap’ and/or ‘org-export-babel-evaluate’ so tests work when users have customized these variables. * testing/lisp/test-ob-exp.el (ob-export/export-with-results-before-block): Add ‘org-trim’ where an extra newline was creeping in. * testing/lisp/test-ob-lob.el (test-ob-lob/call-with-header-arguments): Neutralize org-babel-insert-result, which was stomping on the buffer contents and disrupting the test * testing/lisp/test-org-element.el (test-org-element/block-switches): Replace (should (and ...)) with multiple (should ...). This gives more precise indications of what is wrong when a test fails. (test-org-element/link-parser): Require org-docview. * testing/lisp/test-org-timer.el (test-org-timer/other-timer-error): Add the error type for ‘should-error’. * testing/lisp/test-ox.el (test-org-export/set-title): (test-org-export/handle-options): (test-org-export/with-timestamps): (test-org-export/comment-tree): (test-org-export/handle-inlinetasks): Let ‘org-export-filter-body-functions’ and ‘org-export-filter-final-output-functions’ to nil where an empty string is the expected result. ‘org-export-filter-apply-functions’ treats an empty string as special, and changes it to nil. This creates test failures when the user has customized these variables. * testing/org-test.el (org-test-with-temp-text): Let ‘org-mode-hook’ to nil. (org-test-table-target-expect): Require ert since this function calls some of its should* functions.
2015-01-22 05:59:04 +00:00
(org-test-at-id "72ddeed3-2d17-4c7f-8192-a575d535d3fc"
(org-narrow-to-subtree)
ox: Remove `org-export-execute-babel-code' * lisp/ox.el (org-export-execute-babel-code): Remove function. (org-export-as): Replace previous function with `org-babel-exp-process-buffer'. * lisp/ob-exp.el (org-babel-exp-process-buffer): Change signature. Copy buffer before evaluating code. * testing/lisp/test-ob-exp.el (ob-exp/exports-inline-code): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-export/export-with-results-before-block): (ob-export/export-src-block-with-switches): (ob-export/export-src-block-with-flags): (ob-export/export-and-indentation): (ob-export/export-under-commented-headline): (ob-export/reference-in-post-header): (ob-export/babel-evaluate): (org-test-with-expanded-babel-code): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): (test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export): Apply change. This patch merges `org-export-execute-babel-code' within `org-babel-exp-process-buffer', removing one level of indirection. Now, all the Babel evaluation is on the Babel side.
2016-06-18 20:11:14 +00:00
(let ((string (org-with-wide-buffer (buffer-string)))
(narrowing (list (point-min) (point-max))))
test: Fixes for running tests interactively. * testing/examples/babel.org: Change spaces to dashes in #+name lines. * testing/lisp/test-ob-exp.el (org-test-with-expanded-babel-code): (ob-exp/evaluate-all-executables-in-order): (ob-exp/exports-inline-code): (ob-exp/exports-inline): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-exp/use-case-of-reading-entry-properties): (ob-exp/export-from-a-temp-buffer): (ob-export/export-with-results-before-block): (ob-export/export-under-commented-headline): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1): (test-org-babel/inline-src_blk-default-results-replace-line-2): (test-org-babel/inline-src_blk-manual-results-replace): (test-org-babel/inline-src_blk-results-scalar): (test-org-babel/inline-src_blk-results-verbatim): (test-org-babel/inline-src_blk-preceded-punct-preceded-by-point): * testing/lisp/test-ox.el (test-org-export/export-scope): Bind ‘org-babel-inline-result-wrap’ and/or ‘org-export-babel-evaluate’ so tests work when users have customized these variables. * testing/lisp/test-ob-exp.el (ob-export/export-with-results-before-block): Add ‘org-trim’ where an extra newline was creeping in. * testing/lisp/test-ob-lob.el (test-ob-lob/call-with-header-arguments): Neutralize org-babel-insert-result, which was stomping on the buffer contents and disrupting the test * testing/lisp/test-org-element.el (test-org-element/block-switches): Replace (should (and ...)) with multiple (should ...). This gives more precise indications of what is wrong when a test fails. (test-org-element/link-parser): Require org-docview. * testing/lisp/test-org-timer.el (test-org-timer/other-timer-error): Add the error type for ‘should-error’. * testing/lisp/test-ox.el (test-org-export/set-title): (test-org-export/handle-options): (test-org-export/with-timestamps): (test-org-export/comment-tree): (test-org-export/handle-inlinetasks): Let ‘org-export-filter-body-functions’ and ‘org-export-filter-final-output-functions’ to nil where an empty string is the expected result. ‘org-export-filter-apply-functions’ treats an empty string as special, and changes it to nil. This creates test failures when the user has customized these variables. * testing/org-test.el (org-test-with-temp-text): Let ‘org-mode-hook’ to nil. (org-test-table-target-expect): Require ert since this function calls some of its should* functions.
2015-01-22 05:59:04 +00:00
(with-temp-buffer
(org-mode)
(insert string)
ox: Remove `org-export-execute-babel-code' * lisp/ox.el (org-export-execute-babel-code): Remove function. (org-export-as): Replace previous function with `org-babel-exp-process-buffer'. * lisp/ob-exp.el (org-babel-exp-process-buffer): Change signature. Copy buffer before evaluating code. * testing/lisp/test-ob-exp.el (ob-exp/exports-inline-code): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-export/export-with-results-before-block): (ob-export/export-src-block-with-switches): (ob-export/export-src-block-with-flags): (ob-export/export-and-indentation): (ob-export/export-under-commented-headline): (ob-export/reference-in-post-header): (ob-export/babel-evaluate): (org-test-with-expanded-babel-code): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): (test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export): Apply change. This patch merges `org-export-execute-babel-code' within `org-babel-exp-process-buffer', removing one level of indirection. Now, all the Babel evaluation is on the Babel side.
2016-06-18 20:11:14 +00:00
(apply #'narrow-to-region narrowing)
(org-babel-exp-process-buffer)
test: Fixes for running tests interactively. * testing/examples/babel.org: Change spaces to dashes in #+name lines. * testing/lisp/test-ob-exp.el (org-test-with-expanded-babel-code): (ob-exp/evaluate-all-executables-in-order): (ob-exp/exports-inline-code): (ob-exp/exports-inline): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-exp/use-case-of-reading-entry-properties): (ob-exp/export-from-a-temp-buffer): (ob-export/export-with-results-before-block): (ob-export/export-under-commented-headline): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1): (test-org-babel/inline-src_blk-default-results-replace-line-2): (test-org-babel/inline-src_blk-manual-results-replace): (test-org-babel/inline-src_blk-results-scalar): (test-org-babel/inline-src_blk-results-verbatim): (test-org-babel/inline-src_blk-preceded-punct-preceded-by-point): * testing/lisp/test-ox.el (test-org-export/export-scope): Bind ‘org-babel-inline-result-wrap’ and/or ‘org-export-babel-evaluate’ so tests work when users have customized these variables. * testing/lisp/test-ob-exp.el (ob-export/export-with-results-before-block): Add ‘org-trim’ where an extra newline was creeping in. * testing/lisp/test-ob-lob.el (test-ob-lob/call-with-header-arguments): Neutralize org-babel-insert-result, which was stomping on the buffer contents and disrupting the test * testing/lisp/test-org-element.el (test-org-element/block-switches): Replace (should (and ...)) with multiple (should ...). This gives more precise indications of what is wrong when a test fails. (test-org-element/link-parser): Require org-docview. * testing/lisp/test-org-timer.el (test-org-timer/other-timer-error): Add the error type for ‘should-error’. * testing/lisp/test-ox.el (test-org-export/set-title): (test-org-export/handle-options): (test-org-export/with-timestamps): (test-org-export/comment-tree): (test-org-export/handle-inlinetasks): Let ‘org-export-filter-body-functions’ and ‘org-export-filter-final-output-functions’ to nil where an empty string is the expected result. ‘org-export-filter-apply-functions’ treats an empty string as special, and changes it to nil. This creates test failures when the user has customized these variables. * testing/org-test.el (org-test-with-temp-text): Let ‘org-mode-hook’ to nil. (org-test-table-target-expect): Require ert since this function calls some of its should* functions.
2015-01-22 05:59:04 +00:00
(message (buffer-string))
(goto-char (point-min))
(should (re-search-forward "^: 0" nil t))
testing/*: Inline result tests modified to follow current schema * test/examples/babel.org: Miscellaneous fixes for new inline src block schema. Return a scalar to avoid unwanted error. Return a raw result from `src_emacs-lisp' to make checking results cleaner than dealing with `results' macro. * testing/lisp/test-ob-exp.el: Wrap some expected results in `{{{results(' and ')}}}' and drop `=%s=' formatting of others. * testing/lisp/test-ob-lob.el: Wrap some expected results in `{{{results(' and ')}}}'. * testing/lisp/test-ob.el: Wrap some expected results in `{{{results(' and ')}}}'. * testing/lisp/test-ob.el (test-org-babel/org-babel-get-inline-src-block-matches, test-org-babel/inline-src_blk-results-silent): Tests of inline src block matches (and `org-ctrl-ctrl-c') conform to the `:begin' and `:end' properties of `org-element-context'. * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1, test-org-babel/inline-src_blk-default-results-replace-line-2): Inline results are self replacing.
2015-01-29 20:05:31 +00:00
(should (re-search-forward "call {{{results(=2=)}}} stuck" nil t))
test: Fixes for running tests interactively. * testing/examples/babel.org: Change spaces to dashes in #+name lines. * testing/lisp/test-ob-exp.el (org-test-with-expanded-babel-code): (ob-exp/evaluate-all-executables-in-order): (ob-exp/exports-inline-code): (ob-exp/exports-inline): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-exp/use-case-of-reading-entry-properties): (ob-exp/export-from-a-temp-buffer): (ob-export/export-with-results-before-block): (ob-export/export-under-commented-headline): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1): (test-org-babel/inline-src_blk-default-results-replace-line-2): (test-org-babel/inline-src_blk-manual-results-replace): (test-org-babel/inline-src_blk-results-scalar): (test-org-babel/inline-src_blk-results-verbatim): (test-org-babel/inline-src_blk-preceded-punct-preceded-by-point): * testing/lisp/test-ox.el (test-org-export/export-scope): Bind ‘org-babel-inline-result-wrap’ and/or ‘org-export-babel-evaluate’ so tests work when users have customized these variables. * testing/lisp/test-ob-exp.el (ob-export/export-with-results-before-block): Add ‘org-trim’ where an extra newline was creeping in. * testing/lisp/test-ob-lob.el (test-ob-lob/call-with-header-arguments): Neutralize org-babel-insert-result, which was stomping on the buffer contents and disrupting the test * testing/lisp/test-org-element.el (test-org-element/block-switches): Replace (should (and ...)) with multiple (should ...). This gives more precise indications of what is wrong when a test fails. (test-org-element/link-parser): Require org-docview. * testing/lisp/test-org-timer.el (test-org-timer/other-timer-error): Add the error type for ‘should-error’. * testing/lisp/test-ox.el (test-org-export/set-title): (test-org-export/handle-options): (test-org-export/with-timestamps): (test-org-export/comment-tree): (test-org-export/handle-inlinetasks): Let ‘org-export-filter-body-functions’ and ‘org-export-filter-final-output-functions’ to nil where an empty string is the expected result. ‘org-export-filter-apply-functions’ treats an empty string as special, and changes it to nil. This creates test failures when the user has customized these variables. * testing/org-test.el (org-test-with-temp-text): Let ‘org-mode-hook’ to nil. (org-test-table-target-expect): Require ert since this function calls some of its should* functions.
2015-01-22 05:59:04 +00:00
(should (re-search-forward
"exported =call_double(it=2)= because" nil t))
testing/*: Inline result tests modified to follow current schema * test/examples/babel.org: Miscellaneous fixes for new inline src block schema. Return a scalar to avoid unwanted error. Return a raw result from `src_emacs-lisp' to make checking results cleaner than dealing with `results' macro. * testing/lisp/test-ob-exp.el: Wrap some expected results in `{{{results(' and ')}}}' and drop `=%s=' formatting of others. * testing/lisp/test-ob-lob.el: Wrap some expected results in `{{{results(' and ')}}}'. * testing/lisp/test-ob.el: Wrap some expected results in `{{{results(' and ')}}}'. * testing/lisp/test-ob.el (test-org-babel/org-babel-get-inline-src-block-matches, test-org-babel/inline-src_blk-results-silent): Tests of inline src block matches (and `org-ctrl-ctrl-c') conform to the `:begin' and `:end' properties of `org-element-context'. * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1, test-org-babel/inline-src_blk-default-results-replace-line-2): Inline results are self replacing.
2015-01-29 20:05:31 +00:00
(should (re-search-forward "^{{{results(=6=)}}} because" nil t))
test: Fixes for running tests interactively. * testing/examples/babel.org: Change spaces to dashes in #+name lines. * testing/lisp/test-ob-exp.el (org-test-with-expanded-babel-code): (ob-exp/evaluate-all-executables-in-order): (ob-exp/exports-inline-code): (ob-exp/exports-inline): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-exp/use-case-of-reading-entry-properties): (ob-exp/export-from-a-temp-buffer): (ob-export/export-with-results-before-block): (ob-export/export-under-commented-headline): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1): (test-org-babel/inline-src_blk-default-results-replace-line-2): (test-org-babel/inline-src_blk-manual-results-replace): (test-org-babel/inline-src_blk-results-scalar): (test-org-babel/inline-src_blk-results-verbatim): (test-org-babel/inline-src_blk-preceded-punct-preceded-by-point): * testing/lisp/test-ox.el (test-org-export/export-scope): Bind ‘org-babel-inline-result-wrap’ and/or ‘org-export-babel-evaluate’ so tests work when users have customized these variables. * testing/lisp/test-ob-exp.el (ob-export/export-with-results-before-block): Add ‘org-trim’ where an extra newline was creeping in. * testing/lisp/test-ob-lob.el (test-ob-lob/call-with-header-arguments): Neutralize org-babel-insert-result, which was stomping on the buffer contents and disrupting the test * testing/lisp/test-org-element.el (test-org-element/block-switches): Replace (should (and ...)) with multiple (should ...). This gives more precise indications of what is wrong when a test fails. (test-org-element/link-parser): Require org-docview. * testing/lisp/test-org-timer.el (test-org-timer/other-timer-error): Add the error type for ‘should-error’. * testing/lisp/test-ox.el (test-org-export/set-title): (test-org-export/handle-options): (test-org-export/with-timestamps): (test-org-export/comment-tree): (test-org-export/handle-inlinetasks): Let ‘org-export-filter-body-functions’ and ‘org-export-filter-final-output-functions’ to nil where an empty string is the expected result. ‘org-export-filter-apply-functions’ treats an empty string as special, and changes it to nil. This creates test failures when the user has customized these variables. * testing/org-test.el (org-test-with-temp-text): Let ‘org-mode-hook’ to nil. (org-test-table-target-expect): Require ert since this function calls some of its should* functions.
2015-01-22 05:59:04 +00:00
(should (re-search-forward "results 8 should" nil t))
testing/*: Inline result tests modified to follow current schema * test/examples/babel.org: Miscellaneous fixes for new inline src block schema. Return a scalar to avoid unwanted error. Return a raw result from `src_emacs-lisp' to make checking results cleaner than dealing with `results' macro. * testing/lisp/test-ob-exp.el: Wrap some expected results in `{{{results(' and ')}}}' and drop `=%s=' formatting of others. * testing/lisp/test-ob-lob.el: Wrap some expected results in `{{{results(' and ')}}}'. * testing/lisp/test-ob.el: Wrap some expected results in `{{{results(' and ')}}}'. * testing/lisp/test-ob.el (test-org-babel/org-babel-get-inline-src-block-matches, test-org-babel/inline-src_blk-results-silent): Tests of inline src block matches (and `org-ctrl-ctrl-c') conform to the `:begin' and `:end' properties of `org-element-context'. * testing/lisp/test-ob.el (test-org-babel/inline-src_blk-default-results-replace-line-1, test-org-babel/inline-src_blk-default-results-replace-line-2): Inline results are self replacing.
2015-01-29 20:05:31 +00:00
(should (re-search-forward "following 2\\*5={{{results(=10=)}}} should" nil t)))))))
test: more tests of exporting call lines in a variety of situations
2011-06-27 18:34:00 +00:00
don't try to evaluate #+call lines in verbatim blocks * lisp/ob-exp.el (org-babel-exp-lob-one-liners): Don't limit in-verbatim check to inline code blocks, do lob code blocks as well. * testing/lisp/test-ob-lob.el (test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export): Test ensuring that #+call lines in verbatim blocks are not evaluated
2011-11-18 18:30:50 +00:00
(ert-deftest test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export ()
Fix tests related to export * lisp/ob-exp.el (org-babel-exp-process-buffer): Renamed from `org-export-blocks-preprocess'. * lisp/ox.el (org-export-execute-babel-code): Apply previous renaming. * testing/org-test.el (org-test-at-id): Make sure the function returns the value of the last form in its body. * testing/lisp/test-ob-exp.el: Fix tests. * testing/lisp/test-ob-lob.el: Fix tests.
2013-01-27 23:09:58 +00:00
(require 'ox)
don't try to evaluate #+call lines in verbatim blocks * lisp/ob-exp.el (org-babel-exp-lob-one-liners): Don't limit in-verbatim check to inline code blocks, do lob code blocks as well. * testing/lisp/test-ob-lob.el (test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export): Test ensuring that #+call lines in verbatim blocks are not evaluated
2011-11-18 18:30:50 +00:00
(org-test-with-temp-text-in-file "
for export
#+begin_example
#+call: rubbish()
#+end_example"
ox: Remove `org-export-execute-babel-code' * lisp/ox.el (org-export-execute-babel-code): Remove function. (org-export-as): Replace previous function with `org-babel-exp-process-buffer'. * lisp/ob-exp.el (org-babel-exp-process-buffer): Change signature. Copy buffer before evaluating code. * testing/lisp/test-ob-exp.el (ob-exp/exports-inline-code): (ob-exp/exports-inline-code-double-eval): (ob-exp/exports-inline-code-eval-code-once): (ob-exp/exports-inline-code-double-eval-exports-both): (ob-export/export-with-results-before-block): (ob-export/export-src-block-with-switches): (ob-export/export-src-block-with-flags): (ob-export/export-and-indentation): (ob-export/export-under-commented-headline): (ob-export/reference-in-post-header): (ob-export/babel-evaluate): (org-test-with-expanded-babel-code): * testing/lisp/test-ob-lob.el (test-ob-lob/export-lob-lines): (test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export): Apply change. This patch merges `org-export-execute-babel-code' within `org-babel-exp-process-buffer', removing one level of indirection. Now, all the Babel evaluation is on the Babel side.
2016-06-18 20:11:14 +00:00
(should (progn (org-babel-exp-process-buffer) t))))
Fix tests related to export * lisp/ob-exp.el (org-babel-exp-process-buffer): Renamed from `org-export-blocks-preprocess'. * lisp/ox.el (org-export-execute-babel-code): Apply previous renaming. * testing/org-test.el (org-test-at-id): Make sure the function returns the value of the last form in its body. * testing/lisp/test-ob-exp.el: Fix tests. * testing/lisp/test-ob-lob.el: Fix tests.
2013-01-27 23:09:58 +00:00
testing: Make all files use `lexical-binding` Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
2022-09-14 21:21:37 +00:00
(defvar temporary-value-for-test)
test of caching call line behavior
2014-01-18 20:20:04 +00:00
(ert-deftest test-ob-lob/caching-call-line ()
named and caching call lines working * lisp/ob-core.el (org-babel-current-result-hash): Additional info argument so that named call line results may be found. (org-babel-set-current-result-hash): Additional info argument so that named call line results may be found. * lisp/ob-lob.el (org-babel-lob-execute): Passing info to hash finding functions so that named results may be found.
2014-01-18 20:36:07 +00:00
(let ((temporary-value-for-test 0))
test of caching call line behavior
2014-01-18 20:20:04 +00:00
(org-test-with-temp-text "
#+name: call-line-caching-example
#+begin_src emacs-lisp :var bar=\"baz\"
named and caching call lines working * lisp/ob-core.el (org-babel-current-result-hash): Additional info argument so that named call line results may be found. (org-babel-set-current-result-hash): Additional info argument so that named call line results may be found. * lisp/ob-lob.el (org-babel-lob-execute): Passing info to hash finding functions so that named results may be found.
2014-01-18 20:36:07 +00:00
(setq temporary-value-for-test (+ 1 temporary-value-for-test))
test of caching call line behavior
2014-01-18 20:20:04 +00:00
#+end_src
Simplify Babel calls evaluation * lisp/ob-lob.el (org-babel-default-lob-header-args): Merge value with `org-babel-default-header-args' since this variable is meant to replace the latter. (org-babel-lob-ingest): Make sure `org-babel-default-lob-header-args' is used instead of `org-babel-default-header-args'. (org-babel-lob--src-info): New function. (org-babel-lob-get-info): Use new function. Make return value a replacement for `org-babel-get-src-block-info'. (org-babel-lob-execute): Use `org-babel-execute-src-block' instead of duplicating functionalities. * lisp/ob-exp.el (org-babel-exp-process-buffer): Apply changes to `org-babel-lob-get-info' return value. * testing/examples/ob-header-arg-defaults.org: * testing/lisp/test-ob-header-arg-defaults.el (test-ob-header-arg-defaults/tree/accumulate/call): (test-ob-header-arg-defaults/tree/complex/call): (test-ob-header-arg-defaults/tree/overwrite/call): * testing/lisp/test-ob-lob.el (test-ob-lob/caching-call-line): (test-ob-lob/named-caching-call-line): Update tests. The purpose of this commit is to make Babel calls more predictable (e.g., wrt property inheritance) and to remove code duplication. Also, Babel calls results are no longer treated as Emacs Lisp values.
2016-06-16 20:16:41 +00:00
<point>#+call: call-line-caching-example(\"qux\") :cache yes
failing test of named caching call line
2014-01-18 20:20:43 +00:00
"
;; first execution should flip value to t
ob: Remove `org-babel-lob-execute' * lisp/ob-lob.el (org-babel-lob-execute): Remove function (org-babel-lob-execute-maybe): * lisp/ob-ref.el (org-babel-ref-resolve): * testing/lisp/test-ob-header-arg-defaults.el (test-ob-header-arg-defaults/global/call): (test-ob-header-arg-defaults/tree/overwrite/call): (test-ob-header-arg-defaults/tree/accumulate/call): (test-ob-header-arg-defaults/tree/complex/call): * testing/lisp/test-ob-lob.el (test-ob-lob/named-caching-call-line): (test-ob-lob/caching-call-line): (test-ob-lob/call-with-header-arguments): Apply removal.
2016-06-16 21:32:58 +00:00
(should
(eq (org-babel-execute-src-block nil (org-babel-lob-get-info)) 1))
failing test of named caching call line
2014-01-18 20:20:43 +00:00
;; if cached, second evaluation will retain the t value
ob: Remove `org-babel-lob-execute' * lisp/ob-lob.el (org-babel-lob-execute): Remove function (org-babel-lob-execute-maybe): * lisp/ob-ref.el (org-babel-ref-resolve): * testing/lisp/test-ob-header-arg-defaults.el (test-ob-header-arg-defaults/global/call): (test-ob-header-arg-defaults/tree/overwrite/call): (test-ob-header-arg-defaults/tree/accumulate/call): (test-ob-header-arg-defaults/tree/complex/call): * testing/lisp/test-ob-lob.el (test-ob-lob/named-caching-call-line): (test-ob-lob/caching-call-line): (test-ob-lob/call-with-header-arguments): Apply removal.
2016-06-16 21:32:58 +00:00
(should
(eq (org-babel-execute-src-block nil (org-babel-lob-get-info)) 1)))))
failing test of named caching call line
2014-01-18 20:20:43 +00:00
(ert-deftest test-ob-lob/named-caching-call-line ()
named and caching call lines working * lisp/ob-core.el (org-babel-current-result-hash): Additional info argument so that named call line results may be found. (org-babel-set-current-result-hash): Additional info argument so that named call line results may be found. * lisp/ob-lob.el (org-babel-lob-execute): Passing info to hash finding functions so that named results may be found.
2014-01-18 20:36:07 +00:00
(let ((temporary-value-for-test 0))
failing test of named caching call line
2014-01-18 20:20:43 +00:00
(org-test-with-temp-text "
#+name: call-line-caching-example
#+begin_src emacs-lisp :var bar=\"baz\"
named and caching call lines working * lisp/ob-core.el (org-babel-current-result-hash): Additional info argument so that named call line results may be found. (org-babel-set-current-result-hash): Additional info argument so that named call line results may be found. * lisp/ob-lob.el (org-babel-lob-execute): Passing info to hash finding functions so that named results may be found.
2014-01-18 20:36:07 +00:00
(setq temporary-value-for-test (+ 1 temporary-value-for-test))
failing test of named caching call line
2014-01-18 20:20:43 +00:00
#+end_src
#+name: call-line-caching-called
Simplify Babel calls evaluation * lisp/ob-lob.el (org-babel-default-lob-header-args): Merge value with `org-babel-default-header-args' since this variable is meant to replace the latter. (org-babel-lob-ingest): Make sure `org-babel-default-lob-header-args' is used instead of `org-babel-default-header-args'. (org-babel-lob--src-info): New function. (org-babel-lob-get-info): Use new function. Make return value a replacement for `org-babel-get-src-block-info'. (org-babel-lob-execute): Use `org-babel-execute-src-block' instead of duplicating functionalities. * lisp/ob-exp.el (org-babel-exp-process-buffer): Apply changes to `org-babel-lob-get-info' return value. * testing/examples/ob-header-arg-defaults.org: * testing/lisp/test-ob-header-arg-defaults.el (test-ob-header-arg-defaults/tree/accumulate/call): (test-ob-header-arg-defaults/tree/complex/call): (test-ob-header-arg-defaults/tree/overwrite/call): * testing/lisp/test-ob-lob.el (test-ob-lob/caching-call-line): (test-ob-lob/named-caching-call-line): Update tests. The purpose of this commit is to make Babel calls more predictable (e.g., wrt property inheritance) and to remove code duplication. Also, Babel calls results are no longer treated as Emacs Lisp values.
2016-06-16 20:16:41 +00:00
<point>#+call: call-line-caching-example(\"qux\") :cache yes
test of caching call line behavior
2014-01-18 20:20:04 +00:00
"
;; first execution should flip value to t
ob: Remove `org-babel-lob-execute' * lisp/ob-lob.el (org-babel-lob-execute): Remove function (org-babel-lob-execute-maybe): * lisp/ob-ref.el (org-babel-ref-resolve): * testing/lisp/test-ob-header-arg-defaults.el (test-ob-header-arg-defaults/global/call): (test-ob-header-arg-defaults/tree/overwrite/call): (test-ob-header-arg-defaults/tree/accumulate/call): (test-ob-header-arg-defaults/tree/complex/call): * testing/lisp/test-ob-lob.el (test-ob-lob/named-caching-call-line): (test-ob-lob/caching-call-line): (test-ob-lob/call-with-header-arguments): Apply removal.
2016-06-16 21:32:58 +00:00
(should
(eq (org-babel-execute-src-block nil (org-babel-lob-get-info)) 1))
test of caching call line behavior
2014-01-18 20:20:04 +00:00
;; if cached, second evaluation will retain the t value
ob: Remove `org-babel-lob-execute' * lisp/ob-lob.el (org-babel-lob-execute): Remove function (org-babel-lob-execute-maybe): * lisp/ob-ref.el (org-babel-ref-resolve): * testing/lisp/test-ob-header-arg-defaults.el (test-ob-header-arg-defaults/global/call): (test-ob-header-arg-defaults/tree/overwrite/call): (test-ob-header-arg-defaults/tree/accumulate/call): (test-ob-header-arg-defaults/tree/complex/call): * testing/lisp/test-ob-lob.el (test-ob-lob/named-caching-call-line): (test-ob-lob/caching-call-line): (test-ob-lob/call-with-header-arguments): Apply removal.
2016-06-16 21:32:58 +00:00
(should
(eq (org-babel-execute-src-block nil (org-babel-lob-get-info)) 1)))))
don't try to evaluate #+call lines in verbatim blocks * lisp/ob-exp.el (org-babel-exp-lob-one-liners): Don't limit in-verbatim check to inline code blocks, do lob code blocks as well. * testing/lisp/test-ob-lob.el (test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export): Test ensuring that #+call lines in verbatim blocks are not evaluated
2011-11-18 18:30:50 +00:00
ob-ref: Fix parsing arguments with a newline character * lisp/ob-ref.el (org-babel-ref-split-regexp): Remove variable. (org-babel-ref-parse): Handle arguments containing a newline character (e.g., strings). * testing/lisp/test-ob-lob.el (test-ob-lob/assignment-with-newline): New test.
2017-12-14 22:57:50 +00:00
(ert-deftest test-ob-lob/assignment-with-newline ()
"Test call lines with an argument containing a newline character."
(should
(equal " foo"
(org-test-with-temp-text "
#+name: test-newline
#+begin_src emacs-lisp :var x=\"a\"
'foo
#+end_src
call_test-newline[:eval yes :results raw](\"a\nb\")<point>"
(org-babel-execute-src-block nil (org-babel-lob-get-info))
(buffer-substring (point) (point-max)))))
(should
(equal " bar"
(org-test-with-temp-text "
#+name: test-newline
#+begin_src emacs-lisp :var x=\"a\"
'bar
#+end_src
call_test-newline[:eval yes :results raw]('(1\n2))<point>"
(org-babel-execute-src-block nil (org-babel-lob-get-info))
(buffer-substring (point) (point-max))))))
ob-lob: Fix Babel calls with external references * lisp/ob-lob.el (org-babel-lob--src-info): (org-babel-lob-get-info): Handle calls with external references, i.e., FILE:NAME(...) syntax. * testing/lisp/test-ob-lob.el (test-ob-lob/external-reference-syntax): (test-ob-lob/call-with-indirection): New tests.
2018-01-22 18:27:13 +00:00
(ert-deftest test-ob-lob/external-reference-syntax ()
"Test external reference syntax for Babel calls."
(should
(= 2
(org-test-with-temp-text-in-file
"#+name: foo\n#+begin_src emacs-lisp\n(+ 1 1)\n#+end_src"
(let ((file (buffer-file-name)))
(org-test-with-temp-text (format "#+call: %s:foo()" file)
(org-babel-execute-src-block nil (org-babel-lob-get-info))))))))
(ert-deftest test-ob-lob/call-with-indirection ()
"Test calling code with indirection."
(should
(= 2
(org-test-with-temp-text
"
#+name: foo
#+begin_src emacs-lisp
\(+ 1 1)
#+end_src
#+name: bar
#+call: foo()
<point>#+call: bar()"
(org-babel-execute-src-block nil (org-babel-lob-get-info)))))
(should
(= 10
(org-test-with-temp-text
"
#+name: foo
#+begin_src emacs-lisp :var x=1
\(* 2 x)
#+end_src
#+name: bar
#+call: foo(x=3)
<point>#+call: bar(x=5)"
(org-babel-execute-src-block nil (org-babel-lob-get-info)))))
(should
(= 6
(org-test-with-temp-text
"
#+name: foo
#+begin_src emacs-lisp :var x=1
\(* 2 x)
#+end_src
#+name: bar
#+call: foo(x=3)
<point>#+call: bar()"
(org-babel-execute-src-block nil (org-babel-lob-get-info))))))
ob-exp: Restore evaluation query for lob calls during export * lisp/ob-exp.el (org-babel-exp-results): Fix a regression from v9.0 that led to silently executing lob calls on export despite a non-nil value of org-confirm-babel-evaluate. * testing/lisp/test-ob-lob.el (test-ob-lob/confirm-evaluate): New test. 56bf3d789 (Babel: avoid superfluous confirmation for internal wrapper, 2013-04-10) let-bound org-confirm-babel-evaluate to nil in two spots to prevent double querying for lob calls. These overrides were no longer needed following the refactoring in dbb375fdf (Simplify Babel calls evaluation, 2016-06-16). However, that commit dropped only one of the spots, and, as a result, disabled confirmation unconditionally when exporting lob calls. Drop the remaining org-confirm-babel-evaluate override. Reported-by: 吴锐扬 <ywwry66@gmail.com> Ref: https://orgmode.org/list/5362C0A0-632F-4C87-8FA1-915F0F53D8B8@gmail.com
2020-11-01 23:33:39 +00:00
(ert-deftest test-ob-lob/confirm-evaluate ()
"Test confirmation when exporting lob calls."
;; With the default `org-confirm-babel-evaluate' of t, the caller is
;; queried one time.
(should
(= 1
(let ((org-export-use-babel t)
(org-confirm-babel-evaluate t)
(confirm-evaluate-calls 0))
(cl-letf (((symbol-function 'yes-or-no-p)
(lambda (&rest _ignore)
(cl-incf confirm-evaluate-calls)
t)))
(org-test-with-temp-text
"
#+name: foo
#+begin_src emacs-lisp
nil
#+end_src
#+call: foo()"
(let ((string (buffer-string)))
(with-temp-buffer
(org-mode)
(insert string)
(org-babel-exp-process-buffer)
confirm-evaluate-calls))))))))
ob-lob: now working with the new ob-get-src-block-info ob-get-src-block-info wasn't correctly returning the name of the code block * lisp/ob-lob.el (org-babel-lob-ingest): now returns the count of ingested code blocks * lisp/ob.el (org-babel-get-src-block-info): walks up possible additional header arg lines before checking for the code block name (org-babel-merge-params): can now handle empty variables gracefully
2010-10-16 00:42:26 +00:00
(provide 'test-ob-lob)
;;; test-ob-lob.el ends here