Merge commit 'stuart/gtic'

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"
@@ -121,7 +107,6 @@
       <arg value="clojure.contrib.complex-numbers"/>
       <arg value="clojure.contrib.cond"/>
       <arg value="clojure.contrib.condition"/>
-      <arg value="clojure.contrib.condt"/>
       <arg value="clojure.contrib.core"/>
       <arg value="clojure.contrib.dataflow"/>
       <arg value="clojure.contrib.datalog"/>
@@ -182,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"/>

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

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)
 )
 

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

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))
 
 

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))
 

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))
 

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))

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

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)]))
 

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

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

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)
 

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

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.
 

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

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

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