Merge branch 'main' of github.com:threatgrid/naga into main

.gitignore

@@ -10,5 +10,6 @@ pom.xml.asc
 .hgignore
 .hg/
 .eastwood
+test/tmp/*
 example_data/out.json
-deploy.tok
+deploy.tok

test/naga/data/json-family.lg

@@ -0,0 +1,9 @@
+jn:SymmetricProperty(sibling).
+
+parent(B,Cid) :- sibling(A,Bid), id(B,Bid), parent(A,Cid), id(C,Cid) .
+
+brother(A,Bid) :- sibling(A,Bid), id(B,Bid), type(B,"male") .
+
+uncle(A,Cid) :- parent(A,Bid), id(B,Bid), brother(B,Cid).
+
+P(B,Aid) :- P(A,Bid), id(A,Aid), id(B,Bid), jn:SymmetricProperty(P).

test/naga/test_integration.clj

@@ -46,9 +46,8 @@
    {:id "mary", :sibling "george", :brother "george"}])
 
 (deftest test-json-flow
-  (let [[out err] (capture-output -main "--json example_data/in.json --out example_data/out.json example_data/json-family.lg")
-        json-result (json/parse-string (slurp "example_data/out.json") keyword)]
-
+  (let [[out err] (capture-output -main "--json test/naga/data/in.json --out test/tmp/out.json test/naga/data/json-family.lg")
+        json-result (json/parse-string (slurp "test/tmp/out.json") keyword)]
     (is (empty? out))
     (is (empty? err))
     (is (= (sort-by :id json-result) json-out))))