Make command-test pass

src/clojure/monger/result.clj

@@ -17,7 +17,7 @@
    * http://clojuremongodb.info/articles/updating.html
    * http://clojuremongodb.info/articles/commands.html
    * http://clojuremongodb.info/articles/mapreduce.html"
-  (:import [com.mongodb WriteResult])
+  (:import [com.mongodb WriteResult CommandResult])
   (:require monger.conversion))
 
 ;;
@@ -35,4 +35,9 @@
     (.wasAcknowledged result))
   (updated-existing?
     [^WriteResult result]
-    (.isUpdateOfExisting result)))
+    (.isUpdateOfExisting result))
+
+  CommandResult
+  (acknowledged?
+    [^CommandResult result]
+    (.ok result)))

test/monger/test/command_test.clj

@@ -11,24 +11,19 @@
   (deftest ^{:command true} test-reindex-collection
     (let [_      (mc/insert db "test" {:name "Clojure"})
           result (mcom/reindex-collection db "test")]
-      (is (acknowledged? result))
+      (is (acknowledged? result))))
-      (is (get result "indexes"))))
 
   (deftest ^{:command true} test-server-status
     (let [status (mcom/server-status db)]
       (is (acknowledged? status))
-      (is (not-empty status))
+      (is (not-empty status))))
-      (is (get status "serverUsed"))))
 
   (deftest ^{:command true} test-top
     (let [result (mcom/top conn)]
       (is (acknowledged? result))
-      (is (not-empty result))
+      (is (not-empty result))))
-      (is (get result "serverUsed"))))
 
   (deftest ^{:command true} test-running-is-master-as-an-arbitrary-command
     (let [raw    (mg/command db {:isMaster 1})
           result (from-db-object raw true)]
-      (is (acknowledged? result))
+      (is (acknowledged? raw)))))
-      (is (acknowledged? raw))
-      (is (:ismaster result)))))