From 91c01d90b1143cc4559cc886bcd176f1cd82576d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20Wikstr=C3=B6m?= Date: Sun, 26 May 2019 03:34:34 +0200 Subject: [PATCH 1/2] org-test, test-org-element, test-org, test-ox, test-property-inheritance * org-test.el: Fix org-test-with-temp-text, make it work with , as some tests already expect it to do! * testing/lisp/test-org-element.el Fix a temp-text strings so that it doesn't have an initial newline. * testing/lisp/test-org.el Minor cleanup to align code-structure with other tests. Nothing changes in the test execpt style. * testing/lisp/test-ox.el Fix a couple of temp-text strings so that they don't have initial newlines. * testing/lisp/test-property-inheritance.el Fix wrong file-header and file-ending. --- testing/lisp/test-org-element.el | 4 ++-- testing/lisp/test-org.el | 12 +++++----- testing/lisp/test-ox.el | 28 +++++++++++------------ testing/lisp/test-property-inheritance.el | 4 ++-- testing/org-test.el | 7 +++++- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index 8b4081ee2..4c1e4d181 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -3250,8 +3250,8 @@ DEADLINE: <2012-03-29 thu.> SCHEDULED: <2012-03-29 thu.> CLOSED: [2012-03-29 thu (ert-deftest test-org-element/granularity () "Test granularity impact on buffer parsing." - (org-test-with-temp-text " -* Head 1 + (org-test-with-temp-text + "* Head 1 ** Head 2 #+BEGIN_CENTER Centered paragraph. diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index abc004689..d671b5c78 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -5060,18 +5060,18 @@ Paragraph" (should (equal "1" - (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:END:\n** H2" - (org-entry-get (point) "A" t)))) + (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:END:\n** H2" + (org-entry-get (point-max) "A" t)))) (should (equal "1" - (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:END:\n** H2" + (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:END:\n** H2" (let ((org-use-property-inheritance t)) - (org-entry-get (point) "A" 'selective))))) + (org-entry-get (point-max) "A" 'selective))))) (should-not - (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:END:\n** H2" + (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:END:\n** H2" (let ((org-use-property-inheritance nil)) - (org-entry-get (point) "A" 'selective)))) + (org-entry-get (point-max) "A" 'selective)))) (should (equal "1 2" diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el index 43637b926..e5b4d3c92 100644 --- a/testing/lisp/test-ox.el +++ b/testing/lisp/test-ox.el @@ -2003,8 +2003,8 @@ In particular, structure of the document mustn't be altered after comments removal." (should (equal "Para1\n\nPara2\n" - (org-test-with-temp-text " -Para1 + (org-test-with-temp-text + "Para1 # Comment # Comment @@ -2012,15 +2012,15 @@ Para2" (org-export-as (org-test-default-backend))))) (should (equal "Para1\n\nPara2\n" - (org-test-with-temp-text " -Para1 + (org-test-with-temp-text + "Para1 # Comment Para2" (org-export-as (org-test-default-backend))))) (should (equal "[fn:1] Para1\n\n\nPara2\n" - (org-test-with-temp-text " -\[fn:1] Para1 + (org-test-with-temp-text + "[fn:1] Para1 # Inside definition @@ -2029,8 +2029,8 @@ Para2" (org-export-as (org-test-default-backend))))) (should (equal "[fn:1] Para1\n\nPara2\n" - (org-test-with-temp-text " -\[fn:1] Para1 + (org-test-with-temp-text + "[fn:1] Para1 # Inside definition @@ -2040,24 +2040,24 @@ Para2" (org-export-as (org-test-default-backend))))) (should (equal "[fn:1] Para1\n\nPara2\n" - (org-test-with-temp-text " -\[fn:1] Para1 + (org-test-with-temp-text + "[fn:1] Para1 # Inside definition Para2" (org-export-as (org-test-default-backend))))) (should (equal "[fn:1] Para1\n\nPara2\n" - (org-test-with-temp-text " -\[fn:1] Para1 + (org-test-with-temp-text + "[fn:1] Para1 # Inside definition Para2" (org-export-as (org-test-default-backend))))) (should (equal "- item 1\n\n- item 2\n" - (org-test-with-temp-text " -- item 1 + (org-test-with-temp-text + "- item 1 # Comment diff --git a/testing/lisp/test-property-inheritance.el b/testing/lisp/test-property-inheritance.el index 0f803e5f7..1d0dcfbe1 100644 --- a/testing/lisp/test-property-inheritance.el +++ b/testing/lisp/test-property-inheritance.el @@ -1,4 +1,4 @@ -;;; test-ob-R.el --- tests for ob-R.el +;;; test-property-inheritance.el --- tests for property-inheritance.el ;; Copyright (c) 2011-2014, 2019 Eric Schulte ;; Authors: Eric Schulte @@ -47,4 +47,4 @@ (provide 'test-ob-R) -;;; test-ob-R.el ends here +;;; test-property-inheritance.el ends here diff --git a/testing/org-test.el b/testing/org-test.el index 39c346410..6b218fc00 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -198,7 +198,10 @@ otherwise place the point at the beginning of the inserted text." (def-edebug-spec org-test-with-temp-text (form body)) (defmacro org-test-with-temp-text-in-file (text &rest body) - "Run body in a temporary file buffer with Org mode as the active mode." + "Run body in a temporary file buffer with Org mode as the active mode. +If the string \"\" appears in TEXT then remove it and +place the point there before running BODY, otherwise place the +point at the beginning of the buffer." (declare (indent 1)) (let ((results (cl-gensym))) `(let ((file (make-temp-file "org-test")) @@ -207,6 +210,8 @@ otherwise place the point at the beginning of the inserted text." ,results) (with-temp-file file (insert inside-text)) (find-file file) + (when (re-search-forward "" nil t) + (replace-match "")) (org-mode) (setq ,results (progn ,@body)) (save-buffer) (kill-buffer (current-buffer)) -- 2.17.1