diff options
Diffstat (limited to 'src/clojure/contrib/datalog/tests/test_literals.clj')
| -rw-r--r-- | src/clojure/contrib/datalog/tests/test_literals.clj | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/clojure/contrib/datalog/tests/test_literals.clj b/src/clojure/contrib/datalog/tests/test_literals.clj index 3ce64279..107a4dc6 100644 --- a/src/clojure/contrib/datalog/tests/test_literals.clj +++ b/src/clojure/contrib/datalog/tests/test_literals.clj @@ -95,9 +95,9 @@ (deftest test-adorned-literal (is (= (literal-predicate (adorned-literal pl #{:x})) - [:fred #{:x}])) + {:pred :fred :bound #{:x}})) (is (= (literal-predicate (adorned-literal nl #{:x :y :q})) - [:fred #{:x :y}])) + {:pred :fred :bound #{:x :y}})) (is (= (:term-bindings (adorned-literal nl #{:x})) {:x '?x :y '?y :z 3})) (is (= (adorned-literal cl #{}) @@ -117,12 +117,17 @@ (deftest test-magic-literal (is (= (magic-literal pl) - {:predicate [:fred :magic nil], :term-bindings {}, :literal-type :clojure.contrib.datalog.literals/literal})) + {:predicate {:pred :fred :magic true}, :term-bindings {}, :literal-type :clojure.contrib.datalog.literals/literal})) (is (= (magic-literal (adorned-literal pl #{:x})) - {:predicate [:fred :magic #{:x}], + {:predicate {:pred :fred :magic true :bound #{:x}}, :term-bindings {:x '?x}, :literal-type :clojure.contrib.datalog.literals/literal}))) +(comment + (use 'clojure.contrib.stacktrace) (e) + (use :reload 'clojure.contrib.datalog.literals) +) + (def db1 (make-database (relation :fred [:x :y]) @@ -151,7 +156,7 @@ [{'?x 3 '?y 1}]))) (deftest test-project-literal - (is (= ((project-literal db2 lit4 [{'?x 1 '?y 3}{'?x 4 '?y 2}]) [:joan #{:x}]) + (is (= ((project-literal db2 lit4 [{'?x 1 '?y 3}{'?x 4 '?y 2}]) {:pred :joan :bound #{:x}}) (datalog-relation ;; Schema #{:y :x} |