Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Replace several thrown? test with thrown-with-msg?

because they had regex's after them which are ignored by a thrown?
test.

Also added a package path to a Java class used as a return type hint,
because tools.analyzer.jvm requires it to avoid throwing an exception.
It is harmless for Clojure.
  • Loading branch information...
commit a9d726f3e9ad313e92169850d744e5de4b368ac4 1 parent dbe1c3e
@jafingerhut jafingerhut authored
View
2  src/clojure/clojurewerkz/titanium/graph.clj
@@ -36,7 +36,7 @@
conf))
(defprotocol TitaniumGraph
- (^KeyIndexableGraph open [input] "Opens a new graph"))
+ (^com.tinkerpop.blueprints.KeyIndexableGraph open [input] "Opens a new graph"))
(extend-protocol TitaniumGraph
String
View
4 test/clojurewerkz/titanium/edges_test.clj
@@ -237,8 +237,8 @@
(is (= 1 (ted/get edge :a)))
(is (= 0 (ted/get edge :b)))
(ted/connect! v1 :connexion v2)
- (is (thrown? Throwable #"There were 2 vertices returned."
- (ted/unique-upconnect! v1 :connexion v2))))))
+ (is (thrown-with-msg? Throwable #"There were 2 vertices returned."
+ (ted/unique-upconnect! v1 :connexion v2))))))
(tg/shutdown)
(clear-db)))
View
4 test/clojurewerkz/titanium/graph_test.clj
@@ -49,7 +49,7 @@
(is (= StandardVertex (type vertex)))))
(testing "Stored graph"
- (is (thrown? Throwable #"transact!" (tv/create!))))
+ (is (thrown-with-msg? Throwable #"transact!" (tv/create!))))
(testing "Dueling transactions"
(tg/transact!
@@ -96,4 +96,4 @@
(tg/transact! (tv/find-by-kv :vertex-id random-long))))
"*graph* has only one vertex with the specified vertex-id")))
(tg/shutdown)
- (clear-db))
+ (clear-db))
View
4 test/clojurewerkz/titanium/vertices_test.clj
@@ -204,8 +204,8 @@
(is (= 22
(tv/get (tv/refresh v1-a) :age)
(tv/get (tv/refresh v1-b) :age)))
- (is (thrown? Throwable #"There were 2 vertices returned."
- (tv/unique-upsert! :last-name {:last-name "Maril"}))))))
+ (is (thrown-with-msg? Throwable #"There were 2 vertices returned."
+ (tv/unique-upsert! :last-name {:last-name "Maril"}))))))
(tg/shutdown)
(clear-db))
Please sign in to comment.
Something went wrong with that request. Please try again.