Hello
Ihor Radchenko <yanta...@posteo.net> writes:
>
> > Mehmet Tekman <mtekma...@gmail.com> writes:
> > Question: What is the order of submission of patches?
> >
> > Do I submit a testing patch first which works strictly with
> > vanilla Org first, and then a new merge-params function, and
> > then yet another testing patch that is compliant with the
> > new merge-params function?
> >
> > Or do I submit the new merge-params function, and then my
> > testing patch on top?
>
> Either way is fine. The latter should be easier for you though.
I went with the former way. I just want to get a set of standardized
tests into org-mode that I can base a future branch on to really see
what is working and what is not.
> Also, see the attached modified version of your diff - I made it so
> that `should' failures immediately provide some clue about expected
> result value, that can help to identify which of the should clauses
> fails.
I've adapted this to write a git patch which currently passes with
upstream/main, and contains a few `should-not` statements which are
planned to be `should` statements after the merge function has been
patched for the `:tangle' multi-parameter property.
Best,
Mehmet
From 76e8b80e46db863ded7f207c82dcbcfb5451ddd3 Mon Sep 17 00:00:00 2001
From: Mehmet Tekman <mtekma...@gmail.com>
Date: Mon, 31 Jul 2023 15:19:48 +0200
Subject: [PATCH] * testing/lisp/test-ob.el: New tests for merge-params
(test-ob/get-src-block-property):
(test-ob/merge-params): add new tests for the merge-params source
block header handling function.
---
testing/lisp/test-ob.el | 143 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 143 insertions(+)
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index c8dbd44f4..c9d13f92e 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -314,6 +314,149 @@ this is simple"
(org-babel-next-src-block)
(should (= 14 (org-babel-execute-src-block)))))
+(defun test-ob/get-src-block-property (properties)
+ "Get plist of PROPERTIES and values for the first src block in buffer.
+PROPERTIES is a list of property keywords or a single keyword."
+ (org-with-wide-buffer
+ (goto-char (point-min))
+ (org-babel-next-src-block)
+ (org-set-regexps-and-options)
+ (let ((all-props (nth 2 (org-babel-get-src-block-info))))
+ (if (listp properties)
+ (apply #'nconc (mapcar (lambda (p) (list p (cdr (assoc p all-props)))) properties))
+ (list properties (cdr (assoc properties all-props)))))))
+
+(ert-deftest test-ob/merge-params ()
+ "Test the output of merging multiple header parameters. The
+expected output is given in the contents of the source code block
+in each test. The desired test header parameters are given
+either as a symbol or a list in the `idtest-alist' variable.
+Multiple header parameters must be separated by a newline and
+exactly two spaces in the block contents."
+ (should ;; 1. inherit-document-header-args
+ (equal '(:tangle "/tmp/default_tangle.txt")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* One
+#+begin_src conf
+#+end_src"
+ (test-ob/get-src-block-property :tangle))))
+ (should-not ;; 2. inherit-document-header-with-local-sync-action
+ ;; This should pass with newer merge function with multiple tangle parameters
+ (equal '(:tangle "/tmp/default_tangle.txt skip")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* Two
+#+begin_src conf :tangle skip
+#+end_src"
+ (test-ob/get-src-block-property :tangle))))
+ (should ;; 3. override-document-header-with-local-tfile
+ (equal '(:tangle "randomfile sync")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* Three
+#+begin_src conf :tangle randomfile sync
+#+end_src"
+ (test-ob/get-src-block-property :tangle))))
+ (should ;; 4. override-document-and-parent-header-with-local-tfile-and-action
+ (equal '(:tangle "randomfile sync")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* Four
+:PROPERTIES:
+:header-args: :tangle \"newfile.txt\" import
+:END:
+** A
+#+begin_src conf :tangle randomfile sync
+#+end_src"
+ (test-ob/get-src-block-property :tangle))))
+ (should ;; 5. test-tangle-and-default-results-param-together
+ (equal '(:tangle "randomfile" :results "replace")
+ (org-test-with-temp-text
+ "\
+* Five
+#+begin_src conf :tangle randomfile
+#+end_src"
+ (test-ob/get-src-block-property '(:tangle :results)))))
+ (should-not ;; 6. inherit-document-tfile-take-only-last-local-sync-action
+ ;; This should pass with newer merge function with multiple tangle parameters
+ (equal '(:tangle "/tmp/default_tangle.txt export")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* Six
+#+begin_src conf :tangle import export
+#+end_src"
+ (test-ob/get-src-block-property :tangle))))
+ (should-not ;; 7. ignore-document-header-take-last-tfile-and-sync-action
+ ;; This should pass with newer merge function with multiple tangle parameters
+ (equal '(:tangle "fname2 export")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* Seven
+#+begin_src conf :tangle fname1 fname2 sync export
+#+end_src"
+ (test-ob/get-src-block-property :tangle))))
+ (should ;; 8. test-results-and-exports
+ (equal '(:results "wrap file replace" :exports "code")
+ (org-test-with-temp-text
+ "\
+* Eight
+#+begin_src sh :results file wrap
+#+end_src"
+ (test-ob/get-src-block-property '(:results :exports)))))
+ (should ;; 9. do-not-tangle-this-block --
+ (equal '(:tangle "no")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* Nine
+#+begin_src conf :tangle no
+#+end_src"
+ (test-ob/get-src-block-property :tangle))))
+ (should ;; 10. test-tangle-exports-and-comments
+ (equal '(:tangle "foo.txt" :exports "verbatim code" :comments "link")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* Ten
+:PROPERTIES:
+:header-args: :tangle no :exports verbatim
+:END:
+#+begin_src conf :tangle \"foo.txt\" :comments link
+#+end_src"
+ (test-ob/get-src-block-property '(:tangle :exports :comments)))))
+ (should-not ;; 11. override-document-and-heading-tfile-with-yes
+ ;; This should pass with newer merge function with multiple tangle parameters
+ (equal '(:tangle "foo.txt")
+ (org-test-with-temp-text
+ "\
+#+PROPERTY: header-args :tangle /tmp/default_tangle.txt
+* Eleven
+:PROPERTIES:
+:header-args: :tangle \"foo.txt\"
+:END:
+#+begin_src conf :tangle yes
+#+end_src"
+ (test-ob/get-src-block-property :tangle))))
+ (should ;; 12. tangle-file-with-spaces
+ (equal '(:tangle "file with spaces.txt")
+ (org-test-with-temp-text
+ "\
+* Twelve
+:PROPERTIES:
+:header-args: :tangle \"foo.txt\"
+:END:
+** A
+#+begin_src conf :tangle \"file with spaces.txt\"
+#+end_src"
+ (test-ob/get-src-block-property :tangle)))))
+
(ert-deftest test-ob/inline-src-blocks ()
(should
(= 1
--
2.41.0
