Repository: maven-surefire Updated Branches: refs/heads/master 237306a9f -> 8b78618bc
[SUREFIRE] rejected testng:6.9.7/jre1.8 and accepted testng:6.9.8/jre1.7 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/428165e2 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/428165e2 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/428165e2 Branch: refs/heads/master Commit: 428165e29da39596751e49caac4448d65bfd2bb1 Parents: 237306a Author: Tibor17 <tibo...@lycos.com> Authored: Mon Oct 12 21:36:05 2015 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Mon Oct 12 21:36:05 2015 +0200 ---------------------------------------------------------------------- maven-surefire-plugin/src/site/apt/examples/testng.apt.vm | 2 +- .../its/jiras/Surefire1177TestngParallelSuitesIT.java | 8 ++++++-- .../src/test/resources/testng-parallel-suites/pom.xml | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/428165e2/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm b/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm index b74bd3d..14d3f62 100644 --- a/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm +++ b/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm @@ -197,7 +197,7 @@ Using TestNG </plugins> +---+ - TestNG 6.9.7 or higher allows you to run suites in parallel. + TestNG 6.9.8 (JRE 1.7) or higher allows you to run suites in parallel. +---+ </plugins> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/428165e2/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java index 55ae4da..4f5befb 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java @@ -24,10 +24,11 @@ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.Test; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.containsString; +import static org.junit.Assume.assumeThat; /** * IT for https://issues.apache.org/jira/browse/SUREFIRE-1177 @@ -42,6 +43,9 @@ public class Surefire1177TestngParallelSuitesIT public void shouldRunTwoSuitesInParallel() throws VerificationException { + assumeThat( "java.specification.version: ", + System.getProperty( "java.specification.version" ), is( greaterThanOrEqualTo( "1.7" ) ) ); + unpack().executeTest() .verifyErrorFree( 2 ) .assertThatLogLine( containsString( "ShouldNotRunTest#shouldNotRun()" ), is( 0 ) ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/428165e2/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml index f9598ab..d9d0a31 100644 --- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml @@ -52,7 +52,8 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.9.7</version> + <version>6.9.8</version> + <scope>test</scope> </dependency> </dependencies>
