emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/org a189697681 04/12: Fix tests for `org-parse-time-str


From: ELPA Syncer
Subject: [elpa] externals/org a189697681 04/12: Fix tests for `org-parse-time-string' and `org-clock'
Date: Sun, 17 Jul 2022 04:57:50 -0400 (EDT)

branch: externals/org
commit a189697681e956cd219c0f9da3d6bc2ad1a94486
Author: Max Nikulin <manikulin@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>

    Fix tests for `org-parse-time-string' and `org-clock'
    
    * testing/lisp/test-org.el (ert-deftest test-org/org-parse-time-string):
    Update test expectations to use DST of -1 (guess) after fix of
    `org-parse-time-string'.
    * testing/lisp/test-org-clock.el (org-test-clock-create-timestamp):
    Do not change timezone from nil to 0.  Prevent test failures in zones
    other than UTC.
---
 testing/lisp/test-org-clock.el |  6 +++---
 testing/lisp/test-org.el       | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/testing/lisp/test-org-clock.el b/testing/lisp/test-org-clock.el
index d2179e1ec8..89e0e2ade7 100644
--- a/testing/lisp/test-org-clock.el
+++ b/testing/lisp/test-org-clock.el
@@ -27,9 +27,9 @@ Return the timestamp as a string."
   (org-element-interpret-data
    (let ((time (decode-time
                 (apply #'encode-time
-                       (mapcar (lambda (el) (or el 0))
-                               (org-read-date-analyze
-                                input nil (decode-time (current-time))))))))
+                       (org-fix-decoded-time
+                        (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))
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index fcf2d0b5f9..b371074e48 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -268,15 +268,15 @@
 (ert-deftest test-org/org-parse-time-string ()
   "Test `org-parse-time-string'."
   (should (equal (org-parse-time-string "2012-03-29 16:40")
-                '(0 40 16 29 3 2012 nil nil nil)))
+                '(0 40 16 29 3 2012 nil -1 nil)))
   (should (equal (org-parse-time-string "[2012-03-29 16:40]")
-                '(0 40 16 29 3 2012 nil nil nil)))
+                '(0 40 16 29 3 2012 nil -1 nil)))
   (should (equal (org-parse-time-string "<2012-03-29 16:40>")
-                '(0 40 16 29 3 2012 nil nil nil)))
+                '(0 40 16 29 3 2012 nil -1 nil)))
   (should (equal (org-parse-time-string "<2012-03-29>")
-                '(0 0 0 29 3 2012 nil nil nil)))
+                '(0 0 0 29 3 2012 nil -1 nil)))
   (should (equal (org-parse-time-string "<2012-03-29>" t)
-                '(0 nil nil 29 3 2012 nil nil nil))))
+                '(0 nil nil 29 3 2012 nil -1 nil))))
 
 (ert-deftest test-org/closest-date ()
   "Test `org-closest-date' specifications."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]