[jboss-cvs] JBossAS SVN: r61765 - branches/Branch_4_2/testsuite.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 27 18:50:47 EDT 2007
Author: jaroslaw.kijanowski
Date: 2007-03-27 18:50:47 -0400 (Tue, 27 Mar 2007)
New Revision: 61765
Modified:
branches/Branch_4_2/testsuite/build.xml
Log:
JBAS-4103 testsuite testcases' reports overwritten - all targets create unique testnames
Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml 2007-03-27 22:43:09 UTC (rev 61764)
+++ branches/Branch_4_2/testsuite/build.xml 2007-03-27 22:50:47 UTC (rev 61765)
@@ -1233,7 +1233,7 @@
</patternset>
</create-config>
<server:start name="tomcat-sso"/>
- <run-junit junit.patternset="tc-sso.includes" junit.configuration="tomcat-sso"/>
+ <run-junit junit.patternset="tc-sso.includes" junit.configuration="tomcat-sso-tests"/>
<server:stop name="tomcat-sso"/>
</target>
@@ -1251,7 +1251,7 @@
<antcall target="tests-clustering-unit">
<param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
- <param name="jboss-junit-configuration" value="tomcat-sso-cluster"/>
+ <param name="jboss-junit-configuration" value="tomcat-sso-clustered-tests"/>
</antcall>
<server:stop name="tomcat-sso-cluster0"/>
@@ -1271,7 +1271,7 @@
</create-config>
<server:start name="tomcat-webctx"/>
- <run-junit junit.patternset="tomcat.webctx.includes" junit.configuration="tomcat-webctx"/>
+ <run-junit junit.patternset="tomcat.webctx.includes" junit.configuration="tomcat-webctx-tests"/>
<server:stop name="tomcat-webctx"/>
</target>
@@ -1297,7 +1297,7 @@
todir="${jboss.dist}/server/tomcat-federation/deploy/jboss-web.deployer/META-INF"/>
<copy file="${build.lib}/header-auth.jar" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deploy/jboss-web.deployer"/>
<server:start name="tomcat-federation"/>
- <run-junit junit.patternset="tc-federation.includes" junit.configuration="tomcat-federation"/>
+ <run-junit junit.patternset="tc-federation.includes" junit.configuration="tomcat-federation-tests"/>
<server:stop name="tomcat-federation"/>
</target>
@@ -1307,7 +1307,7 @@
<server:start name="binding-manager1"/>
<server:start name="binding-manager2"/>
- <run-junit junit.patternset="binding-manager.includes" junit.configuration="binding-manager"/>
+ <run-junit junit.patternset="binding-manager.includes" junit.configuration="test-example-binding-manager"/>
<server:stop name="binding-manager1"/>
<server:stop name="binding-manager2"/>
@@ -1425,8 +1425,8 @@
</classpath>
<!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
- <sysproperty key="jboss-junit-configuration" value="stress"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-stress.xml"/>
+ <sysproperty key="jboss-junit-configuration" value="tests-standard-stress"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-standard-stress.xml"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -1517,8 +1517,11 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-ha-unit"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-ha-unit.xml"/>
+
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
@@ -1561,8 +1564,11 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-client-unit"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-client-unit.xml"/>
+
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
@@ -1587,7 +1593,7 @@
<propertyref prefix="java.security.auth"/>
</propertyset>
- <run-junit junit.patternset="security.includes" junit.configuration="security-basic" junit.syspropertyset="security-tests-props"/>
+ <run-junit junit.patternset="security.includes" junit.configuration="tests-security-basic-unit" junit.syspropertyset="security-tests-props"/>
</target>
<!-- Tests of Java2 permissions. The JBoss server must be running with
@@ -1609,7 +1615,7 @@
<exclude name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class"/>
<patternset refid="securitymgr.includes"/>
</patternset>
- <run-junit junit.patternset="test.includes" junit.syspropertyset="tests-security-manager-props"/>
+ <run-junit junit.patternset="test.includes" junit.syspropertyset="tests-security-manager-props" junit.configuration="tests-security-manager"/>
<echo>Waiting for server to shutdown...</echo>
<server:stop name="securitymgr"/>
@@ -1664,7 +1670,7 @@
<antcall target="tests-security-basic-unit">
<param name="run-junit-config" value="custom-securitymgr"/>
</antcall> -->
- <run-junit junit.patternset="custom-secmgr.includes" junit.configuration="custom-secmgr" junit.syspropertyset="jacc-tests-props"/>
+ <run-junit junit.patternset="custom-secmgr.includes" junit.configuration="tests-custom-securitymgr" junit.syspropertyset="jacc-tests-props"/>
<server:stop name="custom-securitymgr"/>
</target>
@@ -1751,8 +1757,11 @@
<path refid="jboss.varia.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-compatibility"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-compatibility.xml"/>
+
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
@@ -1785,8 +1794,11 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-treecacheaop-unit"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-treecacheaop-unit.xml"/>
+
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
@@ -1834,7 +1846,9 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-treecacheaopc-unit"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-treecacheaopc-unit.xml"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -1866,7 +1880,9 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-baseaop-unit"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-baseaop-unit.xml"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -1908,7 +1924,9 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-foe-deployer-unit"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-foe-deployer-unit.xml"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -1938,8 +1956,11 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-jbossmx-implementation"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-jbossmx-implementation.xml"/>
+
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
@@ -1971,8 +1992,11 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-jbossmx-performance"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-jbossmx-performance.xml"/>
+
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
@@ -2003,8 +2027,11 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-jbossmx-compliance"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-jbossmx-compliance.xml"/>
+
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
@@ -2054,7 +2081,9 @@
<path refid="jboss.iiop.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-iiop"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-iiop.xml"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -2089,7 +2118,9 @@
<path refid="apache.jaxme.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-xml-unit"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-xml-unit.xml"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -2133,7 +2164,10 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-deployment"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-deployment.xml"/>
+
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -2183,8 +2217,8 @@
</classpath>
<!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
- <sysproperty key="jboss-junit-configuration" value="webservice"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-webservice.xml"/>
+ <sysproperty key="jboss-junit-configuration" value="tests-webservice"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-webservice.xml"/>
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -2222,7 +2256,7 @@
<propertyref prefix="org.jboss.security"/>
<propertyref name="rootDir"/>
</propertyset>
- <run-junit junit.patternset="webservice-ssl.includes" junit.syspropertyset="tests-webservice-ssl-props" junit.configuration="webservice-ssl"/>
+ <run-junit junit.patternset="webservice-ssl.includes" junit.syspropertyset="tests-webservice-ssl-props" junit.configuration="tests-webservice-ssl"/>
<run-junit junit.patternset="webservice-ssl.noenv.includes" junit.syspropertyset="tests-webservice-ssl-noenv-props" junit.configuration="webservice-ssl"/>
<server:stop name="webservice-ssl"/>
</target>
@@ -2271,7 +2305,7 @@
<target name="run-tests-aop-scoped"
description="AOP tests requiring a native classloader hook">
- <run-junit junit.patternset="aop-with-classloader.includes" junit.configuration="aop-scoped"/>
+ <run-junit junit.patternset="aop-with-classloader.includes" junit.configuration="tests-aop-scoped"/>
</target>
<!--
@@ -2316,7 +2350,10 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-scout-jaxr"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-scout-jaxr.xml"/>
+
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -2356,7 +2393,9 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-txtimer"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-txtimer.xml"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
@@ -2391,7 +2430,9 @@
<path refid="tests.classpath"/>
</classpath>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
+ <sysproperty key="jboss-junit-configuration" value="tests-db"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-db.xml"/>
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
More information about the jboss-cvs-commits
mailing list