Fix remaining ns name issues in tests.

6 files changed, 12 insertions, 12 deletions

diff --git a/src/test/clojure/clojure/contrib/pprint/test_cl_format.clj b/src/test/clojure/clojure/contrib/pprint/test_cl_format.clj
index 1bd48fb7..ae9ce914 100644
--- a/src/test/clojure/clojure/contrib/pprint/test_cl_format.clj
+++ b/src/test/clojure/clojure/contrib/pprint/test_cl_format.clj
@@ -16,7 +16,7 @@
 (ns clojure.contrib.pprint.test-cl-format
   (:refer-clojure :exclude [format])
   (:use [clojure.test :only (deftest are run-tests)]
-        clojure.contrib.test-contrib.pprint.helper
+        clojure.contrib.pprint.test-helper
         clojure.contrib.pprint))
 
 (def format cl-format)
diff --git a/src/test/clojure/clojure/contrib/pprint/test_helper.clj b/src/test/clojure/clojure/contrib/pprint/test_helper.clj
index d4b97276..9a36bbbe 100644
--- a/src/test/clojure/clojure/contrib/pprint/test_helper.clj
+++ b/src/test/clojure/clojure/contrib/pprint/test_helper.clj
@@ -13,7 +13,7 @@
 
 ;; This is just a macro to make my tests a little cleaner
 
-(ns clojure.contrib.contrib.pprint.test-helper
+(ns clojure.contrib.pprint.test-helper
   (:use [clojure.test :only (deftest are run-tests)]))
 
 (defmacro simple-tests [name & test-pairs]
diff --git a/src/test/clojure/clojure/contrib/pprint/test_pretty.clj b/src/test/clojure/clojure/contrib/pprint/test_pretty.clj
index dfc214ad..f5de6f1e 100644
--- a/src/test/clojure/clojure/contrib/pprint/test_pretty.clj
+++ b/src/test/clojure/clojure/contrib/pprint/test_pretty.clj
@@ -13,7 +13,7 @@
 
 (ns clojure.contrib.pprint.test-pretty
   (:use [clojure.test :only (deftest are run-tests)]
-        clojure.contrib.test-contrib.pprint.helper
+        clojure.contrib.pprint.test-helper
         clojure.contrib.pprint))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/src/test/clojure/clojure/contrib/test_macro_utils.clj b/src/test/clojure/clojure/contrib/test_macro_utils.clj
index d27b24b9..8b603a67 100644
--- a/src/test/clojure/clojure/contrib/test_macro_utils.clj
+++ b/src/test/clojure/clojure/contrib/test_macro_utils.clj
@@ -20,7 +20,7 @@
 	 :only (with-monad domonad)]))
 
 (use-fixtures :each
-  (fn [f] (binding [*ns* (the-ns 'clojure.contrib.test-contrib.macro-utils)]
+  (fn [f] (binding [*ns* (the-ns 'clojure.contrib.test-macro-utils)]
 	    (f))))
 
 (deftest macrolet-test
diff --git a/src/test/clojure/clojure/contrib/test_mock.clj b/src/test/clojure/clojure/contrib/test_mock.clj
index 04f1d593..961de931 100644
--- a/src/test/clojure/clojure/contrib/test_mock.clj
+++ b/src/test/clojure/clojure/contrib/test_mock.clj
@@ -57,19 +57,19 @@
 
 (deftest test-has-matching-signature
   (assert-called mock/no-matching-function-signature true
-    (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn2 [1]))
+    (mock/has-matching-signature? 'clojure.contrib.test-mock/fn2 [1]))
   (assert-called mock/no-matching-function-signature true
-    (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn3 [1 3]))
+    (mock/has-matching-signature? 'clojure.contrib.test-mock/fn3 [1 3]))
   (assert-called mock/no-matching-function-signature false
-    (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn3 [1 3 5]))
+    (mock/has-matching-signature? 'clojure.contrib.test-mock/fn3 [1 3 5]))
   (assert-called mock/no-matching-function-signature false
-    (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn4 [1 3 5 7 9]))
+    (mock/has-matching-signature? 'clojure.contrib.test-mock/fn4 [1 3 5 7 9]))
   (assert-called mock/no-matching-function-signature false
-    (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn4 [1 3]))
+    (mock/has-matching-signature? 'clojure.contrib.test-mock/fn4 [1 3]))
   (assert-called mock/no-matching-function-signature true
-    (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/fn4 [1]))
+    (mock/has-matching-signature? 'clojure.contrib.test-mock/fn4 [1]))
   (assert-called mock/no-matching-function-signature false
-    (mock/has-matching-signature? 'clojure.contrib.test-contrib.mock-test/deffed-differently [1])))
+    (mock/has-matching-signature? 'clojure.contrib.test-mock/deffed-differently [1])))
 
 
 (deftest test-times
diff --git a/src/test/clojure/clojure/contrib/test_trace.clj b/src/test/clojure/clojure/contrib/test_trace.clj
index 4b3250f7..015fff65 100644
--- a/src/test/clojure/clojure/contrib/test_trace.clj
+++ b/src/test/clojure/clojure/contrib/test_trace.clj
@@ -1,6 +1,6 @@
 (ns clojure.contrib.test-trace
   (:use clojure.test
-        [clojure.contrib trace string]))
+        clojure.contrib.trace))
 
 (deftrace call-myself [n]
   (when-not (< n 1)