Pre: Use deftest-db in tests.

src/datomish/db_factory.cljc

@@ -97,7 +97,6 @@
                                                new))]
           (let [exec (partial s/execute! (:sqlite-connection db))
                 part->vector (fn [[part {:keys [start idx]}]]
-                               (println "part->vector" part start idx)
                                [(sqlite-schema/->SQLite part) start idx])]
             ;; TODO: allow inserting new parts.
             ;; TODO: think more carefully about allocating new parts and bitmasking part ranges.

test/datomish/db_test.cljc

@@ -19,12 +19,12 @@
    #?@(:clj [[datomish.jdbc-sqlite]
              [datomish.pair-chan :refer [go-pair <?]]
              [tempfile.core :refer [tempfile with-tempfile]]
-             [datomish.test-macros :refer [deftest-async]]
+             [datomish.test-macros :refer [deftest-async deftest-db]]
              [clojure.test :as t :refer [is are deftest testing]]
              [clojure.core.async :refer [go <! >!]]])
    #?@(:cljs [[datomish.promise-sqlite]
               [datomish.pair-chan]
-              [datomish.test-macros :refer-macros [deftest-async]]
+              [datomish.test-macros :refer-macros [deftest-async deftest-db]]
               [datomish.node-tempfile :refer [tempfile]]
               [cljs.test :as t :refer-macros [is are deftest testing async]]
               [cljs.core.async :as a :refer [<! >!]]]))
@@ -81,24 +81,16 @@
     :db.install/_attribute :db.part/db}
    ])
 
-(deftest-async test-add-one
+(deftest-db test-add-one conn
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (let [{tx0 :tx} (<? (d/<transact! conn test-schema))]
     (let [{:keys [tx txInstant]} (<? (d/<transact! conn [[:db/add 0 :name "valuex"]]))]
       (is (= (<? (<datoms-after (d/db conn) tx0))
              #{[0 :name "valuex"]}))
       (is (= (<? (<transactions-after (d/db conn) tx0))
              [[0 :name "valuex" tx 1] ;; TODO: true, not 1.
-                    [tx :db/txInstant txInstant tx 1]]))))
+              [tx :db/txInstant txInstant tx 1]])))))
-        (finally
-          (<? (d/<close conn)))))))
 
-(deftest-async test-add-two
+(deftest-db test-add-two conn
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (let [{tx0 :tx} (<? (d/<transact! conn test-schema))
         {tx1 :tx txInstant1 :txInstant} (<? (d/<transact! conn [[:db/add 1 :name "Ivan"]]))
         {tx2 :tx txInstant2 :txInstant} (<? (d/<transact! conn [[:db/add 1 :name "Petr"]]))
@@ -118,15 +110,9 @@
             [1 :aka "Tupen" tx3 1]
             [tx3 :db/txInstant txInstant3 tx3 1]
             [1 :aka "Devil" tx4 1]
-                  [tx4 :db/txInstant txInstant4 tx4 1]])))
+            [tx4 :db/txInstant txInstant4 tx4 1]]))))
 
-        (finally
+(deftest-db test-retract conn
-          (<? (d/<close conn)))))))
-
-(deftest-async test-retract
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (let [{tx0 :tx} (<? (d/<transact! conn test-schema))
         {tx1 :tx txInstant1 :txInstant} (<? (d/<transact! conn [[:db/add     0 :x 123]]))
         {tx2 :tx txInstant2 :txInstant} (<? (d/<transact! conn [[:db/retract 0 :x 123]]))]
@@ -136,14 +122,9 @@
            [[0 :x 123 tx1 1]
             [tx1 :db/txInstant txInstant1 tx1 1]
             [0 :x 123 tx2 0]
-                  [tx2 :db/txInstant txInstant2 tx2 1]])))
+            [tx2 :db/txInstant txInstant2 tx2 1]]))))
-        (finally
-          (<? (d/<close conn)))))))
 
-(deftest-async test-id-literal-1
+(deftest-db test-id-literal-1 conn
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (let [tx0 (:tx (<? (d/<transact! conn test-schema)))
         report (<? (d/<transact! conn [[:db/add (d/id-literal :db.part/user -1) :x 0]
                                        [:db/add (d/id-literal :db.part/user -1) :y 1]
@@ -159,15 +140,9 @@
              #{[eid1 :x 0]
                [eid1 :y 1]
                [eid2 :y 2]
-                     [eid2 :y 3]}))))
+               [eid2 :y 3]})))))
 
-        (finally
+(deftest-db test-unique conn
-          (<? (d/<close conn)))))))
-
-(deftest-async test-unique
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (let [tx0 (:tx (<? (d/<transact! conn test-schema)))]
     (testing "Multiple :db/unique values in tx-data violate unique constraint, no tempid"
       (is (thrown-with-msg?
@@ -179,15 +154,9 @@
       (is (thrown-with-msg?
             ExceptionInfo #"unique constraint"
             (<? (d/<transact! conn [[:db/add (d/id-literal :db.part/user -1) :spouse "Dana"]
-                                          [:db/add (d/id-literal :db.part/user -2) :spouse "Dana"]]))))))
+                                    [:db/add (d/id-literal :db.part/user -2) :spouse "Dana"]])))))))
 
-        (finally
+(deftest-db test-valueType-keyword conn
-          (<? (d/<close conn)))))))
-
-(deftest-async test-valueType-keyword
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (let [tx0 (:tx (<? (d/<transact! conn [{:db/id        (d/id-literal :db.part/user -1)
                                           :db/ident     :test/kw
                                           :db/unique    :db.unique/identity
@@ -212,15 +181,9 @@
       (testing "Retracting compares values correctly."
         (<? (d/<transact! conn [[:db/retract eid :test/kw :test/kw2]]))
         (is (= (<? (<datoms-after (d/db conn) tx0))
-                     #{})))))
+               #{}))))))
 
-        (finally
+(deftest-db test-vector-upsert conn
-          (<? (d/<close conn)))))))
-
-(deftest-async test-vector-upsert
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   ;; Not having DB-as-value really hurts us here.  This test only works because all upserts
   ;; succeed on top of each other, so we never need to reset the underlying store.
   (<? (d/<transact! conn test-schema))
@@ -248,14 +211,9 @@
                             (<? (d/<transact! conn [[:db/add (d/id-literal :db.part/user -1) :name "Ivan"]
                                                     [:db/add (d/id-literal :db.part/user -1) :age 35]
                                                     [:db/add (d/id-literal :db.part/user -1) :name "Petr"]
-                                                          [:db/add (d/id-literal :db.part/user -1) :age 36]]))))))
+                                                    [:db/add (d/id-literal :db.part/user -1) :age 36]])))))))
-        (finally
-          (<? (d/<close conn)))))))
 
-(deftest-async test-map-upsert
+(deftest-db test-map-upsert conn
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   ;; Not having DB-as-value really hurts us here.  This test only works because all upserts
   ;; succeed on top of each other, so we never need to reset the underlying store.
   (<? (d/<transact! conn test-schema))
@@ -298,15 +256,9 @@
     (testing "upsert to two entities, two tempids, fails due to overlapping writes"
       (is (thrown-with-msg? Throwable #"cardinality constraint"
                             (<? (d/<transact! conn [{:db/id (d/id-literal :db.part/user -1) :name "Ivan" :age 35}
-                                                          {:db/id (d/id-literal :db.part/user -2) :name "Ivan" :age 36}]))))))
+                                                    {:db/id (d/id-literal :db.part/user -2) :name "Ivan" :age 36}])))))))
 
-        (finally
+(deftest-db test-map-upsert-conflicts conn
-          (<? (d/<close conn)))))))
-
-(deftest-async test-map-upsert-conflicts
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   ;; Not having DB-as-value really hurts us here.  This test only works because all upserts
   ;; fail until the final one, so we never need to reset the underlying store.
   (<? (d/<transact! conn test-schema))
@@ -333,15 +285,9 @@
         (is (= (<? (<shallow-entity (d/db conn) 101))
                {:name "Ivan" :email "@3" :age 35}))
         (is (= (tempids report)
-                     {-1 101})))))
+               {-1 101}))))))
 
-        (finally
+(deftest-db test-add-ident conn
-          (<? (d/<close conn)))))))
-
-(deftest-async test-add-ident
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (is (= :test/ident (d/entid (d/db conn) :test/ident)))
 
   (let [report   (<? (d/<transact! conn [[:db/add (d/id-literal :db.part/db -1) :db/ident :test/ident]]))
@@ -362,14 +308,9 @@
   ;; (is (thrown-with-msg?
   ;;       ExceptionInfo #"Re-asserting a :db/ident is not yet supported, got"
   ;;       (<? (d/<transact! conn [[:db/add 55 :db/ident :test/ident]]))))
+  )
 
-        (finally
+(deftest-db test-add-schema conn
-          (<? (d/<close conn)))))))
-
-(deftest-async test-add-schema
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (let [es       [[:db/add :db.part/db :db.install/attribute (d/id-literal :db.part/db -1)]
                   {:db/id (d/id-literal :db.part/db -1)
                    :db/ident :test/attr
@@ -391,15 +332,10 @@
       (<? (d/<transact! conn [{:db/id 100 :test/attr "value 1"}]))
       (<? (d/<transact! conn [{:db/id 100 :test/attr "value 2"}]))
       (is (= (<? (<shallow-entity (d/db conn) 100))
-                   {:test/attr "value 2"}))))
+             {:test/attr "value 2"})))))
 
-        (finally
+(deftest-db test-fulltext conn
-          (<? (d/<close conn)))))))
+  (let [schema [{:db/id (d/id-literal :db.part/db -1)
-
-(deftest-async test-fulltext
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))
-          schema [{:db/id (d/id-literal :db.part/db -1)
                  :db/ident :test/fulltext
                  :db/valueType :db.type/string
                  :db/fulltext true
@@ -416,7 +352,7 @@
     (testing "Schema checks"
       (is (ds/fulltext? (d/schema (d/db conn))
                         (d/entid (d/db conn) :test/fulltext))))
-      (try
+
     (testing "Can add fulltext indexed datoms"
       (let [{tx1 :tx txInstant1 :txInstant}
             (<? (d/<transact! conn [[:db/add 101 :test/fulltext "test this"]]))]
@@ -483,17 +419,11 @@
         (is (= (<? (<datoms-after (d/db conn) tx0))
                #{[101 :test/other 3]
                  [102 :test/other 1]})) ;; Values are raw; 1, 3 are the rowids into fulltext_values.
-            ))
+        ))))
 
-        (finally
+(deftest-db test-txInstant conn
-          (<? (d/<close conn)))))))
+  (let [{tx0 :tx} (<? (d/<transact! conn test-schema))
-
+        {txa :tx txInstantA :txInstant} (<? (d/<transact! conn []))]
-(deftest-async test-txInstant
-  (with-tempfile [t (tempfile)]
-    (let [conn      (<? (d/<connect t))
-          {tx0 :tx} (<? (d/<transact! conn test-schema))]
-      (try
-        (let [{txa :tx txInstantA :txInstant} (<? (d/<transact! conn []))]
     (testing ":db/txInstant is set by default"
       (is (= (<? (<transactions-after (d/db conn) tx0))
              [[txa :db/txInstant txInstantA txa 1]])))
@@ -517,29 +447,17 @@
               (let [{txd :tx txInstantD :txInstant} (<? (d/<transact! conn [[:db/add :db/tx :x 456]]))]
                 (is (= (<? (<transactions-after (d/db conn) txc))
                        [[txd :db/txInstant txInstantD txd 1]
-                              [txd :x 456 txd 1]])))))))))
+                        [txd :x 456 txd 1]]))))))))))
 
-        (finally
+(deftest-db test-no-tx conn
-          (<? (d/<close conn)))))))
+  (let [{tx0 :tx} (<? (d/<transact! conn test-schema))]
-
-(deftest-async test-no-tx
-  (with-tempfile [t (tempfile)]
-    (let [conn      (<? (d/<connect t))
-          {tx0 :tx} (<? (d/<transact! conn test-schema))]
-      (try
     (testing "Cannot specificy an explicit tx"
       (is (thrown-with-msg?
             ExceptionInfo #"Bad entity: too long"
-                (<? (d/<transact! conn [[:db/add (d/id-literal :db.part/user) :x 0 10101]])))))
+            (<? (d/<transact! conn [[:db/add (d/id-literal :db.part/user) :x 0 10101]])))))))
 
-        (finally
+(deftest-db test-explode-sequences conn
-          (<? (d/<close conn)))))))
+  (let [{tx0 :tx} (<? (d/<transact! conn test-schema))]
-
-(deftest-async test-explode-sequences
-  (with-tempfile [t (tempfile)]
-    (let [conn      (<? (d/<connect t))
-          {tx0 :tx} (<? (d/<transact! conn test-schema))]
-      (try
     (testing ":db.cardinality/many sequences are accepted"
       (<? (d/<transact! conn [{:db/id 101 :aka ["first" "second"]}]))
       (is (= (<? (<datoms-after (d/db conn) tx0))
@@ -557,16 +475,10 @@
     (testing ":db.cardinality/one sequences fail"
       (is (thrown-with-msg?
             ExceptionInfo #"Sequential values"
-                (<? (d/<transact! conn [{:db/id 101 :email ["@1" "@2"]}])))))
+            (<? (d/<transact! conn [{:db/id 101 :email ["@1" "@2"]}])))))))
 
-        (finally
+(deftest-db test-explode-maps conn
-          (<? (d/<close conn)))))))
+  (let [{tx0 :tx} (<? (d/<transact! conn test-schema))]
-
-(deftest-async test-explode-maps
-  (with-tempfile [t (tempfile)]
-    (let [conn      (<? (d/<connect t))
-          {tx0 :tx} (<? (d/<transact! conn test-schema))]
-      (try
     (testing "nested maps are accepted"
       (<? (d/<transact! conn [{:db/id 101 :friends {:name "Petr"}}]))
       ;; TODO: this works only because we have a single friend.
@@ -590,16 +502,10 @@
     (testing "nested maps without :db.type/ref fail"
       (is (thrown-with-msg?
             ExceptionInfo #"\{:db/valueType :db.type/ref\}"
-                (<? (d/<transact! conn [{:db/id 101 :aka {:name "Petr"}}])))))
+            (<? (d/<transact! conn [{:db/id 101 :aka {:name "Petr"}}])))))))
 
-        (finally
+(deftest-db test-explode-reverse-refs conn
-          (<? (d/<close conn)))))))
+  (let [{tx0 :tx} (<? (d/<transact! conn test-schema))]
-
-(deftest-async test-explode-reverse-refs
-  (with-tempfile [t (tempfile)]
-    (let [conn      (<? (d/<connect t))
-          {tx0 :tx} (<? (d/<transact! conn test-schema))]
-      (try
     (testing "reverse refs are accepted"
       (<? (d/<transact! conn [{:db/id 101 :name "Igor"}]))
       (<? (d/<transact! conn [{:db/id 102 :name "Oleg" :_friends 101}]))
@@ -611,11 +517,9 @@
     (testing "reverse refs without :db.type/ref fail"
       (is (thrown-with-msg?
             ExceptionInfo #"\{:db/valueType :db.type/ref\}"
-                (<? (d/<transact! conn [{:db/id 101 :_aka 102}])))))
+            (<? (d/<transact! conn [{:db/id 101 :_aka 102}])))))))
-
-        (finally
-          (<? (d/<close conn)))))))
 
+;; We don't use deftest-db in order to be able to re-open an on disk file.
 (deftest-async test-next-eid
   (with-tempfile [t (tempfile)]
     (let [conn      (<? (d/<connect t))
@@ -644,10 +548,7 @@
               (finally
                 (<? (d/<close conn))))))))))
 
-(deftest-async test-unique-value
+(deftest-db test-unique-value conn
-  (with-tempfile [t (tempfile)]
-    (let [conn (<? (d/<connect t))]
-      (try
   (let [tx0 (:tx (<? (d/<transact! conn [{:db/id                 (d/id-literal :db.part/user -1)
                                           :db/ident              :test/x
                                           :db/unique             :db.unique/value
@@ -671,7 +572,6 @@
     (testing "can't upsert a :db.unique/value field"
       (is (thrown-with-msg?
             ExceptionInfo #"unique constraint"
-                  (<? (d/<transact! conn [{:db/id (d/id-literal :db.part/user -1) :test/x 12345 :test/y 99999}]))))))
+            (<? (d/<transact! conn [{:db/id (d/id-literal :db.part/user -1) :test/x 12345 :test/y 99999}])))))))
 
-        (finally
+#_ (time (t/run-tests))
-          (<? (d/<close conn)))))))