From 2c78ceb1faaad9c9e57ad7c815ceea82f9ff15a1 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Tue, 31 Oct 2006 14:49:04 +0000
Subject: Additions to build system to cause junit to produce a report

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@469504 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/etc/config.xml        |  1 +
 java/broker/test/build-module.xml | 41 ++++++++++++++++++++++----------------
 java/build.xml                    |  4 ++--
 java/client/test/build-module.xml | 42 +++++++++++++++++++++++----------------
 java/module.xml                   |  8 ++++++--
 5 files changed, 58 insertions(+), 38 deletions(-)

(limited to 'java')

diff --git a/java/broker/etc/config.xml b/java/broker/etc/config.xml
index 0e4c450047..cdd15fb789 100644
--- a/java/broker/etc/config.xml
+++ b/java/broker/etc/config.xml
@@ -23,6 +23,7 @@
     <connector>
         <ssl>false</ssl>
         <nonssl>true</nonssl>
+        <qpidnio>true</qpidnio>
         <transport>nio</transport>
         <port>5672</port>
         <sslport>8672</sslport>
diff --git a/java/broker/test/build-module.xml b/java/broker/test/build-module.xml
index 8c971b9a26..9bdf4cbf4a 100644
--- a/java/broker/test/build-module.xml
+++ b/java/broker/test/build-module.xml
@@ -16,25 +16,32 @@
  -
  -->
 <project name="Broker Tests" default="build">
-  <property name="module.depends" value="broker common"/>
-  <property name="module.dist" value="false"/>
+    <property name="module.depends" value="broker common"/>
+    <property name="module.dist" value="false"/>
 
-  <import file="../../module.xml"/>
+    <import file="../../module.xml"/>
 
-  <target name="test" depends="build">
-    <junit fork="yes" showoutput="true" haltonfailure="yes">
-      <test name="org.apache.qpid.server.UnitTests"/>
-      <formatter type="plain"/>
-      <classpath refid="module.class.path"/>
-    </junit>
-  </target>
+    <target name="test" depends="build">
+        <junit fork="yes" showoutput="true" haltonfailure="yes">
+            <test name="org.apache.qpid.server.UnitTests"/>
+            <formatter type="plain"/>
+            <classpath refid="module.class.path"/>
+        </junit>
+    </target>
 
-     <target name="xmltest" depends="build">
-    <junit fork="yes" showoutput="true" haltonfailure="no">
-      <test name="org.apache.qpid.server.UnitTests"/>
-      <formatter type="xml" usefile="junit.report.xml"/>
-      <classpath refid="module.class.path"/>
-    </junit>
-  </target>
+    <target name="testreport" depends="build">
+        <junit fork="yes" printsummary="yes" haltonfailure="no">
+            <test name="org.apache.qpid.server.UnitTests" fork="yes" todir="${module.test.reports}"/>
+            <formatter type="xml" />
+            <classpath refid="module.class.path" />
+        </junit>
+
+        <junitreport todir="${module.test.reports}">
+            <fileset dir="${module.test.reports}">
+                <include name="TEST-*.xml"/>
+            </fileset>
+            <report todir="${module.test.reports}"/>
+        </junitreport>
+    </target>
 
 </project>
diff --git a/java/build.xml b/java/build.xml
index 7142f7f308..c2e897e006 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -45,8 +45,8 @@
     <iterate target="test"/>
   </target>
 
-  <target name="xmltest" description="execute unit tests and produce xml reports">
-    <iterate target="xmltest"/>
+  <target name="testreport" description="execute unit tests and produce reports">
+    <iterate target="testreport"/>
   </target>    
 
   <target name="doc" description="produce javadoc for each module">
diff --git a/java/client/test/build-module.xml b/java/client/test/build-module.xml
index 8678338359..20206641bd 100644
--- a/java/client/test/build-module.xml
+++ b/java/client/test/build-module.xml
@@ -16,25 +16,33 @@
  -
  -->
 <project name="Client Tests" default="build">
-  <property name="module.depends" value="client broker broker/test common"/>
-  <property name="module.dist" value="true"/>
+    <property name="module.depends" value="client broker broker/test common"/>
+    <property name="module.dist" value="true"/>
 
-  <import file="../../module.xml"/>
+    <import file="../../module.xml"/>
 
-  <target name="test" depends="build">
-    <junit fork="yes" showoutput="true" haltonfailure="yes">
-      <test name="org.apache.qpid.client.AllClientUnitTests"/>
-      <formatter type="plain"/>
-      <classpath refid="module.class.path"/>
-    </junit>
-  </target>
+    <target name="test" depends="build">
+        <junit fork="yes" showoutput="true" haltonfailure="yes">
+            <test name="org.apache.qpid.client.AllClientUnitTests"/>
+            <formatter type="plain"/>
+            <classpath refid="module.class.path"/>
+        </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}"/>
+            <formatter type="xml" />
+            <classpath refid="module.class.path" />
+        </junit>
+
+        <junitreport todir="${module.test.reports}">
+            <fileset dir="${module.test.reports}">
+                <include name="TEST-*.xml"/>
+            </fileset>
+            <report todir="${module.test.reports}"/>
+        </junitreport>
+    </target>
 
-  <target name="xmltest" depends="build">
-      <junit fork="yes" showoutput="true" haltonfailure="no">
-          <test name="org.apache.qpid.client.AllClientUnitTests"/>
-          <formatter type="xml" usefile="junit.report.xml"/>
-          <classpath refid="module.class.path"/>
-      </junit>
-  </target>
 
 </project>
diff --git a/java/module.xml b/java/module.xml
index af48d66ddf..924e846bc7 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -20,7 +20,7 @@
   <import file="common.xml"/>
 
 
-  <map property="module" value="${basedir}">      
+  <map property="module" value="${basedir}">
     <globmapper from="${project.root}${file.separator}*" to="*"/>
   </map>
 
@@ -34,6 +34,7 @@
     </filtermapper>
   </map>
 
+
   <property name="module.jar" location="${module.dir}/${module.name}.jar"/>
   <property name="module.launcher"
             location="${module.dir}/${module.name}${launcher.sfx}"/>
@@ -92,6 +93,8 @@
   <property name="module.manifest.classpath"
             value="${module.name}.jar ${module.manifest.jars} ${module.manifest.deps}"/>
 
+ <property name="module.test.reports" value="${module.dir}/reports/junit" />
+
   <target name="debug">
     <echo message="basedir = ${basedir}"/>
     <echo message = "project.root = ${project.root}"/>
@@ -122,6 +125,7 @@
     <mkdir dir="${module.classes}"/>
     <mkdir dir="${module.precompiled}"/>
     <mkdir dir="${module.doc}"/>
+    <mkdir dir="${module.test.reports}"/>
   </target>
 
   <target name="precompile"/>
@@ -167,7 +171,7 @@
 
   <target name="test"/>
 
-  <target name="xmltest"/>
+  <target name="testreport"/>
 
   <uptodate property="doc.done" targetfile="${module.doc}/index.html">
     <srcfiles dir="${module.src}" includes="**/*.java"/>
-- 
cgit v1.2.1