From 787fa238a9b9e7d8934b08a31174f915b0a0b7c0 Mon Sep 17 00:00:00 2001 From: Sebastian Miele Date: Sun, 20 Oct 2019 21:38:03 +0000 Subject: [PATCH] Add tests about omission of commented src blocks when e.g. tangling * testing/lisp/test-ob.el (test-ob/noweb-expansion): Add clause to test. * testing/lisp/test-ob-tangle.el (ob-tangle/commented-src-blocks): Add test. --- testing/lisp/test-ob-tangle.el | 84 ++++++++++++++++++++++++++++++++++ testing/lisp/test-ob.el | 24 ++++++++++ 2 files changed, 108 insertions(+) diff --git a/testing/lisp/test-ob-tangle.el b/testing/lisp/test-ob-tangle.el index 47c31dff5..301f7aff7 100644 --- a/testing/lisp/test-ob-tangle.el +++ b/testing/lisp/test-ob-tangle.el @@ -296,6 +296,90 @@ another block (org-split-string (buffer-string)))) (delete-file file)))))) +(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 + <> + <> + <> + #+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)))))) + (provide 'test-ob-tangle) ;;; test-ob-tangle.el ends here diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el index 367c70f83..681f3403e 100644 --- a/testing/lisp/test-ob.el +++ b/testing/lisp/test-ob.el @@ -758,6 +758,30 @@ x #+name: bar #+begin_src emacs-lisp baz +#+end_src" + (org-babel-expand-noweb-references)))) + ;; Respect COMMENT headlines + (should + (equal "C" + (org-test-with-temp-text " +#+begin_src emacs-lisp :noweb yes + <> +#+end_src + +* COMMENT A +#+name: foo +#+begin_src emacs-lisp + A +#+end_src + +* COMMENT B +#+begin_src emacs-lisp :noweb-ref foo + B +#+end_src + +* C +#+begin_src emacs-lisp :noweb-ref foo + C #+end_src" (org-babel-expand-noweb-references)))))