From f0dc3a06d15bf0b5be57d5976bb18b831d3763b3 Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Fri, 15 Mar 2019 12:58:03 +0100 Subject: [PATCH] test-org-clock: Fix one test * testing/lisp/test-org-clock.el (test-org-clock/clocktable/link): Align the table after the substitution of a filename. Further let org-link-descriptive be nil for better readablity of the tables. --- testing/lisp/test-org-clock.el | 174 +++++++++++++++++---------------- 1 file changed, 89 insertions(+), 85 deletions(-) diff --git a/testing/lisp/test-org-clock.el b/testing/lisp/test-org-clock.el index 669066268..6432e17e7 100644 --- a/testing/lisp/test-org-clock.el +++ b/testing/lisp/test-org-clock.el @@ -576,125 +576,129 @@ CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 15:09] => 2:00" "Test \":link\" parameter in Clock table." ;; If there is no file attached to the document, link directly to ;; the headline. - (should - (equal - "| Headline | Time | + (let (org-link-descriptive) + (should + (equal + "| Headline | Time | |--------------+---------| | *Total time* | *26:00* | |--------------+---------| -| [[Foo][Foo]] | 26:00 |" - (org-test-with-temp-text - "* Foo +| [[Foo][Foo]] | 26:00 |" + (org-test-with-temp-text + "* Foo CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t")))) - ;; Otherwise, link to the headline in the current file. - (should - (equal - "| Headline | Time | -|-------------------------------------------+---------| -| *Total time* | *26:00* | -|-------------------------------------------+---------| + (test-org-clock-clocktable-contents ":link t")))) + ;; Otherwise, link to the headline in the current file. + (should + (equal + "| Headline | Time | +|-----------------------------+---------| +| *Total time* | *26:00* | +|-----------------------------+---------| | [[file:filename::Foo][Foo]] | 26:00 |" - (org-test-with-temp-text-in-file - "* Foo + (org-test-with-temp-text + (org-test-with-temp-text-in-file + "* Foo CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (let ((file (buffer-file-name))) - (replace-regexp-in-string - (regexp-quote file) "filename" - (test-org-clock-clocktable-contents ":link t :lang en")))))) - ;; Ignore TODO keyword, priority cookie, COMMENT and tags in - ;; headline. - (should - (equal - "| Headline | Time | + (let ((file (buffer-file-name))) + (replace-regexp-in-string + (regexp-quote file) "filename" + (test-org-clock-clocktable-contents ":link t :lang en")))) + (org-table-align) + (buffer-substring-no-properties (point-min) (point-max))))) + ;; Ignore TODO keyword, priority cookie, COMMENT and tags in + ;; headline. + (should + (equal + "| Headline | Time | |--------------+---------| | *Total time* | *26:00* | |--------------+---------| -| [[Foo][Foo]] | 26:00 |" - (org-test-with-temp-text - "* TODO Foo +| [[Foo][Foo]] | 26:00 |" + (org-test-with-temp-text + "* TODO Foo CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t :lang en")))) - (should - (equal - "| Headline | Time | + (test-org-clock-clocktable-contents ":link t :lang en")))) + (should + (equal + "| Headline | Time | |--------------+---------| | *Total time* | *26:00* | |--------------+---------| -| [[Foo][Foo]] | 26:00 |" - (org-test-with-temp-text - "* [#A] Foo +| [[Foo][Foo]] | 26:00 |" + (org-test-with-temp-text + "* [#A] Foo CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t :lang en")))) - (should - (equal - "| Headline | Time | + (test-org-clock-clocktable-contents ":link t :lang en")))) + (should + (equal + "| Headline | Time | |--------------+---------| | *Total time* | *26:00* | |--------------+---------| -| [[Foo][Foo]] | 26:00 |" - (org-test-with-temp-text - "* COMMENT Foo +| [[Foo][Foo]] | 26:00 |" + (org-test-with-temp-text + "* COMMENT Foo CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t")))) - (should - (equal - "| Headline | Time | + (test-org-clock-clocktable-contents ":link t")))) + (should + (equal + "| Headline | Time | |--------------+---------| | *Total time* | *26:00* | |--------------+---------| -| [[Foo][Foo]] | 26:00 |" - (org-test-with-temp-text - "* Foo :tag: +| [[Foo][Foo]] | 26:00 |" + (org-test-with-temp-text + "* Foo :tag: CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t :lang en")))) - ;; Remove statistics cookie from headline description. - (should - (equal - "| Headline | Time | + (test-org-clock-clocktable-contents ":link t :lang en")))) + ;; Remove statistics cookie from headline description. + (should + (equal + "| Headline | Time | |--------------+---------| | *Total time* | *26:00* | |--------------+---------| -| [[Foo][Foo]] | 26:00 |" - (org-test-with-temp-text - "* Foo [50%] +| [[Foo][Foo]] | 26:00 |" + (org-test-with-temp-text + "* Foo [50%] CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t :lang en")))) - (should - (equal - "| Headline | Time | + (test-org-clock-clocktable-contents ":link t :lang en")))) + (should + (equal + "| Headline | Time | |--------------+---------| | *Total time* | *26:00* | |--------------+---------| -| [[Foo][Foo]] | 26:00 |" - (org-test-with-temp-text - "* Foo [1/2] +| [[Foo][Foo]] | 26:00 |" + (org-test-with-temp-text + "* Foo [1/2] CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t :lang en")))) - ;; Replace links with their description, or turn them into plain - ;; links if there is no description. - (should - (equal - "| Headline | Time | -|-----------------------------------------+---------| -| *Total time* | *26:00* | -|-----------------------------------------+---------| + (test-org-clock-clocktable-contents ":link t :lang en")))) + ;; Replace links with their description, or turn them into plain + ;; links if there is no description. + (should + (equal + "| Headline | Time | +|-----------------------------------------------------------+---------| +| *Total time* | *26:00* | +|-----------------------------------------------------------+---------| | [[Foo [[https://orgmode.org\\][Org mode]\\]][Foo Org mode]] | 26:00 |" - (org-test-with-temp-text - "* Foo [[https://orgmode.org][Org mode]] + (org-test-with-temp-text + "* Foo [[https://orgmode.org][Org mode]] CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t :lang en")))) - (should - (equal - "| Headline | Time | -|------------------------------+---------| -| *Total time* | *26:00* | -|------------------------------+---------| + (test-org-clock-clocktable-contents ":link t :lang en")))) + (should + (equal + "| Headline | Time | +|-----------------------------------------------------------+---------| +| *Total time* | *26:00* | +|-----------------------------------------------------------+---------| | [[Foo [[https://orgmode.org]\\]][Foo https://orgmode.org]] | 26:00 |" - (org-test-with-temp-text - "* Foo [[https://orgmode.org]] + (org-test-with-temp-text + "* Foo [[https://orgmode.org]] CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00" - (test-org-clock-clocktable-contents ":link t :lang en"))))) + (test-org-clock-clocktable-contents ":link t :lang en")))))) (ert-deftest test-org-clock/clocktable/compact () "Test \":compact\" parameter in Clock table."