Author: ritchiem
Date: Tue Oct 31 06:49:04 2006
New Revision: 469504
URL: http://svn.apache.org/viewvc?view=rev&rev=469504
Log:
Additions to build system to cause junit to produce a report
Modified:
incubator/qpid/trunk/qpid/java/broker/etc/config.xml
incubator/qpid/trunk/qpid/java/broker/test/build-module.xml
incubator/qpid/trunk/qpid/java/build.xml
incubator/qpid/trunk/qpid/java/client/test/build-module.xml
incubator/qpid/trunk/qpid/java/module.xml
Modified: incubator/qpid/trunk/qpid/java/broker/etc/config.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/etc/config.xml?view=diff&rev=469504&r1=469503&r2=469504
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/etc/config.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/etc/config.xml Tue Oct 31 06:49:04
2006
@@ -23,6 +23,7 @@
<connector>
<ssl>false</ssl>
<nonssl>true</nonssl>
+ <qpidnio>true</qpidnio>
<transport>nio</transport>
<port>5672</port>
<sslport>8672</sslport>
Modified: incubator/qpid/trunk/qpid/java/broker/test/build-module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/test/build-module.xml?view=diff&rev=469504&r1=469503&r2=469504
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/test/build-module.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/test/build-module.xml Tue Oct 31
06:49:04 2006
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?view=diff&rev=469504&r1=469503&r2=469504
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Tue Oct 31 06:49:04 2006
@@ -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">
Modified: incubator/qpid/trunk/qpid/java/client/test/build-module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/build-module.xml?view=diff&rev=469504&r1=469503&r2=469504
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/test/build-module.xml (original)
+++ incubator/qpid/trunk/qpid/java/client/test/build-module.xml Tue Oct 31
06:49:04 2006
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?view=diff&rev=469504&r1=469503&r2=469504
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Tue Oct 31 06:49:04 2006
@@ -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"/>
