2015-08-22 19:40:54 +00:00
|
|
|
;;; test-org-datetree.el --- Tests for Org Datetree -*- lexical-binding: t; -*-
|
|
|
|
|
|
2019-01-01 10:50:56 +00:00
|
|
|
;; Copyright (C) 2015, 2019 Nicolas Goaziou
|
2015-08-22 19:40:54 +00:00
|
|
|
|
|
|
|
|
;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
|
|
|
|
|
|
|
|
|
;; This file is not part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; 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 07:27:57 +00:00
|
|
|
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
2015-08-22 19:40:54 +00:00
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
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 21:21:37 +00:00
|
|
|
(require 'org-datetree)
|
|
|
|
|
|
2015-08-22 19:40:54 +00:00
|
|
|
(ert-deftest test-org-datetree/find-date-create ()
|
|
|
|
|
"Test `org-datetree-find-date-create' specifications."
|
|
|
|
|
;; When date is missing, create it.
|
2022-10-26 07:15:42 +00:00
|
|
|
(let ((org-blank-before-new-entry '((heading . t))))
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2012\n\n\\*\\* 2012-03 .*\n\n\\*\\*\\* 2012-03-29 .*\\'"
|
|
|
|
|
(org-test-with-temp-text ""
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Do not create new year node when one exists.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2012\n\n\\*\\* 2012-03 .*\n\n\\*\\*\\* 2012-03-29 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2012\n"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Do not create new month node when one exists.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2012\n\n\\*\\* 2012-03 .*\n\n\\*\\*\\* 2012-03-29 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2012\n\n** 2012-03 month"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Do not create new day node when one exists.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2012\n\n\\*\\* 2012-03 .*\n\n\\*\\*\\* 2012-03-29 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2012\n\n** 2012-03 month\n\n*** 2012-03-29 day"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
2022-12-14 20:08:15 +00:00
|
|
|
;; Do not create new day node when one exists.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* DONE 2012 :tag1:tag2:\n\n\\*\\* TODO 2012-03 .*\n\n\\*\\*\\* \\[#A\\] 2012-03-29 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* DONE 2012 :tag1:tag2:\n\n** TODO 2012-03 month\n\n*** [#A] 2012-03-29 day :tag3:"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
2022-10-26 07:15:42 +00:00
|
|
|
;; Sort new entry in right place.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2012\n\n\\*\\* 2012-02 .*\n\n\\*\\*\\* 2012-02-01 .*\n\n\\*\\* 2012-03 .*\n\n\\*\\*\\* 2012-03-29 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2012\n\n** 2012-03 month\n\n*** 2012-03-29 day"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012))
|
|
|
|
|
(org-datetree-find-date-create '(2 1 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; When `org-datetree-add-timestamp' is non-nil, insert a timestamp
|
|
|
|
|
;; in entry. When set to `inactive', insert an inactive one.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2012\n\n\\*\\* 2012-03 .*\n\n\\*\\*\\* \\(2012-03-29\\) .*\n[ \t]*<\\1.*?>\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2012\n"
|
|
|
|
|
(let ((org-datetree-add-timestamp t))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2012\n\n\\*\\* 2012-03 .*\n\n\\*\\*\\* \\(2012-03-29\\) .*\n[ \t]*\\[\\1.*?\\]\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2012\n"
|
|
|
|
|
(let ((org-datetree-add-timestamp 'inactive))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Insert at top level, unless some node has DATE_TREE property. In
|
|
|
|
|
;; this case, date tree becomes one of its sub-trees.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\* 2012"
|
|
|
|
|
(org-test-with-temp-text "* Top"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\*\\* H1.1\n:PROPERTIES:\n:DATE_TREE: t\n:END:\n\n\\*\\*\\* 2012"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* H1\n\n** H1.1\n:PROPERTIES:\n:DATE_TREE: t\n:END:\n\n* H2"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Always leave point at beginning of day entry.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\*\\*\\* 2012-03-29"
|
|
|
|
|
(org-test-with-temp-text "* 2012\n\n** 2012-03 month\n\n*** 2012-03-29 day"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(buffer-substring (point) (line-end-position)))))
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\*\\*\\* 2012-03-29"
|
|
|
|
|
(org-test-with-temp-text "* 2012\n\n** 2012-03 month\n\n*** 2012-03-29 day"
|
|
|
|
|
(let ((org-datetree-add-timestamp t))
|
|
|
|
|
(org-datetree-find-date-create '(3 29 2012)))
|
|
|
|
|
(buffer-substring (point) (line-end-position)))))))
|
2015-08-22 19:40:54 +00:00
|
|
|
|
2019-11-07 03:49:43 +00:00
|
|
|
(ert-deftest test-org-datetree/find-month-create ()
|
|
|
|
|
"Test `org-datetree-find-month-create' specifications."
|
2022-10-26 07:15:42 +00:00
|
|
|
(let ((org-blank-before-new-entry '((heading . t))))
|
|
|
|
|
;; When date is missing, create it with the entry under month.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2012\n\n\\*\\* 2012-03 .*\\'"
|
|
|
|
|
(org-test-with-temp-text ""
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-month-create '(3 29 2012)))
|
|
|
|
|
(org-trim (buffer-string)))))))
|
2019-11-07 03:49:43 +00:00
|
|
|
|
2015-12-29 17:49:04 +00:00
|
|
|
(ert-deftest test-org-datetree/find-iso-week-create ()
|
2022-12-03 10:43:51 +00:00
|
|
|
"Test `org-datetree-find-iso-date-create' specification."
|
2022-10-26 07:15:42 +00:00
|
|
|
(let ((org-blank-before-new-entry '((heading . t))))
|
|
|
|
|
;; When date is missing, create it.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2015\n\n\\*\\* 2015-W01\n\n\\*\\*\\* 2014-12-31 .*\\'"
|
|
|
|
|
(org-test-with-temp-text ""
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Do not create new year node when one exists.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2015\n\n\\*\\* 2015-W01\n\n\\*\\*\\* 2014-12-31 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2015\n"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Do not create new month node when one exists.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2015\n\n\\*\\* 2015-W01\n\n\\*\\*\\* 2014-12-31 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2015\n\n** 2015-W01"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Do not create new day node when one exists.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2015\n\n\\*\\* 2015-W01\n\n\\*\\*\\* 2014-12-31 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2015\n\n** 2015-W01\n\n*** 2014-12-31 day"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
2022-12-14 20:08:15 +00:00
|
|
|
;; Do not create new day node when one exists.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* TODO \\[#B\\] 2015\n\n\\*\\* 2015-W01 :tag1:\n\n\\*\\*\\* 2014-12-31 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* TODO [#B] 2015\n\n** 2015-W01 :tag1:\n\n*** 2014-12-31 day"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
2022-10-26 07:15:42 +00:00
|
|
|
;; Sort new entry in right place.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2015\n\n\\*\\* 2015-W01\n\n\\*\\*\\* 2014-12-31 .*\n\n\\*\\* 2015-W36\n\n\\*\\*\\* 2015-09-01 .*\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2015"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(9 1 2015))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; When `org-datetree-add-timestamp' is non-nil, insert a timestamp
|
|
|
|
|
;; in entry. When set to `inactive', insert an inactive one.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2015\n\n\\*\\* 2015-W01\n\n\\*\\*\\* \\(2014-12-31\\) .*\n[ \t]*<\\1.*?>\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2015\n"
|
|
|
|
|
(let ((org-datetree-add-timestamp t))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\`\\* 2015\n\n\\*\\* 2015-W01\n\n\\*\\*\\* \\(2014-12-31\\) .*\n[ \t]*\\[\\1.*?\\]\\'"
|
|
|
|
|
(org-test-with-temp-text "* 2015\n"
|
|
|
|
|
(let ((org-datetree-add-timestamp 'inactive))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Insert at top level, unless some node has WEEK_TREE property. In
|
|
|
|
|
;; this case, date tree becomes one of its sub-trees.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\* 2015"
|
|
|
|
|
(org-test-with-temp-text "* Top"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\*\\* H1.1\n:PROPERTIES:\n:WEEK_TREE: t\n:END:\n\n\\*\\*\\* 2015"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* H1\n** H1.1\n:PROPERTIES:\n:WEEK_TREE: t\n:END:\n\n* H2"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(org-trim (buffer-string)))))
|
|
|
|
|
;; Always leave point at beginning of day entry.
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\*\\*\\* 2014-12-31"
|
|
|
|
|
(org-test-with-temp-text "* 2015\n\n** 2015-W01\n\n*** 2014-12-31 day"
|
|
|
|
|
(let ((org-datetree-add-timestamp nil))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(buffer-substring (point) (line-end-position)))))
|
|
|
|
|
(should
|
|
|
|
|
(string-match
|
|
|
|
|
"\\*\\*\\* 2014-12-31"
|
|
|
|
|
(org-test-with-temp-text "* 2015\n\n** 2015-W01\n\n*** 2014-12-31 day"
|
|
|
|
|
(let ((org-datetree-add-timestamp t))
|
|
|
|
|
(org-datetree-find-iso-week-create '(12 31 2014)))
|
|
|
|
|
(buffer-substring (point) (line-end-position)))))))
|
2015-12-29 17:49:04 +00:00
|
|
|
|
2015-08-22 19:40:54 +00:00
|
|
|
(provide 'test-org-datetree)
|
|
|
|
|
;;; test-org-datetree.el ends here
|
