Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make query tests cross platform #460

Merged
merged 3 commits into from
Jul 10, 2020
Merged

Make query tests cross platform #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f6fd73
Make query tests cross-platform using def-rules-test
WilliamParker Jul 3, 2020
e343122
Fix typo
WilliamParker Jul 3, 2020
ae6cdec
Remove test-param-query from test-rules
WilliamParker Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions src/test/clojure/clara/test_rules.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,43 +49,6 @@
(catch Exception e
(is (= [:?t] (:variables (ex-data e)))))))

(deftest test-simple-query
(let [cold-query (dsl/parse-query [] [[Temperature (< temperature 20) (= ?t temperature)]])

session (-> (mk-session [cold-query])
(insert (->Temperature 15 "MCI"))
(insert (->Temperature 10 "MCI"))
(insert (->Temperature 80 "MCI"))
fire-rules)]

;; The query should identify all items that were inserted and matchd the
;; expected criteria.
(is (= #{{:?t 15} {:?t 10}}
(set (query session cold-query))))))

(deftest test-param-query
(let [cold-query (dsl/parse-query [:?l] [[Temperature (< temperature 50)
(= ?t temperature)
(= ?l location)]])

session (-> (mk-session [cold-query])
(insert (->Temperature 15 "MCI"))
(insert (->Temperature 20 "MCI")) ; Test multiple items in result.
(insert (->Temperature 10 "ORD"))
(insert (->Temperature 35 "BOS"))
(insert (->Temperature 80 "BOS"))
fire-rules)]

;; Query by location.
(is (= #{{:?l "BOS" :?t 35}}
(set (query session cold-query :?l "BOS"))))

(is (= #{{:?l "MCI" :?t 15} {:?l "MCI" :?t 20}}
(set (query session cold-query :?l "MCI"))))

(is (= #{{:?l "ORD" :?t 10}}
(set (query session cold-query :?l "ORD"))))))

(defn identity-retract
"Retract function that does nothing for testing purposes."
[state retracted]
Expand Down
6 changes: 4 additions & 2 deletions src/test/clojurescript/clara/test.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
[clara.test-clear-ns-productions]
[clara.test-negation]
[clara.performance.test-rule-execution]
[clara.test-node-sharing]))
[clara.test-node-sharing]
[clara.test-queries]))

(enable-console-print!)

Expand Down Expand Up @@ -60,5 +61,6 @@
'clara.test-clear-ns-productions
'clara.test-negation
'clara.performance.test-rule-execution
'clara.test-node-sharing)
'clara.test-node-sharing
'clara.test-queries)
@*successful?*))
73 changes: 73 additions & 0 deletions src/test/common/clara/test_queries.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
#?(:clj
(ns clara.test-queries
(:require [clara.tools.testing-utils :refer [def-rules-test
side-effect-holder] :as tu]
[clara.rules :refer [fire-rules
insert
query]]

[clara.rules.testfacts :refer [->Temperature]]
[clojure.test :refer [is deftest run-tests testing use-fixtures]]
[schema.test :as st])
(:import [clara.rules.testfacts
Temperature]))

:cljs
(ns clara.test-queries
(:require [clara.rules :refer [fire-rules
insert
query]]
[clara.rules.testfacts :refer [->Temperature Temperature]]
[cljs.test]
[schema.test :as st])
(:require-macros [clara.tools.testing-utils :refer [def-rules-test]]
[cljs.test :refer [is deftest run-tests testing use-fixtures]])))

(use-fixtures :once st/validate-schemas #?(:clj tu/opts-fixture))

(def-rules-test test-simple-query

{:queries [cold-query [[]
[[Temperature (< temperature 20) (= ?t temperature)]]]]

:sessions [empty-session [cold-query] {}]}

(let [session (-> empty-session
(insert (->Temperature 15 "MCI"))
(insert (->Temperature 10 "MCI"))
(insert (->Temperature 80 "MCI"))
fire-rules)]

;; The query should identify all items that were inserted and matchd the
;; expected criteria.
(is (= #{{:?t 15} {:?t 10}}
(set (query session cold-query))))))

(def-rules-test test-param-query

{:queries [cold-query [[:?l]
[[Temperature (< temperature 50)
(= ?t temperature)
(= ?l location)]]]]

:sessions [empty-session [cold-query] {}]}

(let [session (-> empty-session
(insert (->Temperature 15 "MCI"))
(insert (->Temperature 20 "MCI")) ; Test multiple items in result.
(insert (->Temperature 10 "ORD"))
(insert (->Temperature 35 "BOS"))
(insert (->Temperature 80 "BOS"))
fire-rules)]

;; Query by location.
(is (= #{{:?l "BOS" :?t 35}}
(set (query session cold-query :?l "BOS"))))

(is (= #{{:?l "MCI" :?t 15} {:?l "MCI" :?t 20}}
(set (query session cold-query :?l "MCI"))))

(is (= #{{:?l "ORD" :?t 10}}
(set (query session cold-query :?l "ORD"))))))