refactor some of the tests to use (thrown-with-msg? ...)

pingles · Sep 4, 2013 · bc4211e · bc4211e
1 parent 033c405
commit bc4211e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/clj_hector/serialize.clj b/src/clj_hector/serialize.clj
@@ -55,7 +55,7 @@
    (cond (keyword? x) (x serializers)
          (instance? Serializer x) x
          :else (SerializerTypeInferer/getSerializer x))
-   (throw (NullPointerException. (str x " did not resolve to a serializer.")))))
+   (throw (IllegalArgumentException. (str x " did not resolve to a serializer.")))))
 
 (defn- deserialize-composite
   "Given a composite and a list of deserializers deserialize the

diff --git a/test/clj_hector/test/serialize.clj b/test/clj_hector/test/serialize.clj
@@ -20,9 +20,6 @@
     (is (= :kw (.fromBytes s (.toBytes s :kw))))))
 
 (deftest bad-serializer-name
-  (is (thrown? NullPointerException (serializer :bad-serializer-keyword)))
-  (try
-    (serializer :bad-serializer-keyword)
-    (is false "Should have gotten a NPE")
-    (catch NullPointerException e
-      (is (= ":bad-serializer-keyword did not resolve to a serializer." (.getMessage e))))))
+  (is (thrown-with-msg? IllegalArgumentException
+                        #"bad-serializer-keyword did not resolve to a serializer"
+                        (serializer :bad-serializer-keyword))))