2012-11-30 15:28:00 +00:00
|
|
|
|
;;; test-org-clock.el --- Tests for org-clock.el
|
|
|
|
|
|
2015-02-16 00:40:07 +00:00
|
|
|
|
;; Copyright (C) 2012, 2014, 2015 Nicolas Goaziou
|
2012-11-30 15:28:00 +00:00
|
|
|
|
|
|
|
|
|
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
|
|
|
|
|
|
|
|
|
|
;; Released under the GNU General Public License version 3
|
|
|
|
|
;; see: http://www.gnu.org/licenses/gpl-3.0.html
|
|
|
|
|
|
|
|
|
|
;;;; Comments
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(defun org-test-clock-create-timestamp (input &optional inactive with-time)
|
|
|
|
|
"Create a timestamp out of a date/time prompt string.
|
|
|
|
|
|
|
|
|
|
INPUT is a string as expected in a date/time prompt, i.e \"+2d\"
|
|
|
|
|
or \"2/5\".
|
|
|
|
|
|
|
|
|
|
When optional argument INACTIVE is non-nil, return an inactive
|
2015-02-20 10:35:16 +00:00
|
|
|
|
timestamp. When optional argument WITH-TIME is non-nil, also
|
2012-11-30 15:28:00 +00:00
|
|
|
|
insert hours and minutes.
|
|
|
|
|
|
|
|
|
|
Return the timestamp as a string."
|
|
|
|
|
(org-element-interpret-data
|
|
|
|
|
(let ((time (decode-time
|
2015-02-20 10:35:16 +00:00
|
|
|
|
(apply #'encode-time
|
2012-11-30 15:28:00 +00:00
|
|
|
|
(mapcar (lambda (el) (or el 0))
|
|
|
|
|
(org-read-date-analyze
|
|
|
|
|
input nil (decode-time (current-time))))))))
|
|
|
|
|
(list 'timestamp
|
|
|
|
|
(list :type (if inactive 'inactive 'active)
|
|
|
|
|
:minute-start (and with-time (nth 1 time))
|
|
|
|
|
:hour-start (and with-time (nth 2 time))
|
|
|
|
|
:day-start (nth 3 time)
|
|
|
|
|
:month-start (nth 4 time)
|
|
|
|
|
:year-start (nth 5 time))))))
|
|
|
|
|
|
|
|
|
|
(defun org-test-clock-create-clock (input1 &optional input2)
|
|
|
|
|
"Create a clock line out of two date/time prompts.
|
|
|
|
|
|
|
|
|
|
INPUT1 and INPUT2 are strings as expected in a date/time prompt,
|
|
|
|
|
i.e \"+2d\" or \"2/5\". They respectively refer to start and end
|
|
|
|
|
range. INPUT2 can be omitted if clock hasn't finished yet.
|
|
|
|
|
|
|
|
|
|
Return the clock line as a string."
|
|
|
|
|
(let* ((beg (org-test-clock-create-timestamp input1 t t))
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(end (and input2 (org-test-clock-create-timestamp input2 t t)))
|
2017-07-07 16:23:10 +00:00
|
|
|
|
(sec-diff (and input2
|
2017-12-03 07:57:37 +00:00
|
|
|
|
(floor (- (org-time-string-to-seconds end)
|
|
|
|
|
(org-time-string-to-seconds beg))))))
|
2012-11-30 15:28:00 +00:00
|
|
|
|
(concat org-clock-string " " beg
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(when end
|
|
|
|
|
(concat "--" end " => "
|
|
|
|
|
(format "%2d:%02d"
|
|
|
|
|
(/ sec-diff 3600)
|
|
|
|
|
(/ (mod sec-diff 3600) 60))))
|
|
|
|
|
"\n")))
|
2012-11-30 15:28:00 +00:00
|
|
|
|
|
2017-02-18 19:55:40 +00:00
|
|
|
|
(defun test-org-clock-clocktable-contents (options &optional initial)
|
|
|
|
|
"Return contents of a Clock table for current buffer
|
|
|
|
|
|
|
|
|
|
OPTIONS is a string of Clock table options. Optional argument
|
|
|
|
|
INITIAL is a string specifying initial contents within the Clock
|
|
|
|
|
table.
|
|
|
|
|
|
|
|
|
|
Caption is ignored in contents. The clocktable doesn't appear in
|
|
|
|
|
the buffer."
|
|
|
|
|
(declare (indent 2))
|
|
|
|
|
(goto-char (point-min))
|
2012-11-30 15:28:00 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(insert "#+BEGIN: clocktable " options "\n")
|
2017-02-18 19:55:40 +00:00
|
|
|
|
(when initial (insert initial))
|
|
|
|
|
(unless (string-suffix-p "\n" initial) (insert "\n"))
|
2015-02-20 10:35:16 +00:00
|
|
|
|
(insert "#+END:\n"))
|
2012-11-30 15:28:00 +00:00
|
|
|
|
(unwind-protect
|
|
|
|
|
(save-excursion
|
2017-02-17 14:00:07 +00:00
|
|
|
|
(let ((org-duration-format 'h:mm)) (org-update-dblock))
|
|
|
|
|
(forward-line)
|
|
|
|
|
;; Skip caption.
|
|
|
|
|
(when (looking-at "#\\+CAPTION:") (forward-line))
|
2017-02-18 19:55:40 +00:00
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
|
(point) (progn (search-forward "#+END:") (line-end-position 0))))
|
2012-11-30 15:28:00 +00:00
|
|
|
|
;; Remove clocktable.
|
2015-02-20 10:35:16 +00:00
|
|
|
|
(delete-region (point) (search-forward "#+END:\n"))))
|
2012-11-30 15:28:00 +00:00
|
|
|
|
|
2016-05-11 16:44:02 +00:00
|
|
|
|
|
|
|
|
|
;;; Clock drawer
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-clock/into-drawer ()
|
|
|
|
|
"Test `org-clock-into-drawer' specifications."
|
|
|
|
|
;; When `org-clock-into-drawer' is nil, do not use a clock drawer.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-log-into-drawer nil))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(org-clock-into-drawer))))
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-log-into-drawer t))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(org-clock-into-drawer))))
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-log-into-drawer "BAR"))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(org-clock-into-drawer))))
|
|
|
|
|
;; When `org-clock-into-drawer' is a string, use it
|
|
|
|
|
;; unconditionally.
|
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer "FOO")
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer "FOO")
|
|
|
|
|
(org-log-into-drawer t))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer "FOO")
|
|
|
|
|
(org-log-into-drawer "BAR"))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
;; When `org-clock-into-drawer' is an integer, return it.
|
|
|
|
|
(should
|
|
|
|
|
(= 1
|
|
|
|
|
(org-test-with-temp-text "* H"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(let ((org-clock-into-drawer 1)
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(= 1
|
|
|
|
|
(org-test-with-temp-text "* H"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(let ((org-clock-into-drawer 1)
|
|
|
|
|
(org-log-into-drawer t))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(= 1
|
|
|
|
|
(org-test-with-temp-text "* H"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(let ((org-clock-into-drawer 1)
|
|
|
|
|
(org-log-into-drawer "BAR"))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
;; Otherwise, any non-nil value defaults to `org-log-into-drawer' or
|
|
|
|
|
;; "LOGBOOK" if it is nil.
|
|
|
|
|
(should
|
|
|
|
|
(equal "LOGBOOK"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer t)
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "LOGBOOK"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer t)
|
|
|
|
|
(org-log-into-drawer t))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer t)
|
|
|
|
|
(org-log-into-drawer "FOO"))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
;; A non-nil "CLOCK_INTO_DRAWER" property overrides
|
|
|
|
|
;; `org-clock-into-drawer' value.
|
|
|
|
|
(should
|
|
|
|
|
(equal "LOGBOOK"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* H\n:PROPERTIES:\n:CLOCK_INTO_DRAWER: t\n:END:"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* H\n:PROPERTIES:\n:CLOCK_INTO_DRAWER: FOO\n:END:"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* H\n:PROPERTIES:\n:CLOCK_INTO_DRAWER: nil\n:END:"
|
|
|
|
|
(let ((org-clock-into-drawer t)
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-log-into-drawer nil))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(org-clock-into-drawer))))
|
|
|
|
|
;; "CLOCK_INTO_DRAWER" can be inherited.
|
|
|
|
|
(should
|
|
|
|
|
(equal "LOGBOOK"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* H\n:PROPERTIES:\n:CLOCK_INTO_DRAWER: t\n:END:\n** H2<point>"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* H\n:PROPERTIES:\n:CLOCK_INTO_DRAWER: FOO\n:END:\n** H2<point>"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-into-drawer)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* H\n:PROPERTIES:\n:CLOCK_INTO_DRAWER: nil\n:END:\n** H2<point>"
|
|
|
|
|
(let ((org-clock-into-drawer t)
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-log-into-drawer nil))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(org-clock-into-drawer)))))
|
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-clock/drawer-name ()
|
|
|
|
|
"Test `org-clock-drawer-name' specifications."
|
|
|
|
|
;; A nil value for `org-clock-into-drawer' means no drawer is
|
|
|
|
|
;; expected whatsoever.
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-log-into-drawer nil))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(org-clock-drawer-name))))
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-log-into-drawer t))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(org-clock-drawer-name))))
|
|
|
|
|
(should-not
|
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer nil)
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-log-into-drawer "FOO"))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(org-clock-drawer-name))))
|
|
|
|
|
;; A string value for `org-clock-into-drawer' means to use it
|
|
|
|
|
;; unconditionally.
|
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer "FOO")
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-drawer-name)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer "FOO")
|
|
|
|
|
(org-log-into-drawer t))
|
|
|
|
|
(org-clock-drawer-name)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer "FOO")
|
|
|
|
|
(org-log-into-drawer "BAR"))
|
|
|
|
|
(org-clock-drawer-name)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
;; When the value in `org-clock-into-drawer' is a number, re-use
|
|
|
|
|
;; `org-log-into-drawer' or use default "LOGBOOK" value.
|
|
|
|
|
(should
|
|
|
|
|
(equal "FOO"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer 1)
|
|
|
|
|
(org-log-into-drawer "FOO"))
|
|
|
|
|
(org-clock-drawer-name)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "LOGBOOK"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer 1)
|
|
|
|
|
(org-log-into-drawer t))
|
|
|
|
|
(org-clock-drawer-name)))))
|
2016-05-11 16:44:02 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "LOGBOOK"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text "* H"
|
|
|
|
|
(let ((org-clock-into-drawer 1)
|
|
|
|
|
(org-log-into-drawer nil))
|
|
|
|
|
(org-clock-drawer-name))))))
|
2012-11-30 15:28:00 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Clocktable
|
|
|
|
|
|
2018-04-28 22:22:53 +00:00
|
|
|
|
(ert-deftest test-org-clock/clocktable/ranges ()
|
|
|
|
|
"Test ranges in Clock table."
|
|
|
|
|
;; Relative time: Previous two days.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"| Headline | Time | |
|
|
|
|
|
|------------------------------+--------+------|
|
|
|
|
|
| *Total time* | *8:00* | |
|
|
|
|
|
|------------------------------+--------+------|
|
|
|
|
|
| Relative times in clocktable | 8:00 | |
|
|
|
|
|
| Foo | | 8:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Relative times in clocktable\n** Foo\n<point>"
|
|
|
|
|
(insert (org-test-clock-create-clock "-3d 8:00" "-3d 12:00"))
|
|
|
|
|
(insert (org-test-clock-create-clock "-2d 15:00" "-2d 18:00"))
|
|
|
|
|
(insert (org-test-clock-create-clock "-1d 8:00" "-1d 13:00"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
":tstart \"<-2d>\" :tend \"<today>\" :indent nil"))))
|
|
|
|
|
;; Relative time: Yesterday until now.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"| Headline | Time | |
|
|
|
|
|
|------------------------------+--------+------|
|
|
|
|
|
| *Total time* | *6:00* | |
|
|
|
|
|
|------------------------------+--------+------|
|
|
|
|
|
| Relative times in clocktable | 6:00 | |
|
|
|
|
|
| Foo | | 6:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Relative times in clocktable\n** Foo\n<point>"
|
|
|
|
|
(insert (org-test-clock-create-clock "-2d 15:00" "-2d 18:00"))
|
|
|
|
|
(insert (org-test-clock-create-clock "-1d 8:00" "-1d 13:00"))
|
|
|
|
|
(insert (org-test-clock-create-clock ". 1:00" ". 2:00"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
":tstart \"<yesterday>\" :tend \"<tomorrow>\" :indent nil"))))
|
|
|
|
|
;; Test `untilnow' block.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"| Headline | Time | |
|
|
|
|
|
|------------------------------+--------+------|
|
|
|
|
|
| *Total time* | *6:00* | |
|
|
|
|
|
|------------------------------+--------+------|
|
|
|
|
|
| Relative times in clocktable | 6:00 | |
|
|
|
|
|
| Foo | | 6:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Relative times in clocktable\n** Foo\n<point>"
|
|
|
|
|
(insert (org-test-clock-create-clock "-10y 15:00" "-10y 18:00"))
|
|
|
|
|
(insert (org-test-clock-create-clock "-2d 15:00" "-2d 18:00"))
|
|
|
|
|
(test-org-clock-clocktable-contents ":block untilnow :indent nil")))))
|
2018-04-26 18:55:27 +00:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-clock/clocktable/match ()
|
|
|
|
|
"Test \":match\" parameter in Clock table."
|
|
|
|
|
;; Test match filtering.
|
2012-11-30 15:28:00 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
2018-04-28 00:47:35 +00:00
|
|
|
|
"| Headline | Time | |
|
|
|
|
|
|--------------+--------+------|
|
2018-04-26 18:55:27 +00:00
|
|
|
|
| *Total time* | *2:00* | |
|
2018-04-28 00:47:35 +00:00
|
|
|
|
|--------------+--------+------|
|
|
|
|
|
| H1 | | 2:00 |"
|
2018-04-26 18:55:27 +00:00
|
|
|
|
(org-test-with-temp-text "** H1\n\n*** H2 :tag:\n\n*** H3\n<point>"
|
2015-07-18 16:58:12 +00:00
|
|
|
|
(insert (org-test-clock-create-clock ". 1:00" ". 2:00"))
|
2018-04-26 18:55:27 +00:00
|
|
|
|
(goto-line 4)
|
|
|
|
|
(insert (org-test-clock-create-clock ". 2:00" ". 4:00"))
|
|
|
|
|
(test-org-clock-clocktable-contents ":match \"tag\" :indent nil")))))
|
2017-02-13 20:24:40 +00:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-clock/clocktable/tags ()
|
|
|
|
|
"Test \":tags\" parameter in Clock table."
|
2018-04-26 18:55:27 +00:00
|
|
|
|
;; Test tags column.
|
2016-08-19 22:22:13 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
2018-04-28 00:47:35 +00:00
|
|
|
|
"| Tags | Headline | Time | |
|
|
|
|
|
|------+--------------+--------+------|
|
2018-04-26 18:55:27 +00:00
|
|
|
|
| | *Total time* | *1:00* | |
|
2018-04-28 00:47:35 +00:00
|
|
|
|
|------+--------------+--------+------|
|
|
|
|
|
| tag | H1 | | 1:00 |"
|
2018-04-26 18:55:27 +00:00
|
|
|
|
(org-test-with-temp-text "** H1 :tag:\n\n*** H2 \n<point>"
|
2016-08-19 22:22:13 +00:00
|
|
|
|
(insert (org-test-clock-create-clock ". 1:00" ". 2:00"))
|
|
|
|
|
(goto-line 4)
|
2018-04-26 18:55:27 +00:00
|
|
|
|
(test-org-clock-clocktable-contents ":tags t :indent nil")))))
|
2017-02-13 20:24:40 +00:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-clock/clocktable/scope ()
|
|
|
|
|
"Test \":scope\" parameter in Clock table."
|
2016-10-27 09:42:27 +00:00
|
|
|
|
;; Test `file-with-archives' scope. In particular, preserve "TBLFM"
|
|
|
|
|
;; line, and ignore "file" column.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-12-03 07:57:37 +00:00
|
|
|
|
"| Headline | Time | |
|
|
|
|
|
|--------------+--------+-----|
|
|
|
|
|
| *Total time* | *8:40* | foo |
|
|
|
|
|
|--------------+--------+-----|
|
|
|
|
|
| Test | 8:40 | foo |
|
2017-02-18 19:55:40 +00:00
|
|
|
|
#+TBLFM: $3=string(\"foo\")"
|
2016-10-27 09:42:27 +00:00
|
|
|
|
(org-test-with-temp-text-in-file
|
2017-02-13 20:24:40 +00:00
|
|
|
|
"* Test
|
2017-12-03 07:57:37 +00:00
|
|
|
|
CLOCK: [2012-03-29 Thu 8:00]--[2012-03-29 Thu 16:40] => 8:40"
|
2017-02-18 19:55:40 +00:00
|
|
|
|
(test-org-clock-clocktable-contents ":scope file-with-archives"
|
2017-03-06 16:57:31 +00:00
|
|
|
|
"#+TBLFM: $3=string(\"foo\")"))))
|
|
|
|
|
;; Test "function" scope.
|
|
|
|
|
(should
|
|
|
|
|
(string-match-p
|
|
|
|
|
(regexp-quote "| ALL *Total time* | *1:00* |")
|
|
|
|
|
(org-test-with-temp-text-in-file
|
|
|
|
|
"* Test
|
|
|
|
|
CLOCK: [2012-03-29 Thu 16:00]--[2012-03-29 Thu 17:00] => 1:00"
|
|
|
|
|
(let ((the-file (buffer-file-name)))
|
|
|
|
|
(org-test-with-temp-text-in-file ""
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
(format ":scope (lambda () (list %S))" the-file))))))))
|
2017-02-13 20:24:40 +00:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-clock/clocktable/maxlevel ()
|
|
|
|
|
"Test \":maxlevel\" parameter in Clock table."
|
|
|
|
|
(should
|
2017-05-27 16:15:05 +00:00
|
|
|
|
(equal "| Headline | Time | |
|
|
|
|
|
|--------------+--------+------|
|
|
|
|
|
| *Total time* | *6:00* | |
|
|
|
|
|
|--------------+--------+------|
|
|
|
|
|
| Foo | 6:00 | |
|
|
|
|
|
| \\_ Bar | | 2:00 |"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"* Foo
|
2017-02-13 20:24:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 11:09]--[2016-12-28 Wed 15:09] => 4:00
|
|
|
|
|
** Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 15:09] => 2:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 3"))))
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "| Headline | Time | |
|
|
|
|
|
|--------------+--------+------|
|
|
|
|
|
| *Total time* | *6:00* | |
|
|
|
|
|
|--------------+--------+------|
|
|
|
|
|
| Foo | 6:00 | |
|
2017-02-18 19:55:40 +00:00
|
|
|
|
| \\_ Bar | | 2:00 |"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"* Foo
|
2017-02-13 20:24:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 11:09]--[2016-12-28 Wed 15:09] => 4:00
|
|
|
|
|
** Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 15:09] => 2:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 2"))))
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal "| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *6:00* |
|
|
|
|
|
|--------------+--------|
|
2017-02-18 19:55:40 +00:00
|
|
|
|
| Foo | 6:00 |"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"* Foo
|
2017-02-13 20:24:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 11:09]--[2016-12-28 Wed 15:09] => 4:00
|
|
|
|
|
** Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 15:09] => 2:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 1"))))
|
2017-02-13 20:24:40 +00:00
|
|
|
|
;; Special ":maxlevel 0" case: only report total file time.
|
|
|
|
|
(should
|
|
|
|
|
(equal "| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *6:00* |
|
2017-02-18 19:55:40 +00:00
|
|
|
|
|--------------+--------|"
|
2017-02-13 20:24:40 +00:00
|
|
|
|
(org-test-with-temp-text
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"* Foo
|
2017-02-13 20:24:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 11:09]--[2016-12-28 Wed 15:09] => 4:00
|
|
|
|
|
** Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 15:09] => 2:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 0")))))
|
2017-02-13 20:24:40 +00:00
|
|
|
|
|
|
|
|
|
(ert-deftest test-org-clock/clocktable/formula ()
|
|
|
|
|
"Test \":formula\" parameter in Clock table."
|
2016-12-29 00:19:00 +00:00
|
|
|
|
;; Test ":formula %". Handle various duration formats.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"| Headline | Time | % |
|
|
|
|
|
|--------------+--------+-------|
|
|
|
|
|
| *Total time* | *6:00* | 100.0 |
|
|
|
|
|
|--------------+--------+-------|
|
|
|
|
|
| Foo | 4:00 | 66.7 |
|
2017-02-18 19:55:40 +00:00
|
|
|
|
| Bar | 2:00 | 33.3 |"
|
2016-12-29 00:19:00 +00:00
|
|
|
|
(org-test-with-temp-text
|
2017-02-13 20:24:40 +00:00
|
|
|
|
"* Foo
|
2016-12-29 00:19:00 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 11:09]--[2016-12-28 Wed 15:09] => 4:00
|
|
|
|
|
* Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 15:09] => 2:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 1 :formula %"))))
|
2016-12-29 00:19:00 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| Headline | Time | % |
|
|
|
|
|
|--------------+---------+-------|
|
|
|
|
|
| *Total time* | *28:00* | 100.0 |
|
|
|
|
|
|--------------+---------+-------|
|
|
|
|
|
| Foo | 26:00 | 92.9 |
|
|
|
|
|
| Bar | 2:00 | 7.1 |"
|
2016-12-29 00:19:00 +00:00
|
|
|
|
(org-test-with-temp-text
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"* Foo
|
2016-12-29 00:19:00 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00
|
|
|
|
|
* Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 15:09] => 2:00"
|
2017-03-19 09:59:52 +00:00
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 1 :formula %"))))
|
|
|
|
|
;; Properly align column with different depths.
|
|
|
|
|
(should
|
|
|
|
|
(equal "| Headline | Time | | | % |
|
|
|
|
|
|---------------+--------+------+------+-------|
|
|
|
|
|
| *Total time* | *1:00* | | | 100.0 |
|
|
|
|
|
|---------------+--------+------+------+-------|
|
|
|
|
|
| foo | 1:00 | | | 100.0 |
|
|
|
|
|
| \\_ sub | | 0:15 | | 25.0 |
|
|
|
|
|
| \\_ sub2 | | 0:15 | | 25.0 |
|
|
|
|
|
| \\_ sub3 | | 0:30 | | 50.0 |
|
|
|
|
|
| \\_ subsub1 | | | 0:15 | 25.0 |
|
|
|
|
|
| \\_ subsub1 | | | 0:15 | 25.0 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* foo
|
|
|
|
|
** sub
|
|
|
|
|
:LOGBOOK:
|
|
|
|
|
CLOCK: [2017-03-18 Sat 15:00]--[2017-03-18 Sat 15:15] => 0:15
|
|
|
|
|
:END:
|
|
|
|
|
** sub2
|
|
|
|
|
:LOGBOOK:
|
|
|
|
|
CLOCK: [2017-03-18 Sat 15:15]--[2017-03-18 Sat 15:30] => 0:15
|
|
|
|
|
:END:
|
|
|
|
|
** sub3
|
|
|
|
|
*** subsub1
|
|
|
|
|
:LOGBOOK:
|
|
|
|
|
CLOCK: [2017-03-18 Sat 13:00]--[2017-03-18 Sat 13:15] => 0:15
|
|
|
|
|
:END:
|
|
|
|
|
*** subsub1
|
|
|
|
|
:LOGBOOK:
|
|
|
|
|
CLOCK: [2017-03-18 Sat 14:00]--[2017-03-18 Sat 14:15] => 0:15
|
|
|
|
|
:END:"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 3 :formula %")))))
|
2012-11-30 15:28:00 +00:00
|
|
|
|
|
2017-02-17 14:00:07 +00:00
|
|
|
|
(ert-deftest test-org-clock/clocktable/lang ()
|
|
|
|
|
"Test \":lang\" parameter in Clock table."
|
|
|
|
|
;; Test foreign translation
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| Foo | 26:00 |"
|
2017-02-17 14:00:07 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 1 :lang en"))))
|
2017-02-17 14:00:07 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| En-tête | Durée |
|
|
|
|
|
|----------------+---------|
|
|
|
|
|
| *Durée totale* | *26:00* |
|
|
|
|
|
|----------------+---------|
|
|
|
|
|
| Foo | 26:00 |"
|
2017-02-17 14:00:07 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 1 :lang fr"))))
|
2017-02-17 14:00:07 +00:00
|
|
|
|
;; No :lang parameter is equivalent to "en".
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 1 :lang en"))
|
2017-02-17 14:00:07 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 1"))))
|
2017-02-17 14:00:07 +00:00
|
|
|
|
;; Unknown translation fall backs to "en".
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| Foo | 26:00 |"
|
2017-02-17 14:00:07 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":maxlevel 1 :lang foo")))))
|
2017-02-17 14:00:07 +00:00
|
|
|
|
|
2017-04-17 08:03:23 +00:00
|
|
|
|
(ert-deftest test-org-clock/clocktable/link ()
|
|
|
|
|
"Test \":link\" parameter in Clock table."
|
|
|
|
|
;; If there is no file attached to the document, link directly to
|
|
|
|
|
;; the headline.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| [[Foo][Foo]] | 26:00 |"
|
2017-04-17 08:03:23 +00: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
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| [[file:filename::Foo][Foo]] | 26:00 |"
|
2017-04-17 08:03:23 +00:00
|
|
|
|
(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"))))))
|
|
|
|
|
;; Ignore TODO keyword, priority cookie, COMMENT and tags in
|
|
|
|
|
;; headline.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| [[Foo][Foo]] | 26:00 |"
|
2017-04-17 08:03:23 +00: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"))))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| [[Foo][Foo]] | 26:00 |"
|
2017-04-17 08:03:23 +00: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"))))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| [[Foo][Foo]] | 26:00 |"
|
2017-04-17 08:03:23 +00: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
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| [[Foo][Foo]] | 26:00 |"
|
2017-04-17 08:03:23 +00: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"))))
|
|
|
|
|
;; Remove statistics cookie from headline description.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| [[Foo][Foo]] | 26:00 |"
|
2017-04-17 08:03:23 +00: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"))))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| [[Foo][Foo]] | 26:00 |"
|
2017-04-17 08:03:23 +00: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"))))
|
|
|
|
|
;; Replace links with their description, or turn them into plain
|
|
|
|
|
;; links if there is no description.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
2018-01-16 18:42:57 +00:00
|
|
|
|
| [[Foo %5B%5Bhttps://orgmode.org%5D%5BOrg mode%5D%5D][Foo Org mode]] | 26:00 |"
|
2017-04-17 08:03:23 +00:00
|
|
|
|
(org-test-with-temp-text
|
2018-01-16 18:42:57 +00:00
|
|
|
|
"* Foo [[https://orgmode.org][Org mode]]
|
2017-04-17 08:03:23 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":link t"))))
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2018-01-16 18:42:57 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|-------------------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|-------------------------+---------|
|
|
|
|
|
| [[Foo %5B%5Bhttps://orgmode.org%5D%5D][Foo https://orgmode.org]] | 26:00 |"
|
2017-04-17 08:03:23 +00:00
|
|
|
|
(org-test-with-temp-text
|
2018-01-16 18:42:57 +00:00
|
|
|
|
"* Foo [[https://orgmode.org]]
|
2017-04-17 08:03:23 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":link t")))))
|
|
|
|
|
|
2017-02-18 13:54:43 +00:00
|
|
|
|
(ert-deftest test-org-clock/clocktable/compact ()
|
|
|
|
|
"Test \":compact\" parameter in Clock table."
|
|
|
|
|
;; With :compact, all headlines are in the same column.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *26:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| Foo | 26:00 |"
|
2017-02-18 13:54:43 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":compact t"))))
|
2017-02-18 13:54:43 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *52:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| Foo | 52:00 |
|
|
|
|
|
| \\_ Bar | 26:00 |"
|
2017-02-18 13:54:43 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00
|
|
|
|
|
** Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":compact t"))))
|
2017-02-18 13:54:43 +00:00
|
|
|
|
;; :maxlevel does not affect :compact parameter.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *52:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| Foo | 52:00 |
|
|
|
|
|
| \\_ Bar | 26:00 |"
|
2017-02-18 13:54:43 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00
|
|
|
|
|
** Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":compact t :maxlevel 2"))))
|
2017-02-18 13:54:43 +00:00
|
|
|
|
;; :compact implies a non-nil :indent parameter.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *52:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| Foo | 52:00 |
|
|
|
|
|
| \\_ Bar | 26:00 |"
|
2017-02-18 13:54:43 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00
|
|
|
|
|
** Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":compact t :indent nil"))))
|
2017-02-18 13:54:43 +00:00
|
|
|
|
;; :compact implies a nil :level parameter.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-02-18 19:55:40 +00:00
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *52:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| Foo | 52:00 |
|
|
|
|
|
| \\_ Bar | 26:00 |"
|
2017-02-18 13:54:43 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00
|
|
|
|
|
** Bar
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":compact t :level t")))))
|
2017-02-18 13:54:43 +00:00
|
|
|
|
|
2017-02-18 19:22:30 +00:00
|
|
|
|
(ert-deftest test-org-clock/clocktable/properties ()
|
|
|
|
|
"Test \":properties\" parameter in Clock table."
|
|
|
|
|
;; Include a new column with list properties.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| A | Headline | Time |
|
|
|
|
|
|---+--------------+---------|
|
|
|
|
|
| | *Total time* | *26:00* |
|
|
|
|
|
|---+--------------+---------|
|
|
|
|
|
| 1 | Foo | 26:00 |"
|
2017-02-18 19:22:30 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:A: 1
|
|
|
|
|
:END:
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":properties (\"A\")"))))
|
2017-02-18 19:22:30 +00:00
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"| A | Headline | Time | |
|
|
|
|
|
|---+--------------+---------+-------|
|
|
|
|
|
| | *Total time* | *52:00* | |
|
|
|
|
|
|---+--------------+---------+-------|
|
|
|
|
|
| | Foo | 52:00 | |
|
2017-02-18 19:55:40 +00:00
|
|
|
|
| 1 | \\_ Bar | | 26:00 |"
|
2017-02-18 19:22:30 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00
|
|
|
|
|
** Bar
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:A: 1
|
|
|
|
|
:END:
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":properties (\"A\")"))))
|
2017-02-18 19:22:30 +00:00
|
|
|
|
;; Handle missing properties.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
2017-05-27 16:15:05 +00:00
|
|
|
|
"| A | Headline | Time |
|
|
|
|
|
|---+--------------+---------|
|
|
|
|
|
| | *Total time* | *26:00* |
|
|
|
|
|
|---+--------------+---------|
|
|
|
|
|
| 1 | Foo | 26:00 |"
|
2017-02-18 19:22:30 +00:00
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
:PROPERTIES:
|
|
|
|
|
:A: 1
|
|
|
|
|
:END:
|
2017-02-18 19:55:40 +00:00
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":properties (\"A\")")))))
|
2017-02-17 14:00:07 +00:00
|
|
|
|
|
2017-05-27 16:15:05 +00:00
|
|
|
|
(ert-deftest test-org-clock/clocktable/tcolumns ()
|
|
|
|
|
"Test \":tcolumns\" parameter in Clock table."
|
|
|
|
|
;; When :tcolumns is smaller than the deepest headline level, lump
|
|
|
|
|
;; lower levels in the last column.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"| Headline | Time |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| *Total time* | *52:00* |
|
|
|
|
|
|--------------+---------|
|
|
|
|
|
| Foo | 52:00 |
|
|
|
|
|
| \\_ Bar | 26:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00
|
|
|
|
|
** Bar
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":tcolumns 1"))))
|
|
|
|
|
;; :tcolumns cannot create more columns than the deepest headline
|
|
|
|
|
;; level.
|
|
|
|
|
(should
|
|
|
|
|
(equal
|
|
|
|
|
"| Headline | Time | |
|
|
|
|
|
|--------------+---------+-------|
|
|
|
|
|
| *Total time* | *52:00* | |
|
|
|
|
|
|--------------+---------+-------|
|
|
|
|
|
| Foo | 52:00 | |
|
|
|
|
|
| \\_ Bar | | 26:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00
|
|
|
|
|
** Bar
|
|
|
|
|
CLOCK: [2016-12-27 Wed 13:09]--[2016-12-28 Wed 15:09] => 26:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":tcolumns 3"))))
|
|
|
|
|
;; Pathological case: when no headline contributes to the total
|
|
|
|
|
;; time, there is only one time column.
|
|
|
|
|
(should
|
|
|
|
|
(equal "| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *0:00* |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2016-12-28 Wed 11:09]--[2016-12-28 Wed 11:09] => 0:00
|
|
|
|
|
** Bar
|
|
|
|
|
CLOCK: [2016-12-28 Wed 13:09]--[2016-12-28 Wed 13:09] => 0:00"
|
|
|
|
|
(test-org-clock-clocktable-contents ":tcolumns 2")))))
|
|
|
|
|
|
2018-04-28 22:22:53 +00:00
|
|
|
|
(ert-deftest test-org-clock/clocktable/step ()
|
|
|
|
|
"Test \":step\" parameter in Clock table."
|
|
|
|
|
;; Regression test: week crossing month boundary before :wstart
|
|
|
|
|
;; day-of-week.
|
|
|
|
|
(should
|
|
|
|
|
(equal "
|
|
|
|
|
Weekly report starting on: [2017-09-25 Mon]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *1:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 1:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2017-09-30 Sat 12:00]--[2017-09-30 Sat 13:00] => 1:00
|
|
|
|
|
CLOCK: [2017-10-01 Sun 11:00]--[2017-10-01 Sun 13:00] => 2:00
|
|
|
|
|
CLOCK: [2017-10-02 Mon 11:00]--[2017-10-02 Mon 14:00] => 3:00"
|
|
|
|
|
(let ((system-time-locale "en_US"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
":step week :block 2017-09 :stepskip0 t")))))
|
|
|
|
|
(should
|
|
|
|
|
(equal "
|
|
|
|
|
Weekly report starting on: [2017-10-01 Sun]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *2:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 2:00 |
|
|
|
|
|
|
|
|
|
|
Weekly report starting on: [2017-10-02 Mon]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *7:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 7:00 |
|
|
|
|
|
|
|
|
|
|
Weekly report starting on: [2017-10-09 Mon]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *5:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 5:00 |
|
|
|
|
|
"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2017-09-30 Sat 12:00]--[2017-09-30 Sat 13:00] => 1:00
|
|
|
|
|
CLOCK: [2017-10-01 Sun 11:00]--[2017-10-01 Sun 13:00] => 2:00
|
|
|
|
|
CLOCK: [2017-10-02 Mon 11:00]--[2017-10-02 Mon 14:00] => 3:00
|
|
|
|
|
CLOCK: [2017-10-08 Sun 09:00]--[2017-10-08 Sun 13:00] => 4:00
|
|
|
|
|
CLOCK: [2017-10-09 Mon 09:00]--[2017-10-09 Mon 14:00] => 5:00"
|
|
|
|
|
(let ((system-time-locale "en_US"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
":step week :block 2017-10 :stepskip0 t")))))
|
|
|
|
|
;; :step day
|
|
|
|
|
(should
|
|
|
|
|
(equal "
|
|
|
|
|
Daily report: [2017-10-02 Mon]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *3:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 3:00 |
|
|
|
|
|
|
|
|
|
|
Daily report: [2017-10-03 Tue]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *0:00* |
|
|
|
|
|
|
|
|
|
|
Daily report: [2017-10-04 Wed]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *0:00* |
|
|
|
|
|
|
|
|
|
|
Daily report: [2017-10-05 Thu]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *0:00* |
|
|
|
|
|
|
|
|
|
|
Daily report: [2017-10-06 Fri]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *0:00* |
|
|
|
|
|
|
|
|
|
|
Daily report: [2017-10-07 Sat]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *0:00* |
|
|
|
|
|
|
|
|
|
|
Daily report: [2017-10-08 Sun]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *4:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 4:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2017-09-30 Sat 12:00]--[2017-09-30 Sat 13:00] => 1:00
|
|
|
|
|
CLOCK: [2017-10-01 Sun 11:00]--[2017-10-01 Sun 13:00] => 2:00
|
|
|
|
|
CLOCK: [2017-10-02 Mon 11:00]--[2017-10-02 Mon 14:00] => 3:00
|
|
|
|
|
CLOCK: [2017-10-08 Sun 09:00]--[2017-10-08 Sun 13:00] => 4:00
|
|
|
|
|
CLOCK: [2017-10-09 Mon 09:00]--[2017-10-09 Mon 14:00] => 5:00"
|
|
|
|
|
(let ((system-time-locale "en_US"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
":step day :block 2017-W40")))))
|
|
|
|
|
;; Regression test: take :tstart and :tend hours into consideration.
|
|
|
|
|
(should
|
|
|
|
|
(equal "
|
|
|
|
|
Weekly report starting on: [2017-12-25 Mon]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *8:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 8:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2017-12-27 Wed 08:00]--[2017-12-27 Wed 16:00] => 8:00"
|
|
|
|
|
(let ((system-time-locale "en_US"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
(concat ":step week :tstart \"<2017-12-25 Mon>\" "
|
|
|
|
|
":tend \"<2017-12-27 Wed 23:59>\""))))))
|
|
|
|
|
(should
|
|
|
|
|
(equal "
|
|
|
|
|
Daily report: [2017-12-27 Wed]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *8:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 8:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2017-12-27 Wed 08:00]--[2017-12-27 Wed 16:00] => 8:00"
|
|
|
|
|
(let ((system-time-locale "en_US"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
(concat ":step day :tstart \"<2017-12-25 Mon>\" "
|
|
|
|
|
":tend \"<2017-12-27 Wed 23:59>\" :stepskip0 t")))))))
|
2017-10-08 08:42:21 +00:00
|
|
|
|
|
2018-06-27 01:33:39 +00:00
|
|
|
|
(ert-deftest test-org-clock/clocktable/extend-today-until ()
|
|
|
|
|
"Test assignment of clock time to days in presence of \"org-extend-today-until\"."
|
|
|
|
|
;; Basic test of :block with org-extend-today-until - the report for
|
|
|
|
|
;; 2017-09-30 should include the time clocked on 2017-10-01 before
|
|
|
|
|
;; 04:00.
|
|
|
|
|
(should
|
|
|
|
|
(equal "| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *2:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 2:00 |"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2017-09-30 Sat 12:00]--[2017-09-30 Sat 13:00] => 1:00
|
|
|
|
|
CLOCK: [2017-10-01 Sun 02:00]--[2017-10-01 Sun 03:00] => 1:00
|
|
|
|
|
CLOCK: [2017-10-01 Sun 11:00]--[2017-10-01 Sun 13:00] => 2:00"
|
|
|
|
|
(setq-local org-extend-today-until 4)
|
|
|
|
|
(let ((system-time-locale "en_US"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
":block 2017-09-30")))))
|
|
|
|
|
|
|
|
|
|
;; Week-length block - time on Monday before 04:00 should be
|
|
|
|
|
;; assigned to previous week.
|
|
|
|
|
(should
|
|
|
|
|
(equal "
|
|
|
|
|
Weekly report starting on: [2017-10-01 Sun]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *2:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 2:00 |
|
|
|
|
|
|
|
|
|
|
Weekly report starting on: [2017-10-02 Mon]
|
|
|
|
|
| Headline | Time |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| *Total time* | *2:00* |
|
|
|
|
|
|--------------+--------|
|
|
|
|
|
| Foo | 2:00 |
|
|
|
|
|
"
|
|
|
|
|
(org-test-with-temp-text
|
|
|
|
|
"* Foo
|
|
|
|
|
CLOCK: [2017-10-01 Sun 12:00]--[2017-10-01 Sun 13:00] => 1:00
|
|
|
|
|
CLOCK: [2017-10-02 Mon 02:00]--[2017-10-02 Mon 03:00] => 1:00
|
|
|
|
|
CLOCK: [2017-10-02 Mon 11:00]--[2017-10-02 Mon 13:00] => 2:00"
|
|
|
|
|
(setq-local org-extend-today-until 4)
|
|
|
|
|
(let ((system-time-locale "en_US"))
|
|
|
|
|
(test-org-clock-clocktable-contents
|
|
|
|
|
":step week :block 2017-10 :stepskip0 t"))))))
|
|
|
|
|
|
|
|
|
|
|
2012-11-30 15:28:00 +00:00
|
|
|
|
(provide 'test-org-clock)
|
|
|
|
|
;;; test-org-clock.el end here
|