Author: krosenvold
Date: Sun Mar 13 13:39:52 2011
New Revision: 1081113
URL: http://svn.apache.org/viewvc?rev=1081113&view=rev
Log:
o Changed build to use shaded provider itroduced in SUREFIRE-700.
>From now on we have isolation. Note that I had to change
the integration tests to run with the *current* version
of surefire. This is because the integration test module
uses the 'install' feature of the maven-invoker-plugin,
which requires that the necessary artifacts are on the project
classpath, including the providers. Unfortunately, the
shaded provider does not like the presence of the other
providers. This problem can/should be fixed by extracting
the maven-invoker-plugin into a separate module, so we can
avoid the weird dependencies creeping into the IT-runner.
Given the level of weirdness any surefire developer
has had to cope with, this should be peanuts. Will
fix real soon, anyway ;)
Added:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
(contents, props changed)
- copied, changed from r1080465,
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTestCase.java
Removed:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTestCase.java
Modified:
maven/surefire/trunk/maven-failsafe-plugin/pom.xml
maven/surefire/trunk/maven-surefire-common/pom.xml
maven/surefire/trunk/maven-surefire-plugin/pom.xml
maven/surefire/trunk/pom.xml
maven/surefire/trunk/surefire-api/pom.xml
maven/surefire/trunk/surefire-booter/pom.xml
maven/surefire/trunk/surefire-integration-tests/pom.xml
maven/surefire/trunk/surefire-providers/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Sun Mar 13 13:39:52 2011
@@ -178,6 +178,16 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${project.artifactId}-${project.version}</stagingSiteURL>
Modified: maven/surefire/trunk/maven-surefire-common/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-common/pom.xml Sun Mar 13 13:39:52 2011
@@ -92,6 +92,16 @@
<target>1.4</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Sun Mar 13 13:39:52 2011
@@ -190,6 +190,16 @@
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${project.artifactId}-${project.version}</stagingSiteURL>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
Modified: maven/surefire/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Sun Mar 13 13:39:52 2011
@@ -110,7 +110,7 @@
<properties>
<mavenVersion>2.0.9</mavenVersion>
- <shadedVersion>2.7.2</shadedVersion>
+ <shadedVersion>2.8</shadedVersion>
</properties>
<dependencyManagement>
Modified: maven/surefire/trunk/surefire-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/pom.xml (original)
+++ maven/surefire/trunk/surefire-api/pom.xml Sun Mar 13 13:39:52 2011
@@ -17,7 +17,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -36,10 +37,19 @@
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Sun Mar 13 13:39:52 2011
@@ -40,6 +40,16 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Sun Mar 13 13:39:52
2011
@@ -18,7 +18,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -105,7 +106,8 @@
<profiles>
<profile>
- <id>parallel</id> <!-- Experimental profile to try out parallel
building of surefire itself -->
+ <id>parallel</id>
+ <!-- Experimental profile to try out parallel building of surefire
itself -->
<build>
<pluginManagement>
<plugins>
@@ -131,7 +133,8 @@
</dependency>
</dependencies>
<properties>
- <surefire.build.version>${project.version}</surefire.build.version>
<!-- Until we release 2.7.3 -->
+ <surefire.build.version>${project.version}</surefire.build.version>
+ <!-- Until we release 2.7.3 -->
</properties>
</profile>
@@ -209,7 +212,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.build.version}</version>
+ <version>${project.version}</version>
<configuration>
<!-- Pass current surefire version to the main suite so that it -->
<!-- can forward to all integration test projects. SUREFIRE-513 -->
@@ -270,11 +273,11 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -283,6 +286,6 @@
<it.settings.showPasswords>false</it.settings.showPasswords>
<testng.version>5.7</testng.version>
<surefire.threadcount>2</surefire.threadcount>
- <surefire.build.version>2.7.2</surefire.build.version>
+ <surefire.build.version>2.8</surefire.build.version>
</properties>
</project>
Modified: maven/surefire/trunk/surefire-providers/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Sun Mar 13 13:39:52 2011
@@ -18,7 +18,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -49,5 +50,19 @@
<artifactId>surefire-api</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml Sun Mar 13
13:39:52 2011
@@ -79,6 +79,13 @@
<jvm>${java.home}/bin/java</jvm>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
Sun Mar 13 13:39:52 2011
@@ -51,74 +51,63 @@ import static org.junit.Assert.assertNot
* @author Kristian Rosenvold
*/
-public class ConcurrentReporterManagerTest
+public class ConcurrentReporterManagerTest extends TestCase
{
// Tests are in order of increasing complexity
- @Test
public void testNoErrorsCounting()
throws Exception
{
runClasses( 3, 0, 0, DummyAllOk.class );
}
- @Test
public void testNoErrorsCounting2()
throws Exception
{
runClasses( 2, 0, 0, Dummy3.class );
}
- @Test
public void testOneIgnoreCounting()
throws Exception
{
runClasses( 3, 1, 0, DummyWithOneIgnore.class );
}
- @Test
public void testOneFailureCounting()
throws Exception
{
runClasses( 3, 0, 1, DummyWithFailure.class );
}
- @Test
public void testWithErrorsCountingDemultiplexed()
throws Exception
{
runClasses( 6, 1, 1, DummyWithOneIgnore.class, DummyWithFailure.class
);
}
-
- @Test
public void testJunitResultCountingDemultiplexed()
throws Exception
{
runClasses( 8, 1, 1, DummyWithOneIgnore.class, DummyWithFailure.class,
Dummy3.class );
}
- @Test
public void testJunitResultCountingJUnit3Demultiplexed()
throws Exception
{
runClasses( 3, 0, 0, Junit3Tc1.class, Junit3Tc2.class );
}
- @Test
public void testJunitResultCountingJUnit3OddTest()
throws Exception
{
runClasses( 2, 0, 0, Junit3OddTest1.class );
}
- @Test
public void testJunit3WithNestedSuite()
throws TestSetFailedException
{
runClasses( 4, 0, 0, Junit3WithNestedSuite.class );
}
- @Test
public void testJunit3NestedSuite()
throws Exception
{
@@ -126,7 +115,6 @@ public class ConcurrentReporterManagerTe
}
- @Test
public void testSimpleOutput()
throws Exception
{
@@ -144,7 +132,6 @@ public class ConcurrentReporterManagerTe
System.setOut( orgOur );
}
- @Test
public void testOutputOrdering()
throws Exception
{
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
Sun Mar 13 13:39:52 2011
@@ -19,6 +19,7 @@
package org.apache.maven.surefire.junitcore;
+import junit.framework.TestCase;
import org.junit.Test;
import java.util.Properties;
@@ -29,9 +30,8 @@ import static org.junit.Assert.*;
* @author Kristian Rosenvold, kristian.rosenvold@gmail com
*/
-public class JUnitCoreParametersTest
+public class JUnitCoreParametersTest extends TestCase
{
- @Test
public void testIsParallelMethod()
throws Exception
{
@@ -40,7 +40,6 @@ public class JUnitCoreParametersTest
assertFalse( getTestSetBoth().isParallelMethod() );
}
- @Test
public void testIsParallelClasses()
throws Exception
{
@@ -49,7 +48,6 @@ public class JUnitCoreParametersTest
assertFalse( getTestSetBoth().isParallelClasses() );
}
- @Test
public void testIsParallelBoth()
throws Exception
{
@@ -58,7 +56,6 @@ public class JUnitCoreParametersTest
assertTrue( getTestSetBoth().isParallelBoth() );
}
- @Test
public void testIsPerCoreThreadCount()
throws Exception
{
@@ -67,7 +64,6 @@ public class JUnitCoreParametersTest
assertTrue( getTestSetBoth().isPerCoreThreadCount() );
}
- @Test
public void testGetThreadCount()
throws Exception
{
@@ -76,7 +72,6 @@ public class JUnitCoreParametersTest
assertTrue( getTestSetBoth().isPerCoreThreadCount() );
}
- @Test
public void testIsUseUnlimitedThreads()
throws Exception
{
@@ -85,7 +80,6 @@ public class JUnitCoreParametersTest
assertFalse( getTestSetBoth().isUseUnlimitedThreads() );
}
- @Test
public void testIsNoThreading()
throws Exception
{
@@ -94,7 +88,6 @@ public class JUnitCoreParametersTest
assertFalse( getTestSetBoth().isNoThreading() );
}
- @Test
public void testIsAnyParallelitySelected()
throws Exception
{
@@ -104,7 +97,6 @@ public class JUnitCoreParametersTest
}
- @Test
public void testToString()
throws Exception
{
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java?rev=1081113&r1=1081112&r2=1081113&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
Sun Mar 13 13:39:52 2011
@@ -1,5 +1,6 @@
package org.apache.maven.surefire.junitcore;
+import junit.framework.TestCase;
import org.apache.maven.surefire.report.MulticastingReporter;
import org.junit.Assume;
import org.junit.Test;
@@ -16,9 +17,8 @@ import static junit.framework.Assert.ass
/**
* @author Kristian Rosenvold
*/
-public class JUnitCoreRunListenerTest
+public class JUnitCoreRunListenerTest extends TestCase
{
- @Test
public void testTestRunStarted()
throws Exception
{
@@ -30,8 +30,8 @@ public class JUnitCoreRunListenerTest
core.removeListener( jUnit4TestSetReporter );
assertEquals(2, result.getRunCount());
}
- @Test
- public void failedAssumption()
+
+ public void testFailedAssumption()
throws Exception
{
RunListener jUnit4TestSetReporter = new JUnitCoreRunListener( new
MulticastingReporter( Collections.emptyList() ),
Copied:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
(from r1080465,
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTestCase.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java?p2=maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java&p1=maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTestCase.java&r1=1080465&r2=1081113&rev=1081113&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTestCase.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
Sun Mar 13 13:39:52 2011
@@ -16,6 +16,7 @@
*/
package org.apache.maven.surefire.junitcore;
+import junit.framework.TestCase;
import org.apache.maven.surefire.report.Reporter;
import org.apache.maven.surefire.report.ReporterConfiguration;
import org.apache.maven.surefire.report.ReporterFactory;
@@ -87,7 +88,7 @@ import org.junit.runner.notification.Run
* @author <a href="mailto:[email protected]";>Aslak Knutsen</a>
* @version $Revision: $
*/
-public class MavenSurefireJUnit47RunnerTestCase
+public class MavenSurefireJUnit47RunnerTest extends TestCase
{
/*
@@ -114,8 +115,7 @@ public class MavenSurefireJUnit47RunnerT
*
*/
@SuppressWarnings( { "unchecked", "ThrowableResultOfMethodCallIgnored" } )
- @Test
- public void surefireShouldBeAbleToReportRunStatusEvenWithFailingTests()
+ public void testSurefireShouldBeAbleToReportRunStatusEvenWithFailingTests()
throws Exception
{
ReporterConfiguration reporterConfiguration =
ConcurrentReporterManagerTest.getTestReporterConfiguration();
Propchange:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
