Fixed test issues when running all tests

test/monger/test/multi/find_test.clj

@@ -15,36 +15,40 @@
 
 (helper/connect!)
 
+(defn drop-altdb
+  [f]
+  (mg/drop-db "altdb")
+  (f))
 
-(use-fixtures :each purge-people purge-docs purge-things purge-libraries)
+(use-fixtures :each drop-altdb)
 
 ;;
 ;; find
 ;;
 
 (deftest find-full-document-when-collection-is-empty
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "docs"
         cursor     (mgcol/find db collection)]
     (is (empty? (iterator-seq cursor)))))
 
 (deftest find-document-seq-when-collection-is-empty
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "docs"]
     (is (empty? (mgcol/find-seq db collection)))))
 
 (deftest find-multiple-documents-when-collection-is-empty
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (is (empty? (mgcol/find db collection { :language "Scala" })))))
 
 (deftest find-multiple-maps-when-collection-is-empty
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (is (empty? (mgcol/find-maps db collection { :language "Scala" })))))
 
 (deftest find-multiple-documents-by-regex
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (mgcol/insert-batch db collection [{ :language "Clojure",    :name "monger" }
                                        { :language "Java",       :name "nhibernate" }
@@ -52,7 +56,7 @@
     (is (= 2 (monger.core/count (mgcol/find db collection { :language #"Java*" }))))))
 
 (deftest find-multiple-documents
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (mgcol/insert-batch db collection [{ :language "Clojure", :name "monger" }
                                        { :language "Clojure", :name "langohr" }
@@ -64,14 +68,14 @@
 
 
 (deftest find-document-specify-fields
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"
         _          (mgcol/insert db collection { :language "Clojure", :name "monger" })
         result     (mgcol/find db collection { :language "Clojure"} [:language])]
     (is (= (seq [:_id :language]) (keys (mgcnv/from-db-object (.next result) true))))))
 
 (deftest find-and-iterate-over-multiple-documents-the-hard-way
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (mgcol/insert-batch db collection [{ :language "Clojure", :name "monger" }
                                        { :language "Clojure", :name "langohr" }
@@ -83,7 +87,7 @@
       (is (= "Clojure" (:language doc))))))
 
 (deftest find-and-iterate-over-multiple-documents
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (mgcol/insert-batch db collection [{ :language "Clojure", :name "monger" }
                                        { :language "Clojure", :name "langohr" }
@@ -94,7 +98,7 @@
 
 
 (deftest find-multiple-maps
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (mgcol/insert-batch db collection [{ :language "Clojure", :name "monger" }
                                        { :language "Clojure", :name "langohr" }
@@ -108,7 +112,7 @@
 
 
 (deftest find-multiple-partial-documents
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (mgcol/insert-batch db collection [{ :language "Clojure", :name "monger" }
                                        { :language "Clojure", :name "langohr" }
@@ -124,7 +128,7 @@
       (is (empty? (mgcol/find db collection { :language "Erlang" } [:name]))))))
 
 (deftest finds-one-as-map
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (mgcol/insert-batch db collection [{ :language "Clojure", :name "monger" }
                                        { :language "Clojure", :name "langohr" }])
@@ -136,7 +140,7 @@
     (is (= "langohr" (get (mgcol/find-one-as-map db collection { :name "langohr" } [:name] false) "name")))))
 
 (deftest find-and-modify
-  (let [db (mg/get-db "monger-test")
+  (let [db (mg/get-db "altdb")
         collection "libraries"]
     (mgcol/insert-batch db collection [{ :language "Clojure", :name "monger" }
                                        { :language "Clojure", :name "langohr" }])))

test/monger/test/multi/inserting_test.clj

@@ -107,7 +107,7 @@
           oid   (ObjectId.)
           joe   (mc/insert db "owners" {:name "Joe" :_id oid})
           dbref (DBRef. (mg/current-db) coll2 oid)]
-      (mc/insert coll1 {:type "pentagon" :owner dbref})
+      (mc/insert db coll1 {:type "pentagon" :owner dbref})
       (let [fetched (mc/find-one-as-map db coll1 {:type "pentagon"})
             fo      (:owner fetched)]
         (is (= {:_id oid :name "Joe"} (from-db-object @fo true)))))))
@@ -127,7 +127,7 @@
     (is (= (:age doc)
            (:age result)))
     (is (:_id result))
-    (is (= 1 (mc/count collection)))))
+    (is (= 1 (mc/count db collection)))))
 
 (deftest  insert-and-return-a-basic-document-without-id-but-with-a-write-concern
   (let [db         (mg/get-db "altdb")
@@ -141,7 +141,7 @@
     (is (= (:ratio doc)
            (:ratio result)))    
     (is (:_id result))
-    (is (= 1 (mc/count collection)))))
+    (is (= 1 (mc/count db collection)))))
 
 (deftest  insert-and-return-with-a-provided-id
   (let [db         (mg/get-db "altdb")
@@ -150,7 +150,7 @@
         doc        {:name "Joe" :age 30 :_id oid}
         result     (mc/insert-and-return db :people doc)]
     (is (= (:_id result) (:_id doc) oid))
-    (is (= 1 (mc/count collection)))))
+    (is (= 1 (mc/count db collection)))))
 
 
 ;;
@@ -162,14 +162,14 @@
         collection "people"
         docs       [{:name "Joe" :age 30} {:name "Paul" :age 27}]]
     (is (monger.result/ok? (mc/insert-batch db "people" docs)))
-    (is (= 2 (mc/count collection)))))
+    (is (= 2 (mc/count db collection)))))
 
 (deftest insert-a-batch-of-basic-documents-without-ids-and-with-explicit-write-concern
   (let [db         (mg/get-db "altdb")
         collection "people"
         docs       [{:name "Joe" :age 30} {:name "Paul" :age 27}]]
     (is (monger.result/ok? (mc/insert-batch db "people" docs WriteConcern/NORMAL)))
-    (is (= 2 (mc/count collection)))))
+    (is (= 2 (mc/count db collection)))))
 
 (deftest insert-a-batch-of-basic-documents-with-explicit-database-without-ids-and-with-explicit-write-concern
   (let [db         (mg/get-db "altdb")
@@ -177,7 +177,7 @@
         docs       [{:name "Joe" :age 30} {:name "Paul" :age 27}]]
     (dotimes [n 44]
       (is (monger.result/ok? (mc/insert-batch db "people" docs WriteConcern/NORMAL))))
-    (is (= 88 (mc/count collection)))))
+    (is (= 88 (mc/count db collection)))))
 
 (deftest insert-a-batch-of-basic-documents-from-a-lazy-sequence
   (let [db         (mg/get-db "altdb")
@@ -186,4 +186,4 @@
     (is (monger.result/ok? (mc/insert-batch db "people" (map (fn [^long l]
                                                                {:n l})
                                                              numbers))))
-    (is (= (count numbers) (mc/count collection)))))
+    (is (= (count numbers) (mc/count db collection)))))