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 17:21:37 -04:00
|
|
|
|
;;; test-ob-tangle.el --- tests for ob-tangle.el -*- lexical-binding: t; -*-
|
2010-10-06 12:23:50 -04:00
|
|
|
|
|
2019-01-01 05:50:56 -05:00
|
|
|
|
;; Copyright (c) 2010-2016, 2019 Eric Schulte
|
2010-10-06 12:23:50 -04:00
|
|
|
|
;; Authors: Eric Schulte
|
|
|
|
|
|
|
2012-12-13 11:24:19 -05:00
|
|
|
|
;; This file is not part of GNU Emacs.
|
2010-10-06 12:23:50 -04:00
|
|
|
|
|
2012-12-13 11:24:19 -05: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
|
2021-03-20 03:27:57 -04:00
|
|
|
|
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
2012-12-13 11:24:19 -05:00
|
|
|
|
|
|
|
|
|
|
;;; Comments:
|
2010-10-06 12:23:50 -04:00
|
|
|
|
|
2016-08-23 16:13:56 -04:00
|
|
|
|
;; Template test file for Org tests
|
2010-10-06 12:23:50 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
2011-03-02 13:07:15 -05:00
|
|
|
|
|
2020-01-28 17:51:29 -05:00
|
|
|
|
(require 'subr-x)
|
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 17:21:37 -04:00
|
|
|
|
(require 'ob-tangle)
|
|
|
|
|
|
(require 'org)
|
2020-01-28 17:51:29 -05:00
|
|
|
|
|
2011-03-02 13:07:15 -05:00
|
|
|
|
;; TODO
|
|
|
|
|
|
;; (ert-deftest ob-tangle/noweb-on-tangle ()
|
|
|
|
|
|
;; "Noweb header arguments tangle correctly.
|
|
|
|
|
|
;; - yes expand on both export and tangle
|
|
|
|
|
|
;; - no expand on neither export or tangle
|
|
|
|
|
|
;; - tangle expand on only tangle not export"
|
|
|
|
|
|
;; (let ((target-file (make-temp-file "ob-tangle-test-")))
|
|
|
|
|
|
;; (org-test-at-id "eb1f6498-5bd9-45e0-9c56-50717053e7b7"
|
|
|
|
|
|
;; (org-narrow-to-subtree)
|
|
|
|
|
|
;; (org-babel-tangle target-file))
|
|
|
|
|
|
;; (let ((tang (with-temp-buffer
|
2016-01-31 05:37:05 -05:00
|
|
|
|
;; (insert-file-contents target-file)
|
|
|
|
|
|
;; (buffer-string))))
|
2011-03-02 13:07:15 -05:00
|
|
|
|
;; (flet ((exp-p (arg)
|
2016-01-31 05:37:05 -05:00
|
|
|
|
;; (and
|
|
|
|
|
|
;; (string-match
|
2023-04-25 15:06:50 -04:00
|
|
|
|
;; (format "noweb-%s-start\\(\\(?:.\\|\n\\)*\\)noweb-%s-end" arg arg)
|
2016-01-31 05:37:05 -05:00
|
|
|
|
;; tang)
|
|
|
|
|
|
;; (string-match "expanded" (match-string 1 tang)))))
|
|
|
|
|
|
;; (should (exp-p "yes"))
|
|
|
|
|
|
;; (should-not (exp-p "no"))
|
|
|
|
|
|
;; (should (exp-p "tangle"))))))
|
2010-10-06 12:23:50 -04:00
|
|
|
|
|
2010-10-14 19:15:11 -04:00
|
|
|
|
(ert-deftest ob-tangle/no-excessive-id-insertion-on-tangle ()
|
|
|
|
|
|
"Don't add IDs to headings without tangling code blocks."
|
2011-06-14 16:39:20 -04:00
|
|
|
|
(org-test-at-id "ef06fd7f-012b-4fde-87a2-2ae91504ea7e"
|
2010-10-14 19:15:11 -04:00
|
|
|
|
(org-babel-next-src-block)
|
2011-06-16 00:27:58 -04:00
|
|
|
|
(org-narrow-to-subtree)
|
2010-10-14 19:15:11 -04:00
|
|
|
|
(org-babel-tangle)
|
|
|
|
|
|
(should (null (org-id-get)))))
|
|
|
|
|
|
|
2011-06-16 00:27:58 -04:00
|
|
|
|
(ert-deftest ob-tangle/continued-code-blocks-w-noweb-ref ()
|
|
|
|
|
|
"Test that the :noweb-ref header argument is used correctly."
|
|
|
|
|
|
(org-test-at-id "54d68d4b-1544-4745-85ab-4f03b3cbd8a0"
|
2011-07-15 11:31:36 -04:00
|
|
|
|
(let ((tangled
|
2016-01-31 05:37:05 -05:00
|
|
|
|
"df|sed '1d'|awk '{print $5 \" \" $6}'|sort -n |tail -1|awk '{print $2}'"))
|
2011-06-16 00:27:58 -04:00
|
|
|
|
(org-narrow-to-subtree)
|
|
|
|
|
|
(org-babel-tangle)
|
2016-12-09 18:59:08 -05:00
|
|
|
|
(should (unwind-protect
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents "babel.sh")
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(re-search-forward (regexp-quote tangled) nil t))
|
|
|
|
|
|
(when (file-exists-p "babel.sh") (delete-file "babel.sh")))))))
|
2011-06-16 00:27:58 -04:00
|
|
|
|
|
2011-06-28 16:02:16 -04:00
|
|
|
|
(ert-deftest ob-tangle/expand-headers-as-noweb-references ()
|
|
|
|
|
|
"Test that references to headers are expanded during noweb expansion."
|
|
|
|
|
|
(org-test-at-id "2409e8ba-7b5f-4678-8888-e48aa02d8cb4"
|
|
|
|
|
|
(org-babel-next-src-block 2)
|
|
|
|
|
|
(let ((expanded (org-babel-expand-noweb-references)))
|
|
|
|
|
|
(should (string-match (regexp-quote "simple") expanded))
|
|
|
|
|
|
(should (string-match (regexp-quote "length 14") expanded)))))
|
|
|
|
|
|
|
2015-09-10 05:11:15 -04:00
|
|
|
|
(ert-deftest ob-tangle/comment-links-at-left-margin ()
|
2016-01-31 05:37:05 -05:00
|
|
|
|
"Test commenting of links at left margin."
|
2015-09-10 05:11:15 -04:00
|
|
|
|
(should
|
|
|
|
|
|
(string-match
|
2018-01-16 13:42:57 -05:00
|
|
|
|
(regexp-quote "# [[https://orgmode.org][Org mode]]")
|
2015-09-10 05:11:15 -04:00
|
|
|
|
(org-test-with-temp-text-in-file
|
2018-01-16 13:42:57 -05:00
|
|
|
|
"[[https://orgmode.org][Org mode]]
|
2020-09-06 16:37:32 -04:00
|
|
|
|
#+header: :comments org :results output :tangle \"test-ob-tangle.sh\"
|
2015-09-10 05:11:15 -04:00
|
|
|
|
#+begin_src sh
|
|
|
|
|
|
echo 1
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
(unwind-protect
|
2016-01-31 05:37:05 -05:00
|
|
|
|
(progn (org-babel-tangle)
|
|
|
|
|
|
(with-temp-buffer (insert-file-contents "test-ob-tangle.sh")
|
|
|
|
|
|
(buffer-string)))
|
|
|
|
|
|
(delete-file "test-ob-tangle.sh"))))))
|
2015-09-10 05:11:15 -04:00
|
|
|
|
|
2016-01-02 11:05:00 -05:00
|
|
|
|
(ert-deftest ob-tangle/comment-links-numbering ()
|
|
|
|
|
|
"Test numbering of source blocks when commenting with links."
|
|
|
|
|
|
(should
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"* H
|
|
|
|
|
|
#+header: :tangle \"test-ob-tangle.el\" :comments link
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+header: :tangle \"test-ob-tangle.el\" :comments link
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
2
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
(unwind-protect
|
2016-01-31 05:37:05 -05:00
|
|
|
|
(progn
|
|
|
|
|
|
(org-babel-tangle)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents "test-ob-tangle.el")
|
|
|
|
|
|
(buffer-string)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(and (search-forward "[H:1]]" nil t)
|
|
|
|
|
|
(search-forward "[H:2]]" nil t))))
|
2016-01-02 11:05:00 -05:00
|
|
|
|
(delete-file "test-ob-tangle.el")))))
|
|
|
|
|
|
|
2020-06-08 20:25:22 -04:00
|
|
|
|
(ert-deftest ob-tangle/comment-links-relative-file ()
|
|
|
|
|
|
"Test relative file name handling when commenting with links."
|
|
|
|
|
|
(should
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"* H
|
|
|
|
|
|
#+header: :tangle \"test-ob-tangle.el\" :comments link
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(let ((org-babel-tangle-use-relative-file-links t))
|
|
|
|
|
|
(org-babel-tangle)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents "test-ob-tangle.el")
|
|
|
|
|
|
(buffer-string)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(search-forward
|
|
|
|
|
|
(concat "[file:" (file-name-nondirectory file))
|
|
|
|
|
|
nil t)))
|
|
|
|
|
|
(delete-file "test-ob-tangle.el"))))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"* H
|
|
|
|
|
|
#+header: :tangle \"test-ob-tangle.el\" :comments link
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(let ((org-babel-tangle-use-relative-file-links nil))
|
|
|
|
|
|
(org-babel-tangle)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents "test-ob-tangle.el")
|
|
|
|
|
|
(buffer-string)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(search-forward (concat "[file:" file) nil t)))
|
|
|
|
|
|
(delete-file "test-ob-tangle.el")))))
|
|
|
|
|
|
|
2022-08-08 16:58:05 -04:00
|
|
|
|
(ert-deftest ob-tangle/comment-noweb-relative ()
|
|
|
|
|
|
"Test :comments noweb tangling with relative file paths."
|
|
|
|
|
|
(should
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"* Inner
|
|
|
|
|
|
#+name: inner
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
2
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
* Main
|
|
|
|
|
|
#+header: :tangle \"test-ob-tangle.el\" :comments noweb :noweb yes
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
<<inner>>
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(let ((org-babel-tangle-use-relative-file-links t))
|
|
|
|
|
|
(org-babel-tangle)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents "test-ob-tangle.el")
|
|
|
|
|
|
(buffer-string)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(and
|
|
|
|
|
|
(search-forward (concat ";; [[file:" (file-name-nondirectory file) "::inner") nil t)
|
|
|
|
|
|
(search-forward ";; inner ends here" nil t))))
|
|
|
|
|
|
(delete-file "test-ob-tangle.el")))))
|
|
|
|
|
|
|
|
|
|
|
|
(ert-deftest ob-tangle/comment-noweb-absolute ()
|
|
|
|
|
|
"Test :comments noweb tangling with absolute file path."
|
|
|
|
|
|
(should
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"* Inner
|
|
|
|
|
|
#+name: inner
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
2
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
* Main
|
|
|
|
|
|
#+header: :tangle \"test-ob-tangle.el\" :comments noweb :noweb yes
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
<<inner>>
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(let ((org-babel-tangle-use-relative-file-links nil))
|
|
|
|
|
|
(org-babel-tangle)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents "test-ob-tangle.el")
|
|
|
|
|
|
(buffer-string)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(and
|
|
|
|
|
|
(search-forward (concat ";; [[file:" file "::inner") nil t)
|
|
|
|
|
|
(search-forward ";; inner ends here" nil t))))
|
|
|
|
|
|
(delete-file "test-ob-tangle.el")))))
|
|
|
|
|
|
|
2016-01-31 05:37:05 -05:00
|
|
|
|
(ert-deftest ob-tangle/jump-to-org ()
|
|
|
|
|
|
"Test `org-babel-tangle-jump-to-org' specifications."
|
|
|
|
|
|
;; Standard test.
|
2020-06-01 10:07:44 -04:00
|
|
|
|
(let ((org-file-apps '((t . emacs))))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"* H\n#+begin_src emacs-lisp\n1\n#+end_src"
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"* H\n#+begin_src emacs-lisp\n1\n#+end_src"
|
|
|
|
|
|
(let ((file (buffer-file-name)))
|
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
|
(format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
|
|
|
|
|
|
(file-name-nondirectory file))
|
|
|
|
|
|
(org-babel-tangle-jump-to-org)
|
|
|
|
|
|
(buffer-string))))))
|
|
|
|
|
|
;; Multiple blocks in the same section.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"2"
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"* H
|
2016-01-31 05:37:05 -05:00
|
|
|
|
|
|
|
|
|
|
first block
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
another block
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
2
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
"
|
2020-06-01 10:07:44 -04:00
|
|
|
|
(let ((file (buffer-file-name)))
|
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
|
(format ";; [[file:%s][H:2]]\n<point>2\n;; H:2 ends here\n"
|
|
|
|
|
|
(file-name-nondirectory file))
|
|
|
|
|
|
(org-babel-tangle-jump-to-org)
|
|
|
|
|
|
(buffer-substring (line-beginning-position)
|
|
|
|
|
|
(line-end-position)))))))
|
|
|
|
|
|
;; Preserve position within the source code.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"1)"
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"* H\n#+begin_src emacs-lisp\n(+ 1 1)\n#+end_src"
|
|
|
|
|
|
(let ((file (buffer-file-name)))
|
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
|
(format ";; [[file:%s][H:1]]\n(+ 1 <point>1)\n;; H:1 ends here\n"
|
|
|
|
|
|
(file-name-nondirectory file))
|
|
|
|
|
|
(org-babel-tangle-jump-to-org)
|
|
|
|
|
|
(buffer-substring-no-properties (point) (line-end-position)))))))
|
|
|
|
|
|
;; Blocks before first heading.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"Buffer start\n#+begin_src emacs-lisp\n1\n#+end_src\n* H"
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"Buffer start\n#+begin_src emacs-lisp\n1\n#+end_src\n* H"
|
|
|
|
|
|
(let ((file (buffer-file-name)))
|
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
|
(format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
|
|
|
|
|
|
(file-name-nondirectory file))
|
|
|
|
|
|
(org-babel-tangle-jump-to-org)
|
|
|
|
|
|
(buffer-string))))))
|
|
|
|
|
|
;; Special case: buffer starts with a source block.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal
|
|
|
|
|
|
"#+begin_src emacs-lisp\n1\n#+end_src\n* H"
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"#+begin_src emacs-lisp\n1\n#+end_src\n* H"
|
|
|
|
|
|
(let ((file (buffer-file-name)))
|
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
|
(format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
|
|
|
|
|
|
(file-name-nondirectory file))
|
|
|
|
|
|
(org-babel-tangle-jump-to-org)
|
|
|
|
|
|
(buffer-string))))))))
|
2016-01-02 11:05:00 -05:00
|
|
|
|
|
2017-10-20 23:20:35 -04:00
|
|
|
|
(ert-deftest ob-tangle/nested-block ()
|
|
|
|
|
|
"Test tangling of org file with nested block."
|
|
|
|
|
|
(should
|
|
|
|
|
|
(string=
|
|
|
|
|
|
"#+begin_src org
|
|
|
|
|
|
,#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
,#+end_src
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
"
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
"#+header: :tangle \"test-ob-tangle.org\"
|
|
|
|
|
|
#+begin_src org
|
|
|
|
|
|
,#+begin_src org
|
|
|
|
|
|
,,#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
,,#+end_src
|
|
|
|
|
|
,#+end_src
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn (org-babel-tangle)
|
|
|
|
|
|
(with-temp-buffer (insert-file-contents "test-ob-tangle.org")
|
|
|
|
|
|
(buffer-string)))
|
|
|
|
|
|
(delete-file "test-ob-tangle.org"))))))
|
|
|
|
|
|
|
2018-10-10 18:01:50 -04:00
|
|
|
|
(ert-deftest ob-tangle/block-order ()
|
|
|
|
|
|
"Test order of tangled blocks."
|
|
|
|
|
|
;; Order per language.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("1" "2")
|
|
|
|
|
|
(let ((file (make-temp-file "org-tangle-")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
(format "#+property: header-args :tangle %S
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
1
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
2
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
file)
|
|
|
|
|
|
(org-babel-tangle))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file)
|
|
|
|
|
|
(org-split-string (buffer-string))))
|
|
|
|
|
|
(delete-file file)))))
|
|
|
|
|
|
;; Order per source block.
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("1" "2")
|
|
|
|
|
|
(let ((file (make-temp-file "org-tangle-")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
(format "#+property: header-args :tangle %S
|
|
|
|
|
|
#+begin_src foo
|
|
|
|
|
|
1
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src bar
|
|
|
|
|
|
2
|
2018-10-14 03:08:44 -04:00
|
|
|
|
#+end_src"
|
|
|
|
|
|
file)
|
|
|
|
|
|
(org-babel-tangle))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file)
|
|
|
|
|
|
(org-split-string (buffer-string))))
|
|
|
|
|
|
(delete-file file)))))
|
|
|
|
|
|
;; Preserve order with mixed languages.
|
|
|
|
|
|
(should
|
2021-05-01 15:18:44 -04:00
|
|
|
|
(equal '("1" "2" "3" "4")
|
2018-10-14 03:08:44 -04:00
|
|
|
|
(let ((file (make-temp-file "org-tangle-")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
(format "#+property: header-args :tangle %S
|
|
|
|
|
|
#+begin_src foo
|
|
|
|
|
|
1
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src bar
|
|
|
|
|
|
2
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src foo
|
|
|
|
|
|
3
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src bar
|
|
|
|
|
|
4
|
2018-10-10 18:01:50 -04:00
|
|
|
|
#+end_src"
|
|
|
|
|
|
file)
|
|
|
|
|
|
(org-babel-tangle))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file)
|
|
|
|
|
|
(org-split-string (buffer-string))))
|
|
|
|
|
|
(delete-file file))))))
|
|
|
|
|
|
|
2019-10-20 17:38:03 -04:00
|
|
|
|
(ert-deftest ob-tangle/commented-src-blocks ()
|
|
|
|
|
|
"Test omission of commented src blocks."
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("A")
|
|
|
|
|
|
(let ((file (make-temp-file "org-tangle-")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
(format "#+property: header-args :tangle %S
|
|
|
|
|
|
* A
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
A
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
* COMMENT B
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
B
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
* C
|
|
|
|
|
|
|
|
|
|
|
|
# #+begin_src emacs-lisp
|
|
|
|
|
|
# C
|
|
|
|
|
|
# #+end_src
|
|
|
|
|
|
|
|
|
|
|
|
* D
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_comment
|
|
|
|
|
|
#+begin_src emacs-lisp
|
|
|
|
|
|
D
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
#+end_comment"
|
|
|
|
|
|
file)
|
|
|
|
|
|
(org-babel-tangle))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file)
|
|
|
|
|
|
(org-split-string (buffer-string))))
|
|
|
|
|
|
(delete-file file)))))
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("A")
|
|
|
|
|
|
(let ((file (make-temp-file "org-tangle-")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
(format "#+property: header-args :tangle %S
|
|
|
|
|
|
* A
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src elisp :noweb yes
|
|
|
|
|
|
A
|
|
|
|
|
|
<<B>>
|
|
|
|
|
|
<<C>>
|
|
|
|
|
|
<<D>>
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
* COMMENT B
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src elisp :noweb-ref B
|
|
|
|
|
|
B
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
* C
|
|
|
|
|
|
|
|
|
|
|
|
# #+begin_src elisp :noweb-ref C
|
|
|
|
|
|
# C
|
|
|
|
|
|
# #+end_src
|
|
|
|
|
|
|
|
|
|
|
|
* D
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_comment
|
|
|
|
|
|
#+begin_src elisp :noweb-ref D
|
|
|
|
|
|
D
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
#+end_comment"
|
|
|
|
|
|
file)
|
|
|
|
|
|
(let (org-babel-noweb-error-all-langs
|
|
|
|
|
|
org-babel-noweb-error-langs)
|
|
|
|
|
|
(org-babel-tangle)))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file)
|
|
|
|
|
|
(org-split-string (buffer-string))))
|
|
|
|
|
|
(delete-file file))))))
|
|
|
|
|
|
|
2020-09-15 00:07:03 -04:00
|
|
|
|
(ert-deftest ob-tangle/multiple-noweb-in-line ()
|
|
|
|
|
|
"Test handling of multiple noweb references in a single line."
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("1" "2" "1")
|
|
|
|
|
|
(let ((file (make-temp-file "org-tangle-")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
(format "
|
|
|
|
|
|
#+name: block1
|
|
|
|
|
|
#+begin_src elisp
|
|
|
|
|
|
1
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+name: block2
|
|
|
|
|
|
#+begin_src elisp
|
|
|
|
|
|
2
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+name: block3
|
|
|
|
|
|
#+begin_src elisp :noweb yes :tangle %s
|
|
|
|
|
|
<<block1>> <<block2>> <<block1>>
|
|
|
|
|
|
#+end_src"
|
|
|
|
|
|
file)
|
|
|
|
|
|
(let ((org-babel-noweb-error-all-langs nil)
|
|
|
|
|
|
(org-babel-noweb-error-langs nil))
|
|
|
|
|
|
(org-babel-tangle)))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file)
|
|
|
|
|
|
(org-split-string (buffer-string))))
|
|
|
|
|
|
(delete-file file))))))
|
|
|
|
|
|
|
2022-11-06 15:08:06 -05:00
|
|
|
|
(ert-deftest ob-tangle/strip-tangle ()
|
|
|
|
|
|
"Test if strip-tangle works correctly when tangling noweb code blocks."
|
|
|
|
|
|
(should
|
|
|
|
|
|
(equal '("1")
|
|
|
|
|
|
(let ((file (make-temp-file "org-tangle-")))
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
|
(format "
|
|
|
|
|
|
#+name: block1
|
|
|
|
|
|
#+begin_src elisp
|
|
|
|
|
|
2
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
|
|
|
|
|
|
#+begin_src elisp :noweb strip-tangle :tangle %s
|
|
|
|
|
|
1<<block1>>
|
|
|
|
|
|
#+end_src
|
|
|
|
|
|
" file)
|
|
|
|
|
|
(let ((org-babel-noweb-error-all-langs nil)
|
|
|
|
|
|
(org-babel-noweb-error-langs nil))
|
|
|
|
|
|
(org-babel-tangle)))
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file)
|
|
|
|
|
|
(org-split-string (buffer-string))))
|
|
|
|
|
|
(delete-file file))))))
|
|
|
|
|
|
|
2020-01-28 17:51:29 -05:00
|
|
|
|
(ert-deftest ob-tangle/detangle-false-positive ()
|
|
|
|
|
|
"Test handling of false positive link during detangle."
|
2020-05-26 20:42:54 -04:00
|
|
|
|
(let (buffer)
|
|
|
|
|
|
(unwind-protect
|
|
|
|
|
|
(org-test-in-example-file (expand-file-name "babel.el" org-test-example-dir)
|
|
|
|
|
|
(org-babel-detangle)
|
|
|
|
|
|
(org-test-at-id "73115FB0-6565-442B-BB95-50195A499EF4"
|
|
|
|
|
|
(setq buffer (current-buffer))
|
|
|
|
|
|
(org-babel-next-src-block)
|
|
|
|
|
|
(should (equal (string-trim (org-element-property
|
|
|
|
|
|
:value (org-element-at-point)))
|
|
|
|
|
|
";; detangle changes"))))
|
|
|
|
|
|
(kill-buffer buffer))))
|
2020-01-28 17:51:29 -05:00
|
|
|
|
|
2010-10-06 12:23:50 -04:00
|
|
|
|
(provide 'test-ob-tangle)
|
|
|
|
|
|
|
|
|
|
|
|
;;; test-ob-tangle.el ends here
|
