Varadic assert-throws no longer working: expand by hand for now.

mmcgrana · 7ea8eb7072defcf5fa21b10d7b7fdd130c554fc4 · mmcgrana committed Aug 5, 2010 · Aug 5, 2010 · 7ea8eb7
1 parent 3d9010f
commit 7ea8eb7072defcf5fa21b10d7b7fdd130c554fc4
Unified Split

Showing with 11 additions and 11 deletions.

+5 −5 test/fleetdb/compare_test.clj

+4 −4 test/fleetdb/core_test.clj

+1 −1 test/fleetdb/embedded_test.clj

+1 −1 test/fleetdb/server_test.clj
@@ -41,8 +41,8 @@
   (assert= 4 (c :foo :bar)))
 
 (deftest "non-matching elems"
-  (assert-throws #"Cannot compare"
-    (c 1 :one)))
+  (assert-throws Exception #"Cannot compare"
+   (c 1 :one)))
 
 (deftest "vectors"
   (assert= 0 (c [1 :2] [1 :2]))
@@ -52,7 +52,7 @@
   (assert= -1 (c [1 :neg-inf] [1 0])))
 
 (deftest "non-matching vectors"
-  (assert-throws #"Cannot compare"
+  (assert-throws Exception #"Cannot compare"
     (c [1 2] [1]))
-  (assert-throws #"Cannot compare"
-    (c [1] [:one])))
+  (assert-throws Exception #"Cannot compare"
+    (c [1] [:one])))
@@ -105,7 +105,7 @@
 
 (deftest "select: raise on mixed attr types"
   (let [db1-1 (first (core/query db1 ["insert" "elems" {"id" 7 "lt" 3}]))]
-    (assert-throws #"Cannot compare"
+    (assert-throws Exception #"Cannot compare"
       (core/query db1-1 ["select" "elems" {"order" ["lt" "asc"]}]))))
 
 (deftest "explain: select, count, update, delete"
@@ -262,15 +262,15 @@
     (assert= [{"id" 7}] (core/query new-db1 ["select" "elems" {"where" ["=" "id" 7]}]))))
 
 (deftest "insert: no id"
-  (assert-throws #"Record does not have an id"
+  (assert-throws Exception #"Record does not have an id"
     (core/query db1 ["insert" "elems" {"lt" "g"}])))
 
 (deftest "insert: duplicated existing id"
-  (assert-throws #"Duplicated id"
+  (assert-throws Exception #"Duplicated id"
     (core/query db1 ["insert" "elems" {"id" 2}])))
 
 (deftest "insert: duplicated given ids"
-  (assert-throws #"Duplicated id"
+  (assert-throws Exception #"Duplicated id"
     (core/query db1 ["insert" "elems" [{"id" 1} {"id" 1}]])))
 
 (deftest "insert: new coll"
@@ -15,7 +15,7 @@
 
 (deftest "embeded: catches linting errors"
   (with-dba [dba (embedded/init-ephemeral)]
-    (assert-throws #"Malformed query: query not a vector '\"foo\"'"
+    (assert-throws Exception #"Malformed query: query not a vector '\"foo\"'"
       (embedded/query dba "foo"))))
 
 (deftest "ephemeral: init"
@@ -82,7 +82,7 @@
     (test-ping client)))
 
 (defn- test-auth-tryop [client]
-  (assert-throws #"Connection reset"
+  (assert-throws Exception #"Connection reset"
     (do
       (client-write client "[\"insert\",\"elems\",{\"id\":1}]\r\n")
       (client-read client))))