Author: krosenvold
Date: Sat Nov 26 09:28:07 2011
New Revision: 1206413
URL: http://svn.apache.org/viewvc?rev=1206413&view=rev
Log:
[SUREFIRE-747] Test count verified correct
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java
- copied, changed from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/TestSuite.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
(contents, props changed)
- copied, changed from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
(contents, props changed)
- copied, changed from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/SuiteTest1.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
(contents, props changed)
- copied, changed from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/SuiteTest2.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
(contents, props changed)
- copied, changed from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/TestSuite.java
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/junit4-test.iws~
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/SuiteTest1.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/SuiteTest2.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/TestSuite.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java
(from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/TestSuite.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/TestSuite.java&r1=1206357&r2=1206413&rev=1206413&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/TestSuite.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java
Sat Nov 26 09:28:07 2011
@@ -1,5 +1,4 @@
-package surefire747;
-
+package org.apache.maven.surefire.its;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,18 +18,34 @@ package surefire747;
* under the License.
*/
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
/**
* @author Kristian Rosenvold
*/
-@RunWith(Suite.class)
-@Suite.SuiteClasses(
-{
- SuiteTest1.class,
- SuiteTest2.class
-})
-public class TestSuite
+public class Surefire747MethodParallelWithSuiteCountIT
+ extends SurefireVerifierTestClass
{
+
+ public Surefire747MethodParallelWithSuiteCountIT()
+ {
+ super( "/junit47-parallel-with-suite" );
+ }
+
+ public void testMethodsParallelWithSuite()
+ throws Exception
+ {
+ executeTest();
+ verifyErrorFreeLog();
+ assertTestSuiteResults( 6, 0, 0, 0 );
+ }
+
+ public void testClassesParallelWithSuite()
+ throws Exception
+ {
+
+ parallel( "classes" );
+ executeTest();
+ verifyErrorFreeLog();
+ assertTestSuiteResults( 6, 0, 0, 0 );
+ }
+
}
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1206413&r1=1206412&r2=1206413&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
Sat Nov 26 09:28:07 2011
@@ -25,8 +25,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.StringTokenizer;
-
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -410,4 +408,10 @@ public abstract class SurefireVerifierTe
return "org.apache.maven.plugins:maven-surefire-report-plugin:" +
getSurefireVersion()
+ ":failsafe-report-only";
}
+
+ protected void parallel( String parallel )
+ {
+ addGoal( "-Dparallel=" + parallel );
+ }
+
}
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
(from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/pom.xml&r1=1206357&r2=1206413&rev=1206413&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/pom.xml
(original)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
Sat Nov 26 09:28:07 2011
@@ -32,7 +32,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
- <parallel>${parallel}</parallel>
<threadCount>10</threadCount>
<includes>
<include>**/TestSuite.java</include>
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
(from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/SuiteTest1.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/SuiteTest1.java&r1=1206357&r2=1206413&rev=1206413&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
(from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/SuiteTest2.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/SuiteTest2.java&r1=1206357&r2=1206413&rev=1206413&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
(from r1206357,
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/TestSuite.java)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-747-parallel-method-skips-tests/src/test/java/surefire747/TestSuite.java&r1=1206357&r2=1206413&rev=1206413&view=diff
==============================================================================
(empty)
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java?rev=1206413&r1=1206412&r2=1206413&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
Sat Nov 26 09:28:07 2011
@@ -19,9 +19,6 @@ package org.apache.maven.surefire.junitc
* under the License.
*/
-import org.apache.maven.surefire.util.NestedRuntimeException;
-import org.junit.runners.model.RunnerScheduler;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -29,6 +26,9 @@ import java.util.concurrent.ExecutionExc
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import org.apache.maven.surefire.util.NestedRuntimeException;
+
+import org.junit.runners.model.RunnerScheduler;
/**
* @author <a href="mailto:krist...@zenior.no";>Kristian Rosenvold</a>
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java?rev=1206413&r1=1206412&r2=1206413&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestSet.java
Sat Nov 26 09:28:07 2011
@@ -112,7 +112,7 @@ public class TestSet
numberOfTests.incrementAndGet();
}
- public void addTestMethod( TestMethod testMethod )
+ private void addTestMethod( TestMethod testMethod )
{
testMethods.add( testMethod );
}
