update to latest test.generative, add test.check, reorganize test parts of build

Signed-off-by: Stuart Halloway <[email protected]>

Author: puredanger

build.xml

@@ -11,7 +11,8 @@
   <property name="jtestsrc" location="${test}/java"/>
   <property name="cljsrc" location="${src}/clj"/>
   <property name="cljscript" location="${src}/script"/>
-  <property name="test-script" location="${cljscript}/run_tests.clj"/>
+  <property name="test-script" location="${cljscript}/run_test.clj"/>
+  <property name="test-generative-script" location="${cljscript}/run_test_generative.clj"/>
   <property name="compile-script" location="${cljscript}/bootstrap_compile.clj"/>
   <property name="target" location="target"/>
   <property name="build" location="${target}/classes"/>
@@ -98,7 +99,7 @@
     </java>
   </target>
 
-  <target name="test"
+  <target name="test-example"
           description="Run clojure tests without recompiling clojure."
           depends="compile-tests"
           unless="maven.test.skip">
@@ -114,6 +115,26 @@
     </java>
   </target>
 
+  <target name="test-generative"
+          description="Run test generative tests without recompiling clojure."
+          depends="compile-tests"
+          unless="maven.test.skip">
+    <java classname="clojure.main" failonerror="true" fork="true">
+      <classpath>
+        <pathelement path="${maven.test.classpath}"/>
+        <path location="${test-classes}"/>
+        <path location="${test}"/>
+        <path location="${build}"/>
+	<path location="${cljsrc}"/>
+      </classpath>
+      <arg value="${test-generative-script}"/>
+    </java>
+  </target>
+
+  <target name="test"
+          description="Run all the tests"
+          depends="test-example,test-generative"/>
+
   <target name="build"
           description="Build Clojure (compilation only, no tests)."
           depends="compile-java, compile-clojure"/>

pom.xml

@@ -48,7 +48,19 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>test.generative</artifactId>
-      <version>0.4.0</version>
+      <version>0.5.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.clojure</groupId>
+          <artifactId>clojure</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>test.check</artifactId>
+      <version>0.5.9</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

src/script/run_test.clj

@@ -0,0 +1,8 @@
+(System/setProperty "java.awt.headless" "true")
+(require
+ '[clojure.test :as test]
+ '[clojure.tools.namespace :as ns])
+(def namespaces (ns/find-namespaces-in-dir (java.io.File. "test")))
+(doseq [ns namespaces] (require ns))
+(let [summary (apply test/run-tests namespaces)]
+  (System/exit (if (test/successful? summary) 0 -1)))

src/script/run_tests.clj renamed to src/script/run_test_generative.clj

@@ -1,4 +1,5 @@
-(System/setProperty "clojure.test.generative.msec" "60000")
 (System/setProperty "java.awt.headless" "true")
+(when-not (System/getProperty "clojure.test.generative.msec")
+  (System/setProperty "clojure.test.generative.msec" "60000"))
 (require '[clojure.test.generative.runner :as runner])
 (runner/-main "test")