Change ns names for all renamed libs except str-utils

5 files changed, 16 insertions, 16 deletions

diff --git a/src/test/clojure/clojure/contrib/test_contrib/java_utils.clj b/src/test/clojure/clojure/contrib/test_contrib/java_utils.clj
index 44901ad1..2d74343a 100644
--- a/src/test/clojure/clojure/contrib/test_contrib/java_utils.clj
+++ b/src/test/clojure/clojure/contrib/test_contrib/java_utils.clj
@@ -1,5 +1,5 @@
-(ns clojure.contrib.test-contrib.java-utils
-  (:use clojure.test clojure.contrib.java-utils))
+(ns clojure.contrib.test-contrib.java
+  (:use clojure.test clojure.contrib.java))
 
 (deftest t-as-str
   (is (= "foo" (as-str "foo")))
diff --git a/src/test/clojure/clojure/contrib/test_contrib/seq_utils_test.clj b/src/test/clojure/clojure/contrib/test_contrib/seq_utils_test.clj
index 0958fc65..84ffbace 100644
--- a/src/test/clojure/clojure/contrib/test_contrib/seq_utils_test.clj
+++ b/src/test/clojure/clojure/contrib/test_contrib/seq_utils_test.clj
@@ -1,6 +1,6 @@
-(ns clojure.contrib.test-contrib.seq-utils-test
+(ns clojure.contrib.test-contrib.seq-test
   (:use clojure.test
-	clojure.contrib.seq-utils))
+	clojure.contrib.seq))
 
 
 (deftest test-positions
diff --git a/src/test/clojure/clojure/contrib/test_contrib/shell_out.clj b/src/test/clojure/clojure/contrib/test_contrib/shell_out.clj
index c5447099..7af31deb 100644
--- a/src/test/clojure/clojure/contrib/test_contrib/shell_out.clj
+++ b/src/test/clojure/clojure/contrib/test_contrib/shell_out.clj
@@ -1,12 +1,12 @@
-(ns clojure.contrib.test-contrib.shell-out
+(ns clojure.contrib.test-contrib.shell
   (:use clojure.test
-	clojure.contrib.shell-out)
+	clojure.contrib.shell)
   (:import (java.io File)))
 
 ; workaroung to access private parse-args. Better way?
-(def parse-args ((ns-interns 'clojure.contrib.shell-out) 'parse-args))
-(def as-file ((ns-interns 'clojure.contrib.shell-out) 'as-file))
-(def as-env-string ((ns-interns 'clojure.contrib.shell-out) 'as-env-string))
+(def parse-args ((ns-interns 'clojure.contrib.shell) 'parse-args))
+(def as-file ((ns-interns 'clojure.contrib.shell) 'as-file))
+(def as-env-string ((ns-interns 'clojure.contrib.shell) 'as-env-string))
 
 (deftest test-parse-args
   (are [x y] (= x y)
diff --git a/src/test/clojure/clojure/contrib/test_contrib/test_java_utils.clj b/src/test/clojure/clojure/contrib/test_contrib/test_java_utils.clj
index 8e0f67c4..7ccc5154 100644
--- a/src/test/clojure/clojure/contrib/test_contrib/test_java_utils.clj
+++ b/src/test/clojure/clojure/contrib/test_contrib/test_java_utils.clj
@@ -1,7 +1,7 @@
-(ns clojure.contrib.test-contrib.test-java-utils
+(ns clojure.contrib.test-contrib.test-java
   (:use clojure.test
-	[clojure.contrib.duck-streams :only (spit)]
-	clojure.contrib.java-utils)
+	[clojure.contrib.io :only (spit)]
+	clojure.contrib.java)
   (:import [java.io File]
            [java.net URL URI]
 	   [java.util Properties]))
@@ -65,7 +65,7 @@
     
 (deftest test-set-system-properties 
   (testing "set and then unset a property using keywords"
-    (let [propname :clojure.contrib.java-utils.test-set-system-properties]
+    (let [propname :clojure.contrib.java.test-set-system-properties]
       (is (nil? (get-system-property propname)))
       (set-system-properties {propname :foo})
       (is (= "foo") (get-system-property propname))
@@ -74,7 +74,7 @@
 )
 
 (deftest test-with-system-properties
-  (let [propname :clojure.contrib.java-utils.test-with-system-properties]
+  (let [propname :clojure.contrib.java.test-with-system-properties]
     (testing "sets a property only for the duration of a block"
       (is (= "foo" 
 	     (with-system-properties {propname "foo"}
@@ -82,7 +82,7 @@
       (is (nil? (get-system-property propname)))))
   (testing "leaves other properties alone"
     ; TODO: write this test better, using a properties -> map function
-    (let [propname :clojure.contrib.java-utils.test-with-system-properties
+    (let [propname :clojure.contrib.java.test-with-system-properties
           propcount (count (System/getProperties))]
       (with-system-properties {propname "foo"}
         (is (= (inc propcount) (count (System/getProperties)))))
diff --git a/src/test/clojure/clojure/contrib/test_contrib/with_ns_test.clj b/src/test/clojure/clojure/contrib/test_contrib/with_ns_test.clj
index 09137bc0..61fee6e3 100644
--- a/src/test/clojure/clojure/contrib/test_contrib/with_ns_test.clj
+++ b/src/test/clojure/clojure/contrib/test_contrib/with_ns_test.clj
@@ -1,7 +1,7 @@
 (ns clojure.contrib.test-contrib.with-ns-test
   (:use clojure.test
 	clojure.contrib.with-ns
-        [clojure.contrib.seq-utils :only (includes?)]))
+        [clojure.contrib.seq :only (includes?)]))
 
 (deftest test-namespace-gets-removed
   (let [all-ns-names (fn [] (map #(.name %) (all-ns)))]