gtic: move clojure tests and supporting libraries into clojure repos

71 files changed, 40 insertions, 5755 deletions

diff --git a/build.xml b/build.xml
index 4a885cd3..2cddf682 100644
--- a/build.xml
+++ b/build.xml
@@ -31,20 +31,6 @@
     <delete dir="${build}"/>
   </target>
 
-  <target name="test_clojure"
-          description="Run clojure tests"
-          if="hasclojure">
-    <java classname="clojure.main">
-      <classpath>
-        <path location="${build}"/>
-        <path location="${src}"/>
-        <path location="${clojure.jar}"/>
-      </classpath>
-      <arg value="-e"/>
-      <arg value="(require '(clojure.contrib [test-clojure :as main])) (main/run)"/>
-    </java>
-  </target>
-
   <target name="test_contrib"
           description="Run contrib tests"
           if="hasclojure">
@@ -73,7 +59,7 @@
     </java>
   </target>
 
-  <target name="test" depends="test_clojure,test_contrib,test_datalog"
+  <target name="test" depends="test_contrib,test_datalog"
           description="Run all tests"/>
 
   <target name="check_hasclojure"
@@ -181,16 +167,11 @@
       <arg value="clojure.contrib.singleton"/>
       <arg value="clojure.contrib.sql"/>
       <arg value="clojure.contrib.sql.internal"/>
-      <arg value="clojure.contrib.stacktrace"/>
       <arg value="clojure.contrib.str-utils"/>
       <arg value="clojure.contrib.stream-utils"/>
       <arg value="clojure.contrib.swing-utils"/>
-      <arg value="clojure.contrib.template"/>
-      <arg value="clojure.contrib.test-is"/>
-      <arg value="clojure.contrib.test-is.tap"/>
       <arg value="clojure.contrib.trace"/>
       <arg value="clojure.contrib.types"/>
-      <arg value="clojure.contrib.walk"/>
       <arg value="clojure.contrib.with-ns"/>
       <arg value="clojure.contrib.zip-filter"/>
       <arg value="clojure.contrib.zip-filter.xml"/>
diff --git a/src/clojure/contrib/core/tests.clj b/src/clojure/contrib/core/tests.clj
index ddc79dc7..d2e0d50d 100644
--- a/src/clojure/contrib/core/tests.clj
+++ b/src/clojure/contrib/core/tests.clj
@@ -13,7 +13,7 @@
 ;; note to other contrib members: feel free to add to this lib
 
 (ns clojure.contrib.core.tests
-  (:use clojure.contrib.test-is)
+  (:use clojure.test)
   (:use clojure.contrib.core))
 
 (deftest test-classic-versions
diff --git a/src/clojure/contrib/dataflow.clj b/src/clojure/contrib/dataflow.clj
index b23a7231..894942be 100644
--- a/src/clojure/contrib/dataflow.clj
+++ b/src/clojure/contrib/dataflow.clj
@@ -23,7 +23,7 @@
                                       reverse-graph
                                       dependency-list
                                       get-neighbors)])
-  (:use [clojure.contrib.walk :only (postwalk)])
+  (:use [clojure.walk :only (postwalk)])
   (:use [clojure.contrib.except :only (throwf)]))
 
 
@@ -500,7 +500,7 @@
   (get-value df 'greg)
 
   (use :reload 'clojure.contrib.dataflow)
-  (use 'clojure.contrib.stacktrace) (e)
+  (use 'clojure.stacktrace) (e)
   (use 'clojure.contrib.trace)
 )
     
diff --git a/src/clojure/contrib/datalog/tests/test.clj b/src/clojure/contrib/datalog/tests/test.clj
index c649e6b2..121d264e 100644
--- a/src/clojure/contrib/datalog/tests/test.clj
+++ b/src/clojure/contrib/datalog/tests/test.clj
@@ -14,7 +14,7 @@
 ;;  Created 11 Feburary 2009
 
 (ns clojure.contrib.datalog.tests.test
-  (:use [clojure.contrib.test-is :only (run-tests)])
+  (:use [clojure.test :only (run-tests)])
   (:gen-class))
 
 (def test-names [:test-util
diff --git a/src/clojure/contrib/datalog/tests/test_database.clj b/src/clojure/contrib/datalog/tests/test_database.clj
index 1aaea324..06649611 100644
--- a/src/clojure/contrib/datalog/tests/test_database.clj
+++ b/src/clojure/contrib/datalog/tests/test_database.clj
@@ -15,7 +15,7 @@
 
 
 (ns clojure.contrib.datalog.tests.test-database
-  (:use clojure.contrib.test-is
+  (:use clojure.test
 	clojure.contrib.datalog.database))
 
 
diff --git a/src/clojure/contrib/datalog/tests/test_literals.clj b/src/clojure/contrib/datalog/tests/test_literals.clj
index 107a4dc6..36ee5147 100644
--- a/src/clojure/contrib/datalog/tests/test_literals.clj
+++ b/src/clojure/contrib/datalog/tests/test_literals.clj
@@ -15,7 +15,7 @@
 
 
 (ns clojure.contrib.datalog.tests.test-literals
-  (:use clojure.contrib.test-is)
+  (:use clojure.test)
   (:use clojure.contrib.datalog.literals
         clojure.contrib.datalog.database))
 
diff --git a/src/clojure/contrib/datalog/tests/test_magic.clj b/src/clojure/contrib/datalog/tests/test_magic.clj
index b790475f..7eabae78 100644
--- a/src/clojure/contrib/datalog/tests/test_magic.clj
+++ b/src/clojure/contrib/datalog/tests/test_magic.clj
@@ -14,7 +14,7 @@
 ;;  Created 18 Feburary 2009
 
 (ns clojure.contrib.datalog.tests.test-magic
-  (:use clojure.contrib.test-is)
+  (:use clojure.test)
   (:use clojure.contrib.datalog.magic
         clojure.contrib.datalog.rules))
 
diff --git a/src/clojure/contrib/datalog/tests/test_rules.clj b/src/clojure/contrib/datalog/tests/test_rules.clj
index a42ad757..8b80b770 100644
--- a/src/clojure/contrib/datalog/tests/test_rules.clj
+++ b/src/clojure/contrib/datalog/tests/test_rules.clj
@@ -15,7 +15,7 @@
 
 
 (ns clojure.contrib.datalog.tests.test-rules
-  (:use clojure.contrib.test-is
+  (:use clojure.test
         clojure.contrib.datalog.rules
         clojure.contrib.datalog.literals
         clojure.contrib.datalog.database))
diff --git a/src/clojure/contrib/datalog/tests/test_softstrat.clj b/src/clojure/contrib/datalog/tests/test_softstrat.clj
index d17cef8b..a33d8c96 100644
--- a/src/clojure/contrib/datalog/tests/test_softstrat.clj
+++ b/src/clojure/contrib/datalog/tests/test_softstrat.clj
@@ -14,7 +14,7 @@
 ;;  Created 28 Feburary 2009
 
 (ns clojure.contrib.datalog.tests.test-softstrat
-  (:use clojure.contrib.test-is)
+  (:use clojure.test)
   (:use clojure.contrib.datalog.softstrat
         clojure.contrib.datalog.magic
         clojure.contrib.datalog.rules
diff --git a/src/clojure/contrib/datalog/tests/test_util.clj b/src/clojure/contrib/datalog/tests/test_util.clj
index aac6ace9..9a5d0460 100644
--- a/src/clojure/contrib/datalog/tests/test_util.clj
+++ b/src/clojure/contrib/datalog/tests/test_util.clj
@@ -14,7 +14,7 @@
 ;;  Created 11 Feburary 2009
 
 (ns clojure.contrib.datalog.tests.test-util
-  (:use clojure.contrib.test-is
+  (:use clojure.test
 	clojure.contrib.datalog.util)
   (:use [clojure.contrib.except :only (throwf)]))
 
diff --git a/src/clojure/contrib/error_kit.clj b/src/clojure/contrib/error_kit.clj
index 0d5ea8e5..4db80d59 100644
--- a/src/clojure/contrib/error_kit.clj
+++ b/src/clojure/contrib/error_kit.clj
@@ -19,7 +19,7 @@ Please contact Chouser if you have any suggestions for better names
 or API adjustments."} 
   clojure.contrib.error-kit
   (:use [clojure.contrib.def :only (defvar defvar-)]
-        [clojure.contrib.stacktrace :only (root-cause)]))
+        [clojure.stacktrace :only (root-cause)]))
 
 (defn- make-ctrl-exception [msg data]
   "Create an exception object with associated data, used for passing
diff --git a/src/clojure/contrib/gen_html_docs.clj b/src/clojure/contrib/gen_html_docs.clj
index 5b2b884d..8b043010 100644
--- a/src/clojure/contrib/gen_html_docs.clj
+++ b/src/clojure/contrib/gen_html_docs.clj
@@ -512,16 +512,11 @@ emits the generated HTML to the path named by path."
      'clojure.contrib.server-socket
      'clojure.contrib.shell-out
      'clojure.contrib.sql
-     'clojure.contrib.stacktrace
      'clojure.contrib.stream-utils
      'clojure.contrib.str-utils
-     'clojure.contrib.template
-     'clojure.contrib.test-clojure
      'clojure.contrib.test-contrib
-     'clojure.contrib.test-is
      'clojure.contrib.trace
      'clojure.contrib.types
-     'clojure.contrib.walk
      'clojure.contrib.zip-filter
      'clojure.contrib.javadoc.browse
      'clojure.contrib.json.read
diff --git a/src/clojure/contrib/json/read.clj b/src/clojure/contrib/json/read.clj
index 8070fc37..e9c7a3f2 100644
--- a/src/clojure/contrib/json/read.clj
+++ b/src/clojure/contrib/json/read.clj
@@ -48,7 +48,7 @@
      :see-also [["http://www.json.org", "JSON Home Page"]]}
   clojure.contrib.json.read
   (:import (java.io PushbackReader StringReader EOFException))
-  (:use [clojure.contrib.test-is :only (deftest- is)]))
+  (:use [clojure.test :only (deftest- is)]))
 
 (declare read-json)
 
diff --git a/src/clojure/contrib/json/write.clj b/src/clojure/contrib/json/write.clj
index 9db4a979..5f56f211 100644
--- a/src/clojure/contrib/json/write.clj
+++ b/src/clojure/contrib/json/write.clj
@@ -45,7 +45,7 @@ Within strings, all non-ASCII characters are hexadecimal escaped.
      :see-also [["http://json.org/", "JSON Home Page"]]}
   clojure.contrib.json.write
   (:require [clojure.contrib.java-utils :as j])
-  (:use [clojure.contrib.test-is :only (deftest- is)]))
+  (:use [clojure.test :only (deftest- is)]))
 
 (defmulti
   #^{:doc "Prints x as JSON.  Nil becomes JSON null.  Keywords become
@@ -145,9 +145,9 @@ Within strings, all non-ASCII characters are hexadecimal escaped.
 ;;; TESTS
 
 ;; Run these tests with
-;; (clojure.contrib.test-is/run-tests 'clojure.contrib.print-json)
+;; (clojure.test/run-tests 'clojure.contrib.print-json)
 
-;; Bind clojure.contrib.test-is/*load-tests* to false to omit these
+;; Bind clojure.test/*load-tests* to false to omit these
 ;; tests from production code.
 
 (deftest- can-print-json-strings
diff --git a/src/clojure/contrib/load_all.clj b/src/clojure/contrib/load_all.clj
index d72bd5d6..ff617a36 100644
--- a/src/clojure/contrib/load_all.clj
+++ b/src/clojure/contrib/load_all.clj
@@ -22,7 +22,7 @@
 ;; errors, not that they work correctly.  If the libraries have tests
 ;; defined using test-is, you can run them with:
 ;;
-;; (clojure.contrib.test-is/run-all-tests)
+;; (clojure.test/run-all-tests)
 ;;
 ;; If you write a new lib, please add it to the list in this file.
 
diff --git a/src/clojure/contrib/macro_utils.clj b/src/clojure/contrib/macro_utils.clj
index a243a5f9..08c743e1 100644
--- a/src/clojure/contrib/macro_utils.clj
+++ b/src/clojure/contrib/macro_utils.clj
@@ -27,7 +27,7 @@
            macros can be used only inside a with-symbol-macros form."}
   clojure.contrib.macro-utils
   (:use [clojure.contrib.def :only (defvar-)])
-  (:use [clojure.contrib.walk :only (prewalk)]))
+  (:use [clojure.walk :only (prewalk)]))
 
 ; A set of all special forms. Special forms are not macro-expanded, making
 ; it impossible to shadow them by macro definitions. For most special
diff --git a/src/clojure/contrib/math/tests.clj b/src/clojure/contrib/math/tests.clj
index 654a73f3..62816b3f 100644
--- a/src/clojure/contrib/math/tests.clj
+++ b/src/clojure/contrib/math/tests.clj
@@ -1,5 +1,5 @@
 (ns clojure.contrib.math.tests

-  (:use clojure.contrib.test-is

+  (:use clojure.test

 	clojure.contrib.math))

 

 (deftest test-expt

diff --git a/src/clojure/contrib/pprint/examples/json.clj b/src/clojure/contrib/pprint/examples/json.clj
index ca11231d..f62f81a7 100644
--- a/src/clojure/contrib/pprint/examples/json.clj
+++ b/src/clojure/contrib/pprint/examples/json.clj
@@ -20,7 +20,7 @@ This is an example of using a pretty printer dispatch function to generate JSON
      :see-also [["http://json.org/", "JSON Home Page"]]}
   clojure.contrib.pprint.examples.json
   (:require [clojure.contrib.java-utils :as j])
-  (:use [clojure.contrib.test-is :only (deftest- is)]
+  (:use [clojure.test :only (deftest- is)]
         [clojure.contrib.pprint :only (write formatter-out)]))
 
 
@@ -104,9 +104,9 @@ This is an example of using a pretty printer dispatch function to generate JSON
 ;;; TESTS
 
 ;; Run these tests with
-;; (clojure.contrib.test-is/run-tests 'clojure.contrib.print-json)
+;; (clojure.test/run-tests 'clojure.contrib.print-json)
 
-;; Bind clojure.contrib.test-is/*load-tests* to false to omit these
+;; Bind clojure.test/*load-tests* to false to omit these
 ;; tests from production code.
 
 (deftest- can-print-json-strings
diff --git a/src/clojure/contrib/stacktrace.clj b/src/clojure/contrib/stacktrace.clj
deleted file mode 100644
index 7330ef47..00000000
--- a/src/clojure/contrib/stacktrace.clj
+++ /dev/null
@@ -1,75 +0,0 @@
-;;; stacktrace.clj: print Clojure-centric stack traces
-
-;; by Stuart Sierra, http://stuartsierra.com/
-;; January 6, 2009
-
-;; Copyright (c) Stuart Sierra, 2009. All rights reserved.  The use
-;; and distribution terms for this software are covered by the Eclipse
-;; Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this
-;; distribution.  By using this software in any fashion, you are
-;; agreeing to be bound by the terms of this license.  You must not
-;; remove this notice, or any other, from this software.
-
-
-(ns 
-  #^{:author "Stuart Sierra",
-     :doc "Print Clojure-centric stack traces"}
-  clojure.contrib.stacktrace)
-
-(defn root-cause
-  "Returns the last 'cause' Throwable in a chain of Throwables."
-  [tr]
-  (if-let [cause (.getCause tr)]
-    (recur cause)
-    tr))
-
-(defn print-trace-element
-  "Prints a Clojure-oriented view of one element in a stack trace."
-  [e]
-  (let [class (.getClassName e)
-	method (.getMethodName e)] 
-    (let [match (re-matches #"^([A-Za-z0-9_.-]+)\$(\w+)__\d+$" class)]
-      (if (and match (= "invoke" method))
-	(apply printf "%s/%s" (rest match))
-	(printf "%s.%s" class method))))
-  (printf " (%s:%d)" (or (.getFileName e) "") (.getLineNumber e)))
-
-(defn print-throwable
-  "Prints the class and message of a Throwable."
-  [tr]
-  (printf "%s: %s" (.getName (class tr)) (.getMessage tr)))
-
-(defn print-stack-trace
-  "Prints a Clojure-oriented stack trace of tr, a Throwable.
-  Prints a maximum of n stack frames (default: unlimited).
-  Does not print chained exceptions (causes)."
-  ([tr] (print-stack-trace tr nil))
-  ([tr n]
-     (let [st (.getStackTrace tr)]
-       (print-throwable tr)
-       (newline)
-       (print " at ") 
-       (print-trace-element (first st))
-       (newline)
-       (doseq [e (if (nil? n)
-		   (rest st)
-		   (take (dec n) (rest st)))]
-	 (print "    ")
-	 (print-trace-element e)
-	 (newline)))))
-
-(defn print-cause-trace
-  "Like print-stack-trace but prints chained exceptions (causes)."
-  ([tr] (print-cause-trace tr nil))
-  ([tr n]
-     (print-stack-trace tr n)
-     (when-let [cause (.getCause tr)]
-       (print "Caused by: " )
-       (recur cause n))))
-
-(defn e
-  "REPL utility.  Prints a brief stack trace for the root cause of the
-  most recent exception."  
-  []
-  (print-stack-trace (root-cause *e) 8))
diff --git a/src/clojure/contrib/template.clj b/src/clojure/contrib/template.clj
deleted file mode 100644
index 748ad4a4..00000000
--- a/src/clojure/contrib/template.clj
+++ /dev/null
@@ -1,55 +0,0 @@
-;;; template.clj - anonymous functions that pre-evaluate sub-expressions
-
-;; By Stuart Sierra, http://stuartsierra.com/
-;; June 23, 2009
-
-;; Copyright (c) Stuart Sierra, 2009. All rights reserved.  The use
-;; and distribution terms for this software are covered by the Eclipse