Updated Branches: refs/heads/master 0cd869cce -> d7eb244b0
Excluded test that is not 2.2.1 compatible from running with 2.2.1 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d7eb244b Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d7eb244b Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d7eb244b Branch: refs/heads/master Commit: d7eb244b048249e20ef22db4fa92ac60e7fa5bfc Parents: 0cd869c Author: Kristian Rosenvold <krosenv...@apache.org> Authored: Thu Feb 14 21:39:22 2013 +0100 Committer: Kristian Rosenvold <krosenv...@apache.org> Committed: Thu Feb 14 21:39:31 2013 +0100 ---------------------------------------------------------------------- .../maven/surefire/its/ForkModeMultiModuleIT.java | 20 ++++++++++---- 1 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7eb244b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java index 6d972ad..b00430e 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java @@ -19,26 +19,29 @@ package org.apache.maven.surefire.its; * under the License. */ +import org.apache.maven.surefire.its.fixture.*; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import java.io.File; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.maven.surefire.its.fixture.HelperAssertions; -import org.apache.maven.surefire.its.fixture.OutputValidator; -import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase; -import org.apache.maven.surefire.its.fixture.SurefireLauncher; -import org.apache.maven.surefire.its.fixture.TestFile; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * Test forkMode in a multi module project with parallel maven builds * * @author Andreas Gudian */ +@Category( Not2xCompatible.class ) public class ForkModeMultiModuleIT - extends SurefireIntegrationTestCase + extends SurefireJUnit4IntegrationTestCase { + @Test public void testForkCountOneNoReuse() { List<String> pids = doTest( unpack( getProject() ).forkCount( 1 ).reuseForks( false ) ); @@ -50,6 +53,8 @@ public class ForkModeMultiModuleIT assertEquals( "No other forkNumbers than 1 and 2 have been used", 6, matchesOne + matchesTwo); } + + @Test public void testForkCountOneReuse() { List<String> pids = doTest( unpack( getProject() ).forkCount( 1 ).reuseForks( true ) ); @@ -58,6 +63,7 @@ public class ForkModeMultiModuleIT assertEndWith( pids, "_2_2", 3 ); } + @Test public void testForkCountTwoNoReuse() { List<String> pids = doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( false ) ); @@ -73,6 +79,7 @@ public class ForkModeMultiModuleIT assertEquals( "No other forkNumbers than 1, 2, 3, or 4 have been used", 6, matchesOne + matchesTwo + matchesThree + matchesFour ); } + @Test public void testForkCountTwoReuse() { List<String> pids = @@ -153,4 +160,5 @@ public class ForkModeMultiModuleIT return "fork-mode-multimodule"; } + }
