From d3cb048d2b8a45039f88c1fcf03a287619e79e2b Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Sat, 10 May 2014 16:52:44 -0400 Subject: [PATCH] monger.core tests now pass --- test/monger/test/core_test.clj | 48 ++++++++++++++++------------------ 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/test/monger/test/core_test.clj b/test/monger/test/core_test.clj index 53bdd66..2e09e40 100644 --- a/test/monger/test/core_test.clj +++ b/test/monger/test/core_test.clj @@ -1,30 +1,27 @@ (ns monger.test.core-test - (:require [monger core collection util result] - [monger.test.helper :as helper] + (:require [monger util result] + [monger.core :as mg :refer [server-address mongo-options]] [monger.collection :as mc] - [clojure.test :refer :all] - [monger.core :refer [server-address mongo-options]]) + [clojure.test :refer :all]) (:import [com.mongodb MongoClient DB WriteConcern MongoClientOptions ServerAddress])) (println (str "Using Clojure version " *clojure-version*)) -(helper/connect!) (deftest connect-to-mongo-with-default-host-and-port - (let [connection (monger.core/connect)] + (let [connection (mg/connect)] (is (instance? com.mongodb.MongoClient connection)))) (deftest connect-and-disconnect - (monger.core/connect!) - (monger.core/disconnect!) - (monger.core/connect!)) + (let [conn (mg/connect)] + (mg/disconnect conn))) (deftest connect-to-mongo-with-default-host-and-explicit-port - (let [connection (monger.core/connect { :port 27017 })] + (let [connection (mg/connect { :port 27017 })] (is (instance? com.mongodb.MongoClient connection)))) (deftest connect-to-mongo-with-default-port-and-explicit-host - (let [connection (monger.core/connect { :host "127.0.0.1" })] + (let [connection (mg/connect { :host "127.0.0.1" })] (is (instance? com.mongodb.MongoClient connection)))) (deftest test-server-address @@ -36,31 +33,32 @@ (deftest use-existing-mongo-connection (let [^MongoClientOptions opts (mongo-options :threads-allowed-to-block-for-connection-multiplier 300) - connection (MongoClient. "127.0.0.1" opts)] - (monger.core/set-connection! connection) - (is (= monger.core/*mongodb-connection* connection)))) + connection (MongoClient. "127.0.0.1" opts) + db (mg/get-db connection "monger-test")] + (mg/disconnect connection))) (deftest connect-to-mongo-with-extra-options (let [^MongoClientOptions opts (mongo-options :threads-allowed-to-block-for-connection-multiplier 300) - ^ServerAddress sa (server-address "127.0.0.1" 27017)] - (monger.core/connect! sa opts))) + ^ServerAddress sa (server-address "127.0.0.1" 27017) + conn (mg/connect sa opts)] + (mg/disconnect conn))) (deftest get-database - (let [connection (monger.core/connect) - db (monger.core/get-db connection "monger-test")] + (let [connection (mg/connect) + db (mg/get-db connection "monger-test")] (is (instance? com.mongodb.DB db)))) (deftest test-get-db-names - (let [dbs (monger.core/get-db-names)] + (let [conn (mg/connect) + dbs (mg/get-db-names conn)] (is (not (empty? dbs))) (is (dbs "monger-test")))) (deftest get-last-error - (let [connection (monger.core/connect) - db (monger.core/get-db connection "monger-test")] - (is (monger.result/ok? (monger.core/get-last-error))) - (is (monger.result/ok? (monger.core/get-last-error db))) - (is (monger.result/ok? (monger.core/get-last-error db WriteConcern/NORMAL))) - (is (monger.result/ok? (monger.core/get-last-error db 1 100 true))))) + (let [connection (mg/connect) + db (mg/get-db connection "monger-test")] + (is (monger.result/ok? (mg/get-last-error db))) + (is (monger.result/ok? (mg/get-last-error db WriteConcern/NORMAL))) + (is (monger.result/ok? (mg/get-last-error db 1 100 true)))))