Index: build-test.xml
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-torque/build-test.xml,v
retrieving revision 1.33
diff -u -r1.33 build-test.xml
--- build-test.xml	7 Aug 2002 08:07:01 -0000	1.33
+++ build-test.xml	9 Aug 2002 12:34:33 -0000
@@ -262,6 +262,7 @@
     <pathelement location="${jcs.jar}"/>
     <pathelement location="${jdbc.jar}"/>
     <pathelement location="${jndi.jar}"/>
+    <pathelement location="${junit.jar}"/>
     <pathelement location="${log4j.jar}"/>
     <pathelement location="${stratum.jar}"/>
     <pathelement location="${tomcat-naming.jar}"/>
@@ -288,6 +289,7 @@
       ${jcs.jar}
       ${jdbc.jar}
       ${jndi.jar}
+      ${junit.jar}
       ${log4j.jar}
       ${stratum.jar}
       ${tomcat-naming.jar}
@@ -304,11 +306,36 @@
       filtering="yes"
     />
 
-    <java
+    <!-- Ensures Torque can execute, inserts some rows. -->
+    <!--java
       classname="org.apache.torque.test.TorqueRunner">
       <arg value="${build.test}/rttest/Torque.properties"/>
       <classpath refid="classpath"/>
-    </java>
+    </java-->
+
+    <!--taskdef
+      name="junit"
+      classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+      <classpath refid="classpath"/>
+    </taskdef-->
+
+    <!-- Runs the actual rttest tests -->
+    <junit printsummary="no" haltonfailure="yes">
+      <classpath>
+        <pathelement location="${torque.destDir}"/>
+        <path refid="classpath"/>
+      </classpath>
+
+      <formatter type="plain" usefile="false"/>
+
+      <batchtest>
+        <fileset dir="${torque.destDir}">
+          <include name="**/*Test*.class"/>
+          <exclude name="**/BaseTestCase.class"/>
+        </fileset>
+      </batchtest>
+    </junit>
+
   </target>
 
   <target
@@ -328,6 +355,7 @@
     <copy file="${jcs.jar}" todir="${test.libDir}"/>
     <copy file="${jdbc.jar}" todir="${test.libDir}"/>
     <copy file="${jndi.jar}" todir="${test.libDir}"/>
+    <copy file="${junit.jar}" todir="${test.libDir}"/>
     <copy file="${log4j.jar}" todir="${test.libDir}"/>
     <copy file="${stratum.jar}" todir="${test.libDir}"/>
     <copy file="${tomcat-naming.jar}" todir="${test.libDir}"/>