Skip to content

Commit 1bf431a

Browse files
committed
Refactor, clean up
1 parent 7e77964 commit 1bf431a

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

test/json_path/test/regression_test.clj

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
(defn queries_from_suite [suite-yaml]
99
(:queries (yaml/from-file suite-yaml)))
1010

11+
(defn- query-implementation [{:keys [selector document ordered]}]
12+
(let [current (json-path/at-path selector document)]
13+
(if (= ordered false)
14+
(sort-by json/write-str current)
15+
current)))
16+
1117
(deftest regression
1218
(let [non-consensus-query-ids (->> (queries_from_suite "test/Clojure_json-path.yaml")
1319
(map :id)
@@ -17,14 +23,10 @@
1723
(map (fn [{:keys [id selector document ordered] :as query}]
1824
(let [expected (if (contains? query :scalar-consensus)
1925
(:scalar-consensus query)
20-
(:consensus query))
21-
current (json-path/at-path selector document)
22-
current-reordered (if (= ordered false)
23-
(sort-by json/write-str current)
24-
current)]
26+
(:consensus query))]
2527
(testing id
2628
(is (= expected
27-
current-reordered))))))
29+
(query-implementation query)))))))
2830
doall)))
2931

3032
(defn- report-change [current-reordered status result {:keys [selector document consensus id]}]
@@ -50,21 +52,18 @@
5052
query-lookup (zipmap (map :id all-queries)
5153
all-queries)]
5254
(->> (queries_from_suite "test/Clojure_json-path.yaml")
53-
(map (fn [{:keys [id status result] :as query}]
54-
(let [{:keys [selector document ordered]} (get query-lookup id)]
55+
(map (fn [{:keys [id status result]}]
56+
(let [query (get query-lookup id)]
5557
(testing id
5658
(try
57-
(let [current (doall (json-path/at-path selector document))
58-
current-reordered (if (= ordered false)
59-
(sort-by json/write-str current)
60-
current)]
59+
(let [current (query-implementation query)]
6160
(when (or (= "error" status)
62-
(not= result current-reordered))
63-
(report-change current-reordered status result (get query-lookup id))))
61+
(not= result current))
62+
(report-change current status result query)))
6463
(catch Exception e
6564
(when (not= "error"
6665
status)
6766
(do
68-
(println (format "Warning: implementation has changed to error for %s: %s (status %s)" id selector status))
67+
(println (format "Warning: implementation has changed to error for %s: %s (status %s)" id (:selector query) status))
6968
(println (format " was %s" (pr-str result)))))))))))
7069
doall)))

0 commit comments

Comments
 (0)