summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrantisek Sodomka <fsodomka@gmail.com>2009-07-20 23:41:58 +0200
committerChouser <chouser@n01se.net>2009-08-19 22:40:16 -0400
commit16af3b1d04db6978d552b4440690d00a9e64a423 (patch)
treeb5c030ed9ae5c8968dea9b156d86b17f3334b380
parent7ba336f50f32dbe9ce06ef00d1482e67341dbdb6 (diff)
updated remaining tests, closes #158
Signed-off-by: Chouser <chouser@n01se.net>
-rw-r--r--test/clojure/test_clojure/predicates.clj2
-rw-r--r--test/clojure/test_clojure/reader.clj2
-rw-r--r--test/clojure/test_clojure/test.clj6
-rw-r--r--test/clojure/test_clojure/test_fixtures.clj2
-rw-r--r--test/clojure/test_clojure/vars.clj4
5 files changed, 8 insertions, 8 deletions
diff --git a/test/clojure/test_clojure/predicates.clj b/test/clojure/test_clojure/predicates.clj
index 8e68c757..2923ef3d 100644
--- a/test/clojure/test_clojure/predicates.clj
+++ b/test/clojure/test_clojure/predicates.clj
@@ -137,6 +137,6 @@
;; http://groups.google.com/group/clojure/browse_thread/thread/537761a06edb4b06/bfd4f0705b746a38
;;
(deftest test-string?-more
- (are (not (string? _))
+ (are [x] (not (string? x))
(new java.lang.StringBuilder "abc")
(new java.lang.StringBuffer "xyz")))
diff --git a/test/clojure/test_clojure/reader.clj b/test/clojure/test_clojure/reader.clj
index 20b1bfac..223e9d75 100644
--- a/test/clojure/test_clojure/reader.clj
+++ b/test/clojure/test_clojure/reader.clj
@@ -297,7 +297,7 @@
;; Unquote-splicing (~@)
(deftest t-Syntax-quote
- (are (= _1 _2)
+ (are [x y] (= x y)
`() () ; was NPE before SVN r1337
))
diff --git a/test/clojure/test_clojure/test.clj b/test/clojure/test_clojure/test.clj
index 38cf802f..aa1fea2d 100644
--- a/test/clojure/test_clojure/test.clj
+++ b/test/clojure/test_clojure/test.clj
@@ -6,7 +6,7 @@
; the terms of this license.
; You must not remove this notice, or any other, from this software.
-;;; test_contrib/test_is.clj: unit tests for test_is.clj
+;;; test_clojure/test.clj: unit tests for test.clj
;; by Stuart Sierra
;; January 16, 2009
@@ -83,7 +83,7 @@
(is (does-not-exist) "Should error"))
-;; Here, we create an alternate version of test-is/report, that
+;; Here, we create an alternate version of test/report, that
;; compares the event with the message, then calls the original
;; 'report' with modified arguments.
@@ -105,7 +105,7 @@
(original-report {:type :fail, :message (str msg " but got " event)
:expected expected, :actual actual}))))
-;; test-ns-hook will be used by test-is/test-ns to run tests in this
+;; test-ns-hook will be used by test/test-ns to run tests in this
;; namespace.
(defn test-ns-hook []
(binding [original-report report
diff --git a/test/clojure/test_clojure/test_fixtures.clj b/test/clojure/test_clojure/test_fixtures.clj
index 707dcc38..9a85b58b 100644
--- a/test/clojure/test_clojure/test_fixtures.clj
+++ b/test/clojure/test_clojure/test_fixtures.clj
@@ -6,7 +6,7 @@
; the terms of this license.
; You must not remove this notice, or any other, from this software.
;
-;;; test_is_fixtures.clj: unit tests for fixtures in test_is.clj
+;;; test_fixtures.clj: unit tests for fixtures in test.clj
;; by Stuart Sierra
;; March 28, 2009
diff --git a/test/clojure/test_clojure/vars.clj b/test/clojure/test_clojure/vars.clj
index cbdc72d9..e83c88c2 100644
--- a/test/clojure/test_clojure/vars.clj
+++ b/test/clojure/test_clojure/vars.clj
@@ -6,7 +6,7 @@
; the terms of this license.
; You must not remove this notice, or any other, from this software.
-; Author: Frantisek Sodomka
+; Author: Frantisek Sodomka, Stephen C. Gilardi
(ns clojure.test-clojure.vars
@@ -21,7 +21,7 @@
(def a)
(deftest test-binding
- (are [_1 _2] (= _1 _2)
+ (are [x y] (= x y)
(eval `(binding [a 4] a)) 4 ; regression in Clojure SVN r1370
))