From c97b18303a2acef85c8443900167037d024512ec Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Wed, 8 Nov 2006 12:13:39 +0000
Subject: Updated to work with new test classes. Will run all *Test.java files
 (But not *UnitTest.java) in the test/unit package

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@472461 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/client/test/build-module.xml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'qpid/java/client/test/build-module.xml')

diff --git a/qpid/java/client/test/build-module.xml b/qpid/java/client/test/build-module.xml
index 20206641bd..043842505d 100644
--- a/qpid/java/client/test/build-module.xml
+++ b/qpid/java/client/test/build-module.xml
@@ -22,18 +22,34 @@
     <import file="../../module.xml"/>
 
     <target name="test" depends="build">
-        <junit fork="yes" showoutput="true" haltonfailure="yes">
-            <test name="org.apache.qpid.client.AllClientUnitTests"/>
+        <echo>Client Tests</echo>
+        <junit fork="yes" printsummary="yes" showoutput="true" haltonfailure="yes" timeout="30000">
+            <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/>
             <formatter type="plain"/>
             <classpath refid="module.class.path"/>
+
+            <batchtest fork="yes" todir="${module.test.reports}">
+               <fileset dir="${module.src}">
+                 <include name="**/test/unit/**/*Test.java"/>                 
+                 <exclude name="**/test/unit/**/*UnitTests.java"/>
+               </fileset>
+             </batchtest>            
         </junit>
     </target>
 
     <target name="testreport" depends="build">
-        <junit fork="yes" printsummary="yes" haltonfailure="no">
-            <test name="org.apache.qpid.client.AllClientUnitTests" fork="yes" todir="${module.test.reports}"/>
+        <echo>Client Tests with Report</echo>
+        <junit fork="yes" printsummary="yes" haltonfailure="no" timeout="30000">
+            <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/>
             <formatter type="xml" />
             <classpath refid="module.class.path" />
+
+             <batchtest fork="yes" todir="${module.test.reports}">
+               <fileset dir="${module.src}">
+                 <include name="**/test/unit/**/*Test.java"/>
+                 <exclude name="**/test/unit/**/*UnitTests.java"/>
+               </fileset>
+             </batchtest>
         </junit>
 
         <junitreport todir="${module.test.reports}">
-- 
cgit v1.2.1