new tests dir, test-clojure will load any .clj files in it and then run all defined tests

3 files changed, 15 insertions, 2 deletions

diff --git a/src/clojure/contrib/test_clojure/test_clojure.clj b/src/clojure/contrib/test_clojure/test_clojure.clj
index b839b142..a583eb10 100644
--- a/src/clojure/contrib/test_clojure/test_clojure.clj
+++ b/src/clojure/contrib/test_clojure/test_clojure.clj
@@ -14,8 +14,21 @@
 ;;  Created 22 October 2008
 
 (ns clojure.contrib.test-clojure
-  (:use clojure.contrib.test-is)
-  (:load "reader.clj" "printer.clj"))
+  (:import (java.io File FilenameFilter))
+  (:use clojure.contrib.test-is))
+
+(defn- filename-filter-re
+  [pattern]
+  (proxy [FilenameFilter] []
+    (accept
+     [dir name]
+     (boolean (re-matches pattern name)))))
+
+(doseq file (.listFiles
+             (File. "tests")
+             (filename-filter-re #".*\.clj"))
+  (printf "Loading %s\n" file)
+  (load (.getPath file)))
 
 (binding [*test-out* (java.io.PrintWriter. *out*)]
   (run-tests)
diff --git a/src/clojure/contrib/test_clojure/printer.clj b/src/clojure/contrib/test_clojure/tests/printer.clj
index d5779ec1..d5779ec1 100644
--- a/src/clojure/contrib/test_clojure/printer.clj
+++ b/src/clojure/contrib/test_clojure/tests/printer.clj
diff --git a/src/clojure/contrib/test_clojure/reader.clj b/src/clojure/contrib/test_clojure/tests/reader.clj
index 7517b588..7517b588 100644
--- a/src/clojure/contrib/test_clojure/reader.clj
+++ b/src/clojure/contrib/test_clojure/tests/reader.clj