[jboss-cvs] JBossAS SVN: r100418 - in projects/kernel/branches/resolver: jmx-aop-mc-int and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 4 10:12:31 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-02-04 10:12:30 -0500 (Thu, 04 Feb 2010)
New Revision: 100418
Modified:
projects/kernel/branches/resolver/guice-int/pom.xml
projects/kernel/branches/resolver/jmx-aop-mc-int/pom.xml
projects/kernel/branches/resolver/jmx-aop-mc-int/src/test/resources/build.xml
projects/kernel/branches/resolver/jmx-mc-int/pom.xml
projects/kernel/branches/resolver/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java
projects/kernel/branches/resolver/kernel/pom.xml
projects/kernel/branches/resolver/kernel/src/test/resources/build.xml
projects/kernel/branches/resolver/spring-int/pom.xml
projects/kernel/branches/resolver/weld-int/pom.xml
Log:
Make all tests apart from aop-mc-int run with both dependency resolvers. Adjust NewOnDemandDependencyTest
Modified: projects/kernel/branches/resolver/guice-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/guice-int/pom.xml 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/guice-int/pom.xml 2010-02-04 15:12:30 UTC (rev 100418)
@@ -10,6 +10,48 @@
<name>JBoss Microcontainer Guice Int</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Guice Int</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- the tessuite will be run twice.
+ the first/default execution will run with the standard dependency resolver
+ if there are failures, the next execution won't be run -->
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>STANDARD</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <!-- this execution will run with the indexing dependency resolver
+ the reports from the previous testsuite run will be overriden
+ which is ok, since if the previous execution fails, this execution shouldn't start -->
+ <id>indexing-resolver-tests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>INDEXING</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<!-- Do not add version information here, use ../pom.xml instead -->
<dependencies>
Modified: projects/kernel/branches/resolver/jmx-aop-mc-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/pom.xml 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/pom.xml 2010-02-04 15:12:30 UTC (rev 100418)
@@ -13,15 +13,48 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <excludes>
- <exclude>org/jboss/test/system/controller/integration/asynchronous/test/**</exclude>
- </excludes>
+ <!-- the tessuite will be run twice.
+ the first/default execution will run with the standard dependency resolver
+ if there are failures, the next execution won't be run -->
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>org/jboss/test/system/controller/integration/asynchronous/test/**</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>STANDARD</value>
+ </property>
+ </systemProperties>
</configuration>
- </plugin>
+ <executions>
+ <execution>
+ <!-- this execution will run with the indexing dependency resolver
+ the reports from the previous testsuite run will be overriden
+ which is ok, since if the previous execution fails, this execution shouldn't start -->
+ <id>indexing-resolver-tests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>org/jboss/test/system/controller/integration/asynchronous/test/**</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>INDEXING</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Modified: projects/kernel/branches/resolver/jmx-aop-mc-int/src/test/resources/build.xml
===================================================================
--- projects/kernel/branches/resolver/jmx-aop-mc-int/src/test/resources/build.xml 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/jmx-aop-mc-int/src/test/resources/build.xml 2010-02-04 15:12:30 UTC (rev 100418)
@@ -8,7 +8,20 @@
</antcall>
</target>
- <target name="run-asynchronous-test">
+ <target name="run-asynchronous-test">
+ <antcall target="run_asynchronous-test_with-resolver" inheritrefs="true">
+ <param name="test" value="${test}"/>
+ <param name="resolver" value="standard"/>
+ </antcall>
+ <antcall target="run_asynchronous-test_with-resolver" inheritrefs="true">
+ <param name="test" value="${test}"/>
+ <param name="resolver" value="indexing"/>
+ </antcall>
+ </target>
+
+ <target name="run_asynchronous-test_with-resolver">
+ <fail unless="resolver" message="Property 'resolver' was not set"/>
+
<property name="bytemanScript" value="${testOutputDirectory}/org/jboss/test/system/controller/integration/asynchronous/test/${test}.txt"/>
<junit printsummary="yes" fork="true" haltonfailure="true" haltonerror="true">
@@ -16,10 +29,17 @@
<path refid="maven.test.classpath"/>
</classpath>
<jvmarg value="-javaagent:${byteman.path}=script:${bytemanScript}"/>
+ <!-- uncomment to enable debug
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
+ -->
<sysproperty key="org.jboss.byteman.debug" value="true"/>
- <formatter type="plain" usefile="true" extension=".txt" />
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
+ <sysproperty key="jboss.mc.dependency.resolver" value="${resolver}"/>
+ <!--sysproperty key="org.jboss.byteman.verbose" value="true"/-->
+ <formatter type="plain" usefile="true" extension="-${resolver}.txt" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension="-${resolver}.xml" />
<test fork="yes" name="org.jboss.test.system.controller.integration.asynchronous.test.${test}" todir="${report.dir}"/>
</junit>
- </target>
-</project>
\ No newline at end of file
+ </target></project>
\ No newline at end of file
Modified: projects/kernel/branches/resolver/jmx-mc-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/pom.xml 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/jmx-mc-int/pom.xml 2010-02-04 15:12:30 UTC (rev 100418)
@@ -24,12 +24,42 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!--configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration-->
- </plugin>
+ <configuration>
+ <!-- the tessuite will be run twice.
+ the first/default execution will run with the standard dependency resolver
+ if there are failures, the next execution won't be run -->
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>STANDARD</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <!-- this execution will run with the indexing dependency resolver
+ the reports from the previous testsuite run will be overriden
+ which is ok, since if the previous execution fails, this execution shouldn't start -->
+ <id>indexing-resolver-tests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>INDEXING</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: projects/kernel/branches/resolver/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java
===================================================================
--- projects/kernel/branches/resolver/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/jmx-mc-int/src/test/java/org/jboss/test/system/controller/lifecycle/seperated/test/NewOnDemandDependencyTest.java 2010-02-04 15:12:30 UTC (rev 100418)
@@ -302,14 +302,18 @@
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
assertEquals("()", test1.constructorUsed);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ int create1 = test1.createOrder;
+ assertEquals(1, create1);
+ int start1 = test1.startOrder;
+ assertTrue(test1.createOrder < start1);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
test2 = getMBean(Simple.class, NAME_TWO, "Instance");
assertEquals("()", test2.constructorUsed);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ int create2 = test2.createOrder;
+ assertTrue(create1 < create2);
+ int start2 = test2.startOrder;
+ assertTrue(test2.createOrder < start2);
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
test3 = getMBean(Simple.class, NAME_THREE, "Instance");
@@ -325,14 +329,14 @@
assertServiceDestroyed(NAME_TWO);
assertServiceDestroyed(NAME_THREE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(9, test1.stopOrder);
assertEquals(12, test1.destroyOrder);
assertDoubleEquals(7, 8, test2.stopOrder, test3.stopOrder);
assertDoubleEquals(10, 11, test2.destroyOrder, test3.destroyOrder);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(5, test3.createOrder);
assertEquals(6, test3.startOrder);
@@ -438,7 +442,12 @@
Simple test3 = null;
boolean error = false;
-
+
+ int create1 = 0;
+ int start1 = 0;
+ int create2 = 0;
+ int start2 = 0;
+
List<ObjectName> mbeans1 = deploy(resourceName1);
List<ObjectName> mbeans3 = null;
try
@@ -453,14 +462,18 @@
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
assertEquals("()", test1.constructorUsed);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ create1 = test1.createOrder;
+ assertEquals(1, create1);
+ start1 = test1.startOrder;
+ assertTrue(create1 < start1);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
test2 = getMBean(Simple.class, NAME_TWO, "Instance");
assertEquals("()", test2.constructorUsed);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ create2 = test2.createOrder;
+ assertTrue(create1 < create2);
+ start2 = test2.startOrder;
+ assertTrue(create2 < start2);
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
test3 = getMBean(Simple.class, NAME_THREE, "Instance");
@@ -476,12 +489,12 @@
assertNoService(NAME_TWO);
assertServiceRunning(NAME_THREE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(7, test2.stopOrder);
assertEquals(8, test2.destroyOrder);
assertEquals(5, test3.createOrder);
@@ -495,8 +508,8 @@
assertServiceRunning(NAME_TWO);
assertServiceRunning(NAME_THREE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
test2 = getMBean(Simple.class, NAME_TWO, "Instance");
@@ -527,8 +540,8 @@
if (error == false)
{
assertServiceRunning(NAME_ONE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
assertNoService(NAME_TWO);
@@ -558,8 +571,8 @@
{
assertNoService(NAME_ONE);
assertNotRegistered(NAME_ONE);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(14, test1.stopOrder);
assertEquals(16, test1.destroyOrder);
assertNoService(NAME_TWO);
@@ -591,6 +604,11 @@
boolean error = false;
+ int create1 = 0;
+ int start1 = 0;
+ int create2 = 0;
+ int start2 = 0;
+
List<ObjectName> mbeans1 = deploy(resourceName1);
try
{
@@ -602,13 +620,18 @@
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
assertEquals("()", test1.constructorUsed);
+ create1 = test1.createOrder;
assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ start1 = test1.startOrder;
+ assertTrue(create1 < start1);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
test2 = getMBean(Simple.class, NAME_TWO, "Instance");
assertEquals("()", test2.constructorUsed);
- assertEquals(2, test2.createOrder);
+ create2 = test2.createOrder;
+ assertTrue(create1 < create2);
+ start2 = test2.startOrder;
+ assertTrue(create2 < start2);
assertEquals(4, test2.startOrder);
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
@@ -618,12 +641,12 @@
assertServiceDestroyed(NAME_ONE);
assertNoService(NAME_TWO);
- assertEquals(1, test1.createOrder);
- assertEquals(3, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(6, test1.stopOrder);
assertEquals(8, test1.destroyOrder);
- assertEquals(2, test2.createOrder);
- assertEquals(4, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(5, test2.stopOrder);
assertEquals(7, test2.destroyOrder);
@@ -633,14 +656,18 @@
assertServiceRunning(NAME_TWO);
test1 = getMBean(Simple.class, NAME_ONE, "Instance");
- assertEquals(9, test1.createOrder);
- assertEquals(10, test1.startOrder);
+ create1 = test1.createOrder;
+ assertEquals(9, create1);
+ start1 = test1.startOrder;
+ assertTrue(create1 < start1);
assertEquals(0, test1.stopOrder);
assertEquals(0, test1.destroyOrder);
test2 = getMBean(Simple.class, NAME_TWO, "Instance");
assertEquals("()", test1.constructorUsed);
- assertEquals(11, test2.createOrder);
- assertEquals(12, test2.startOrder);
+ create2 = test2.createOrder;
+ assertTrue(create1 < create2);
+ start2 = test2.startOrder;
+ assertTrue(create2 < start2);
assertEquals(0, test2.stopOrder);
assertEquals(0, test2.destroyOrder);
}
@@ -661,14 +688,14 @@
if (error == false)
{
assertServiceDestroyed(NAME_ONE);
- assertEquals(9, test1.createOrder);
- assertEquals(10, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(14, test1.stopOrder);
assertEquals(16, test1.destroyOrder);
assertNoService(NAME_TWO);
assertNotRegistered(NAME_TWO);
- assertEquals(11, test2.createOrder);
- assertEquals(12, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(13, test2.stopOrder);
assertEquals(15, test2.destroyOrder);
}
@@ -692,16 +719,16 @@
{
assertNoService(NAME_ONE);
assertNotRegistered(NAME_ONE);
- assertEquals(9, test1.createOrder);
- assertEquals(10, test1.startOrder);
+ assertEquals(create1, test1.createOrder);
+ assertEquals(start1, test1.startOrder);
assertEquals(14, test1.stopOrder);
assertEquals(16, test1.destroyOrder);
assertNoService(NAME_TWO);
assertNotRegistered(NAME_TWO);
if (test2 != null)
{
- assertEquals(11, test2.createOrder);
- assertEquals(12, test2.startOrder);
+ assertEquals(create2, test2.createOrder);
+ assertEquals(start2, test2.startOrder);
assertEquals(13, test2.stopOrder);
assertEquals(15, test2.destroyOrder);
}
Modified: projects/kernel/branches/resolver/kernel/pom.xml
===================================================================
--- projects/kernel/branches/resolver/kernel/pom.xml 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/kernel/pom.xml 2010-02-04 15:12:30 UTC (rev 100418)
@@ -24,17 +24,50 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!--skip>true</skip-->
- <!--testFailureIgnore>true</testFailureIgnore-->
- <excludes>
- <exclude>org/jboss/test/kernel/asynchronous/test/**</exclude>
- <exclude>org/jboss/test/kernel/qualifiers/test/**</exclude>
- </excludes>
+ <!-- the tessuite will be run twice.
+ the first/default execution will run with the standard dependency resolver
+ if there are failures, the next execution won't be run -->
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>org/jboss/test/kernel/asynchronous/test/**</exclude>
+ <exclude>org/jboss/test/kernel/qualifiers/test/**</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>STANDARD</value>
+ </property>
+ </systemProperties>
</configuration>
- </plugin>
+ <executions>
+ <execution>
+ <!-- this execution will run with the indexing dependency resolver
+ the reports from the previous testsuite run will be overriden
+ which is ok, since if the previous execution fails, this execution shouldn't start -->
+ <id>indexing-resolver-tests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>org/jboss/test/kernel/asynchronous/test/**</exclude>
+ <exclude>org/jboss/test/kernel/qualifiers/test/**</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>INDEXING</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
Modified: projects/kernel/branches/resolver/kernel/src/test/resources/build.xml
===================================================================
--- projects/kernel/branches/resolver/kernel/src/test/resources/build.xml 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/kernel/src/test/resources/build.xml 2010-02-04 15:12:30 UTC (rev 100418)
@@ -30,7 +30,20 @@
</target>
<target name="run-asynchronous-test">
- <property name="bytemanScript" value="${testOutputDirectory}/org/jboss/test/kernel/asynchronous/test/${test}.txt"/>
+ <antcall target="run_asynchronous-test_with-resolver" inheritrefs="true">
+ <param name="test" value="${test}"/>
+ <param name="resolver" value="standard"/>
+ </antcall>
+ <antcall target="run_asynchronous-test_with-resolver" inheritrefs="true">
+ <param name="test" value="${test}"/>
+ <param name="resolver" value="indexing"/>
+ </antcall>
+ </target>
+
+ <target name="run_asynchronous-test_with-resolver">
+ <fail unless="resolver" message="Property 'resolver' was not set"/>
+
+ <property name="bytemanScript" value="${testOutputDirectory}/org/jboss/test/kernel/asynchronous/test/${test}.txt"/>
<junit printsummary="yes" fork="true" haltonfailure="true" haltonerror="true">
<classpath>
@@ -44,10 +57,11 @@
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
-->
<sysproperty key="org.jboss.byteman.debug" value="true"/>
+ <sysproperty key="jboss.mc.dependency.resolver" value="${resolver}"/>
<!--sysproperty key="org.jboss.byteman.verbose" value="true"/-->
- <formatter type="plain" usefile="true" extension=".txt" />
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
+ <formatter type="plain" usefile="true" extension="-${resolver}.txt" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension="-${resolver}.xml" />
<test fork="yes" name="org.jboss.test.kernel.asynchronous.test.${test}" todir="${report.dir}"/>
</junit>
- </target>
+ </target>
</project>
\ No newline at end of file
Modified: projects/kernel/branches/resolver/spring-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/spring-int/pom.xml 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/spring-int/pom.xml 2010-02-04 15:12:30 UTC (rev 100418)
@@ -11,6 +11,48 @@
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Microcontainer Spring Integration</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- the tessuite will be run twice.
+ the first/default execution will run with the standard dependency resolver
+ if there are failures, the next execution won't be run -->
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>STANDARD</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <!-- this execution will run with the indexing dependency resolver
+ the reports from the previous testsuite run will be overriden
+ which is ok, since if the previous execution fails, this execution shouldn't start -->
+ <id>indexing-resolver-tests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>INDEXING</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- Do not add version information here, use ../pom.xml instead -->
<dependencies>
<!-- Global dependencies -->
Modified: projects/kernel/branches/resolver/weld-int/pom.xml
===================================================================
--- projects/kernel/branches/resolver/weld-int/pom.xml 2010-02-04 14:41:34 UTC (rev 100417)
+++ projects/kernel/branches/resolver/weld-int/pom.xml 2010-02-04 15:12:30 UTC (rev 100418)
@@ -13,16 +13,48 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!--skip>true</skip-->
- <!--testFailureIgnore>true</testFailureIgnore-->
- <excludes>
- <exclude>org/jboss/test/kernel/weld/beanwrapper/test/BeanImplementationTestCase.java</exclude>
- </excludes>
+ <!-- the tessuite will be run twice.
+ the first/default execution will run with the standard dependency resolver
+ if there are failures, the next execution won't be run -->
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>org/jboss/test/kernel/weld/beanwrapper/test/BeanImplementationTestCase.java</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>STANDARD</value>
+ </property>
+ </systemProperties>
</configuration>
- </plugin>
+ <executions>
+ <execution>
+ <!-- this execution will run with the indexing dependency resolver
+ the reports from the previous testsuite run will be overriden
+ which is ok, since if the previous execution fails, this execution shouldn't start -->
+ <id>indexing-resolver-tests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <excludes>
+ <exclude>org/jboss/test/kernel/weld/beanwrapper/test/BeanImplementationTestCase.java</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>jboss.mc.dependency.resolver</name>
+ <value>INDEXING</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<!-- Do not add version information here, use ../pom.xml instead -->
More information about the jboss-cvs-commits
mailing list