CLJ-1313: Correct a few unit tests

Andy Fingerhut · stuarthalloway · commit 52e623ad30b0 · 2015-07-17T20:05:00.000-04:00
Signed-off-by: Stuart Halloway &lt;stu@cognitect.com&gt;
diff --git a/test/clojure/test_clojure/agents.clj b/test/clojure/test_clojure/agents.clj
@@ -165,7 +165,7 @@
                        x))
         small-lbq (java.util.concurrent.LinkedBlockingQueue. queue-size)
         worker (seque small-lbq slow-seq)]
-    (doall worker)
+    (dorun worker)
     (is (= worker slow-seq))
     (Thread/sleep 250) ;; make sure agents have time to run or get blocked
     (let [queue-backlog (.size small-lbq)]
diff --git a/test/clojure/test_clojure/multimethods.clj b/test/clojure/test_clojure/multimethods.clj
@@ -196,7 +196,7 @@
     (is (thrown? java.lang.IllegalArgumentException
                  (bar ::rect ::rect))))
  (testing "The prefers method returns empty table w/ no prefs"
-   (= {} (prefers bar)))
+   (is (= {} (prefers bar))))
  (testing "Adding a preference to resolve it dispatches correctly"
    (prefer-method bar [::rect ::shape] [::shape ::rect])
    (is (= :rect-shape (bar ::rect ::rect))))
@@ -228,7 +228,7 @@
     (defmethod simple3 :a [x] :a)
     (defmethod simple3 :b [x] :b)
     (is (fn? (get-method simple3 :a)))
-    (is (= (:a ((get-method simple3 :a) 1))))
+    (is (= :a ((get-method simple3 :a) 1)))
     (is (fn? (get-method simple3 :b)))
-    (is (= (:b ((get-method simple3 :b) 1))))
+    (is (= :b ((get-method simple3 :b) 1)))
     (is (nil? (get-method simple3 :c)))))
diff --git a/test/clojure/test_clojure/ns_libs.clj b/test/clojure/test_clojure/ns_libs.clj
@@ -66,15 +66,15 @@
 
 (deftest naming-types
   (testing "you cannot use a name already referred from another namespace"
-    (is (thrown? IllegalStateException
-                 #"String already refers to: class java.lang.String"
-                 (definterface String)))
-    (is (thrown? IllegalStateException
-                 #"StringBuffer already refers to: class java.lang.StringBuffer"
-                 (deftype StringBuffer [])))
-    (is (thrown? IllegalStateException
-                 #"Integer already refers to: class java.lang.Integer"
-                 (defrecord Integer [])))))
+    (is (thrown-with-msg? IllegalStateException
+                          #"String already refers to: class java.lang.String"
+                          (definterface String)))
+    (is (thrown-with-msg? IllegalStateException
+                          #"StringBuffer already refers to: class java.lang.StringBuffer"
+                          (deftype StringBuffer [])))
+    (is (thrown-with-msg? IllegalStateException
+                          #"Integer already refers to: class java.lang.Integer"
+                          (defrecord Integer [])))))
 
 (deftest resolution
   (let [s (gensym)]
diff --git a/test/clojure/test_clojure/sequences.clj b/test/clojure/test_clojure/sequences.clj
@@ -23,7 +23,7 @@
 ; and more...
 
 (deftest test-reduce-from-chunked-into-unchunked
-  (= [1 2 \a \b] (into [] (concat [1 2] "ab"))))
+  (is (= [1 2 \a \b] (into [] (concat [1 2] "ab")))))
  
 (deftest test-reduce
   (let [int+ (fn [a b] (+ (int a) (int b)))
