diff --git a/tests/test-org-ql.el b/tests/test-org-ql.el index 1029fcd..5771cca 100644 --- a/tests/test-org-ql.el +++ b/tests/test-org-ql.el @@ -512,10 +512,22 @@ with keyword arg NOW in PLIST." ;; :from ,(make-ts :unix 1546322400.0) ;; :to ,(make-ts :unix 1546408799.0)))) - (expect (org-ql--normalize-query '(ts-active :on "2019-01-01")) - :to-equal `(ts :type active - :from ,(ts-apply :hour 0 :minute 0 :second 0 (ts-parse "2019-01-01")) - :to ,(ts-apply :hour 23 :minute 59 :second 59 (ts-parse "2019-01-01")))) + (expect (org-ql--normalize-query '(or (ts-active :on "2019-01-01") + (ts-a :on "2019-01-01") + (ts-inactive :on "2019-01-01") + (ts-i :on "2019-01-01"))) + :to-equal `(or (ts :type active + :from ,(ts-apply :hour 0 :minute 0 :second 0 (ts-parse "2019-01-01")) + :to ,(ts-apply :hour 23 :minute 59 :second 59 (ts-parse "2019-01-01"))) + (ts :type active + :from ,(ts-apply :hour 0 :minute 0 :second 0 (ts-parse "2019-01-01")) + :to ,(ts-apply :hour 23 :minute 59 :second 59 (ts-parse "2019-01-01"))) + (ts :type inactive + :from ,(ts-apply :hour 0 :minute 0 :second 0 (ts-parse "2019-01-01")) + :to ,(ts-apply :hour 23 :minute 59 :second 59 (ts-parse "2019-01-01"))) + (ts :type inactive + :from ,(ts-apply :hour 0 :minute 0 :second 0 (ts-parse "2019-01-01")) + :to ,(ts-apply :hour 23 :minute 59 :second 59 (ts-parse "2019-01-01"))))) ) (describe "Query preambles"