Flatten test namespaces.

digash · Aug 18, 2009 · faf5a68 · faf5a68
1 parent 3ff853a
commit faf5a68
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 35 deletions.
diff --git a/build.xml b/build.xml
@@ -43,7 +43,7 @@
   <target name="test" depends="compile">
     <java classname="clojure.main" classpathref="test.classpath" dir="${test.dir}" fork="true" failonerror="true">
       <arg value="-e" />
-      <arg value="(require 'clj-record.test.main) (clj-record.test.main/load-and-run)" />
+      <arg value="(require 'clj-record.main) (clj-record.main/load-and-run)" />
     </java>
   </target>
 

diff --git a/test/clj_record/test/associations_test.clj → test/clj_record/associations_test.clj b/test/clj_record/test/associations_test.clj → test/clj_record/associations_test.clj
@@ -1,9 +1,9 @@
-(ns clj-record.test.associations-test
+(ns clj-record.associations-test
   (:require
-    [clj-record.test.model.manufacturer :as manufacturer]
-    [clj-record.test.model.product :as product])
+    [clj-record.test-model.manufacturer :as manufacturer]
+    [clj-record.test-model.product :as product])
   (:use clojure.contrib.test-is
-        clj-record.test.test-helper))
+        clj-record.test-helper))
 
 
 (defdbtest belongs-to-creates-find-function

diff --git a/..._record/test/callbacks_built_ins_test.clj → test/clj_record/callbacks_built_ins_test.clj b/..._record/test/callbacks_built_ins_test.clj → test/clj_record/callbacks_built_ins_test.clj
@@ -1,4 +1,4 @@
-(ns clj-record.test.callbacks-built-ins-test
+(ns clj-record.callbacks-built-ins-test
   (:use clojure.contrib.test-is)
   (:require [clj-record.callbacks.built-ins :as cbfunc]))
 

diff --git a/test/clj_record/test/callbacks_test.clj → test/clj_record/callbacks_test.clj b/test/clj_record/test/callbacks_test.clj → test/clj_record/callbacks_test.clj
@@ -1,9 +1,9 @@
-(ns clj-record.test.callbacks-test
+(ns clj-record.callbacks-test
   (:require
-    [clj-record.test.model.manufacturer :as manufacturer]
+    [clj-record.test-model.manufacturer :as manufacturer]
     [clj-record.callbacks :as callbacks])
   (:use clojure.contrib.test-is
-        clj-record.test.test-helper))
+        clj-record.test-helper))
 
 
 (defdbtest before-save-can-transform-the-record-before-create

diff --git a/test/clj_record/test/core_test.clj → test/clj_record/core_test.clj b/test/clj_record/test/core_test.clj → test/clj_record/core_test.clj
@@ -1,11 +1,11 @@
-(ns clj-record.test.core-test
+(ns clj-record.core-test
   (:require
     [clj-record.core :as core]
     [clj-record.query :as query]
-    [clj-record.test.model.manufacturer :as manufacturer]
-    [clj-record.test.model.product :as product])
+    [clj-record.test-model.manufacturer :as manufacturer]
+    [clj-record.test-model.product :as product])
   (:use clojure.contrib.test-is
-        clj-record.test.test-helper))
+        clj-record.test-helper))
 
 
 (deftest table-name-can-be-unconventional-with-table-name-option-to-init-model

diff --git a/test/clj_record/test/main.clj → test/clj_record/main.clj b/test/clj_record/test/main.clj → test/clj_record/main.clj
@@ -1,7 +1,7 @@
-(ns clj-record.test.main
+(ns clj-record.main
   (:require [clojure.contrib.sql :as sql]
             [clojure.contrib.test-is :as test-is])
-  (:use clj-record.test.model.config
+  (:use clj-record.test-model.config
         clojure.contrib.str-utils))
 
 
@@ -41,7 +41,7 @@
   "Resets the test database, then finds, loads, and runs all the tests."
   []
   (reset-db)
-  (let [test-files  (for [f (.listFiles (java.io.File. "clj_record/test"))
+  (let [test-files  (for [f (.listFiles (java.io.File. "clj_record"))
                           :when (re-find #"test.clj$" (.getPath f))]
                       (re-find #"[^.]+" (.getPath f)))
         test-namespaces (map #(symbol (re-gsub #"/" "." (re-gsub #"_" "-" %))) test-files)]

diff --git a/test/clj_record/test/query_test.clj → test/clj_record/query_test.clj b/test/clj_record/test/query_test.clj → test/clj_record/query_test.clj
@@ -1,11 +1,11 @@
-(ns clj-record.test.query-test
+(ns clj-record.query-test
   (:require
     [clj-record.core :as core]
     [clj-record.query :as query]
-    [clj-record.test.model.manufacturer :as manufacturer]
-    [clj-record.test.model.product :as product])
+    [clj-record.test-model.manufacturer :as manufacturer]
+    [clj-record.test-model.product :as product])
   (:use clojure.contrib.test-is
-        clj-record.test.test-helper))
+        clj-record.test-helper))
 
 
 (defn manufacturers [] 

diff --git a/test/clj_record/test/serialization_test.clj → test/clj_record/serialization_test.clj b/test/clj_record/test/serialization_test.clj → test/clj_record/serialization_test.clj
@@ -1,9 +1,9 @@
-(ns clj-record.test.serialization-test
+(ns clj-record.serialization-test
   (:require
     [clj-record.serialization :as serialization]
-    [clj-record.test.model.manufacturer :as manufacturer])
+    [clj-record.test-model.manufacturer :as manufacturer])
   (:use clojure.contrib.test-is
-        clj-record.test.test-helper))
+        clj-record.test-helper))
 
 
 (deftest serializes-simple-clojure-types

diff --git a/test/clj_record/test/test_helper.clj → test/clj_record/test_helper.clj b/test/clj_record/test/test_helper.clj → test/clj_record/test_helper.clj
@@ -1,4 +1,4 @@
-(ns clj-record.test.test-helper
+(ns clj-record.test-helper
   (:require [clj-record.core :as core])
   (:use clojure.contrib.test-is))
 
@@ -8,7 +8,7 @@
     (rolling-back ~@body)))
 
 (defmacro rolling-back [& body]
-  `(core/transaction clj-record.test.model.config/db
+  `(core/transaction clj-record.test-model.config/db
     (try
       ~@body
       (finally

diff --git a/test/clj_record/test/model/config.clj → test/clj_record/test_model/config.clj b/test/clj_record/test/model/config.clj → test/clj_record/test_model/config.clj
@@ -1,4 +1,4 @@
-(ns clj-record.test.model.config)
+(ns clj-record.test-model.config)
 
 (comment)
 (def db {:classname "org.apache.derby.jdbc.EmbeddedDriver"

diff --git a/test/clj_record/test/model/manufacturer.clj → test/clj_record/test_model/manufacturer.clj b/test/clj_record/test/model/manufacturer.clj → test/clj_record/test_model/manufacturer.clj
@@ -1,8 +1,8 @@
-(ns clj-record.test.model.manufacturer
+(ns clj-record.test-model.manufacturer
   (:require clj-record.boot
             [clj-record.validation.built-ins :as valid]
             [clj-record.callbacks.built-ins :as cb])
-  (:use clj-record.test.model.config))
+  (:use clj-record.test-model.config))
 
 
 ; def'd here to illustrate that validation messages don't have to live inline in the init-model form.

diff --git a/test/clj_record/test/model/product.clj → test/clj_record/test_model/product.clj b/test/clj_record/test/model/product.clj → test/clj_record/test_model/product.clj
@@ -1,6 +1,6 @@
-(ns clj-record.test.model.product
+(ns clj-record.test-model.product
   (:require clj-record.boot)
-  (:use clj-record.test.model.config))
+  (:use clj-record.test-model.config))
 
 
 (clj-record.core/init-model

diff --git a/test/clj_record/test/util_test.clj → test/clj_record/util_test.clj b/test/clj_record/test/util_test.clj → test/clj_record/util_test.clj
@@ -1,4 +1,4 @@
-(ns clj-record.test.util-test
+(ns clj-record.util-test
   (:require
     [clj-record.util :as util])
   (:use clojure.contrib.test-is))

diff --git a/...record/test/validation_built_ins_test.clj → .../clj_record/validation_built_ins_test.clj b/...record/test/validation_built_ins_test.clj → .../clj_record/validation_built_ins_test.clj
@@ -1,4 +1,4 @@
-(ns clj-record.test.validation-built-ins-test
+(ns clj-record.validation-built-ins-test
   (:use clojure.contrib.test-is)
   (:require [clj-record.validation.built-ins :as v]))
 

diff --git a/test/clj_record/test/validation_test.clj → test/clj_record/validation_test.clj b/test/clj_record/test/validation_test.clj → test/clj_record/validation_test.clj
@@ -1,8 +1,8 @@
-(ns clj-record.test.validation-test
+(ns clj-record.validation-test
   (:require
     [clj-record.validation :as validation]
-    [clj-record.test.model.manufacturer :as manufacturer]
-    [clj-record.test.model.product :as product])
+    [clj-record.test-model.manufacturer :as manufacturer]
+    [clj-record.test-model.product :as product])
   (:use clojure.contrib.test-is))