clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-05 11:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

query-dsl + tests cleanup

Browse Source 
Remove old string checks that no longer apply. Also added another blank
string case that causes an issue
This commit is contained in:
Gabriel Horner
2022-03-10 16:20:26 -05:00
committed by Tienson Qin
parent 5f0efcf2d8
commit 8468602881
2 changed files with 64 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/test/frontend/db/query_dsl_test.cljs
View File

@@ -42,14 +42,6 @@
(when-let [result (query-dsl/custom-query test-helper/test-db query {})]
(map first (deref result))))
(defn- q
[s]
(db/clear-query-state!)
(let [parse-result (query-dsl/parse s)
query (:query parse-result)]
{:query (if (seq query) (vec query) query)
:result (query-dsl/query test-helper/test-db s)}))
;; Tests
;; =====
@@ -351,17 +343,17 @@ tags: other
"Correctly returns no results"))
(deftest empty-queries
(let [empty-result {:query nil :result nil}]
(testing "nil or blank strings should be ignored"
(are [x y] (= (q x) y)
nil empty-result
"" empty-result
" " empty-result))
(testing "nil or blank strings should be ignored"
(are [x] (nil? (dsl-query x))
nil
""
" "
"\"\""))
(testing "Non exists page should be ignored"
(are [x y] (nil? (:result (q x)))
"[[page-not-exist]]" empty-result
"[[another-page-not-exist]]" empty-result))))
(testing "Non exists page should be ignored"
(are [x] (nil? (dsl-query x))
"[[page-not-exist]]"
"[[another-page-not-exist]]")))
(deftest page-ref-and-boolean-queries
(load-test-files [{:file/path "pages/page1.md"
@@ -487,60 +479,48 @@ last-modified-at:: 1609084800002"}]]
(load-test-files-with-timestamps)
;; (testing "sort-by (created-at defaults to desc)"
;; (db/clear-query-state!)
;; (let [result (->> (q "(and (task now later done)
;; (let [result (->> (dsl-query "(and (task now later done)
;; (sort-by created-at))")
;; :result
;; deref
;; (map #(get-in % [:block/properties "created-at"])))]
;; (is (= result
;; '(1609052959376 1609052958714 1608968448115 1608968448114 1608968448113)))))
;; (testing "sort-by (created-at desc)"
;; (db/clear-query-state!)
;; (let [result (->> (q "(and (todo now later done)
;; (let [result (->> (dsl-query "(and (todo now later done)
;; (sort-by created-at desc))")
;; :result
;; deref
;; (map #(get-in % [:block/properties "created-at"])))]
;; (is (= result
;; '(1609052959376 1609052958714 1608968448115 1608968448114 1608968448113)))))
;; (testing "sort-by (created-at asc)"
;; (db/clear-query-state!)
;; (let [result (->> (q "(and (todo now later done)
;; (let [result (->> (dsl-query "(and (todo now later done)
;; (sort-by created-at asc))")
;; :result
;; deref
;; (map #(get-in % [:block/properties "created-at"])))]
;; (is (= result
;; '(1608968448113 1608968448114 1608968448115 1609052958714 1609052959376)))))
;; (testing "sort-by (last-modified-at defaults to desc)"
;; (db/clear-query-state!)
;; (let [result (->> (q "(and (todo now later done)
;; (let [result (->> (dsl-query "(and (todo now later done)
;; (sort-by last-modified-at))")
;; :result
;; deref
;; (map #(get-in % [:block/properties "last-modified-at"])))]
;; (is (= result
;; '(1609052974285 1609052958714 1608968448120 1608968448115 1608968448113)))))
;; (testing "sort-by (last-modified-at desc)"
;; (db/clear-query-state!)
;; (let [result (->> (q "(and (todo now later done)
;; (let [result (->> (dsl-query "(and (todo now later done)
;; (sort-by last-modified-at desc))")
;; :result
;; deref
;; (map #(get-in % [:block/properties "last-modified-at"])))]
;; (is (= result
;; '(1609052974285 1609052958714 1608968448120 1608968448115 1608968448113)))))
;; (testing "sort-by (last-modified-at desc)"
;; (db/clear-query-state!)
;; (let [result (->> (q "(and (todo now later done)
;; (let [result (->> (dsl-query "(and (todo now later done)
;; (sort-by last-modified-at asc))")
;; :result
;; deref
;; (map #(get-in % [:block/properties "last-modified-at"])))]
;; (is (= result
;; '(1608968448113 1608968448115 1608968448120 1609052958714 1609052974285)))))