This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 175c5d9a4a3aa60767884bf5b96eec885050b650 Author: tibordigana <[email protected]> AuthorDate: Mon Jul 15 01:18:30 2019 +0200 ParallelParameterized to speed up the ITs --- .../org/apache/maven/surefire/its/AbstractFailFastIT.java | 4 ++-- .../maven/surefire/its/CheckTestNgListenerReporterIT.java | 11 ++++++----- .../java/org/apache/maven/surefire/its/JUnit4VersionsIT.java | 4 ++-- .../org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java | 4 ++-- .../maven/surefire/its/TestMultipleMethodPatternsIT.java | 7 ++++--- .../surefire/its/TestMultipleMethodPatternsTestNGIT.java | 7 ++++--- .../surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java | 6 +++--- .../its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java | 8 ++++---- 8 files changed, 27 insertions(+), 24 deletions(-) diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java index 3531c7c..7ccf612 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java @@ -19,12 +19,12 @@ package org.apache.maven.surefire.its; * under the License. */ +import com.googlecode.junittoolbox.ParallelParameterized; import org.apache.maven.surefire.its.fixture.MavenLauncher; import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.HashMap; import java.util.Map; @@ -37,7 +37,7 @@ import static org.junit.runners.Parameterized.Parameter; * @author <a href="mailto:[email protected]";>Tibor Digana (tibor17)</a> * @since 2.19 */ -@RunWith( Parameterized.class ) +@RunWith( ParallelParameterized.class ) public abstract class AbstractFailFastIT extends SurefireJUnit4IntegrationTestCase { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java index 2c618d0..5c73a28 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java @@ -19,11 +19,11 @@ package org.apache.maven.surefire.its; * under the License. */ +import com.googlecode.junittoolbox.ParallelParameterized; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.Arrays; import java.util.Collection; @@ -38,7 +38,7 @@ import static org.junit.runners.Parameterized.Parameters; * @author <a href="mailto:[email protected]";>Dan Fabulich</a> * @author <a href="mailto:[email protected]";>Kristian Rosenvold</a> */ -@RunWith( Parameterized.class ) +@RunWith( ParallelParameterized.class ) public class CheckTestNgListenerReporterIT extends SurefireJUnit4IntegrationTestCase { @@ -71,17 +71,18 @@ public class CheckTestNgListenerReporterIT { "5.14.6", null, 1.5d }, // Usage of org.testng:guice removed { "5.14.9", null, 1.5d }, // Latest 5.14.x TestNG version { "6.0", null, 1.5d }, - { "6.9.9", null, 1.7d } // Currently latest TestNG version + { "6.14.3", null, 1.7d }, + { "7.0.0-beta7", null, 1.7d } // Currently latest TestNG version }); } @Parameter public String version; - @Parameter(1) + @Parameter( 1 ) public String classifier; - @Parameter(2) + @Parameter( 2 ) public double javaVersion; @Test diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java index 24d4d63..b6cfad8 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java @@ -21,11 +21,11 @@ package org.apache.maven.surefire.its; import java.util.Collection; +import com.googlecode.junittoolbox.ParallelParameterized; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import static java.util.Arrays.asList; @@ -53,7 +53,7 @@ import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_7; * * @author <a href="mailto:[email protected]";>Dan Fabulich</a> */ -@RunWith( Parameterized.class ) +@RunWith( ParallelParameterized.class ) public class JUnit4VersionsIT extends SurefireJUnit4IntegrationTestCase { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java index 15bcbfb..fe49ba7 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java @@ -19,13 +19,13 @@ package org.apache.maven.surefire.its; * under the License. */ +import com.googlecode.junittoolbox.ParallelParameterized; import org.apache.maven.it.VerificationException; import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; @@ -40,7 +40,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertThat; -@RunWith( Parameterized.class ) +@RunWith( ParallelParameterized.class ) public class JUnitPlatformEnginesIT extends SurefireJUnit4IntegrationTestCase { diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java index d490ce5..ff2c147 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java @@ -19,17 +19,18 @@ package org.apache.maven.surefire.its; * under the License. */ +import com.googlecode.junittoolbox.ParallelParameterized; import org.apache.maven.surefire.its.fixture.Settings; import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.util.Arrays; /** * JUnit test project using multiple method patterns, including wildcards in class and method names. */ -@RunWith( Parameterized.class ) +@RunWith( ParallelParameterized.class ) public class TestMultipleMethodPatternsIT extends AbstractTestMultipleMethodPatterns { @@ -40,7 +41,7 @@ public class TestMultipleMethodPatternsIT this.settings = settings; } - @Parameterized.Parameters + @Parameters public static Iterable<Object[]> data() { return Arrays.asList( new Object[][]{ diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java index 2de3670..0ea902e 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java @@ -19,17 +19,18 @@ package org.apache.maven.surefire.its; * under the License. */ +import com.googlecode.junittoolbox.ParallelParameterized; import org.apache.maven.surefire.its.fixture.Settings; import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.util.Arrays; /** * TestNG test project using multiple method patterns, including wildcards in class and method names. */ -@RunWith( Parameterized.class ) +@RunWith( ParallelParameterized.class ) public class TestMultipleMethodPatternsTestNGIT extends AbstractTestMultipleMethodPatterns { @@ -40,7 +41,7 @@ public class TestMultipleMethodPatternsTestNGIT this.settings = settings; } - @Parameterized.Parameters + @Parameters public static Iterable<Object[]> data() { return Arrays.asList( new Object[][]{ diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java index 706f6b5..36f4628 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java @@ -18,11 +18,11 @@ package org.apache.maven.surefire.its.jiras; * under the License. */ +import com.googlecode.junittoolbox.ParallelParameterized; import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireVerifierException; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import java.util.ArrayList; @@ -36,14 +36,14 @@ import static org.junit.Assert.*; * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1158";>SUREFIRE-1158</a> * @since 2.19 */ -@RunWith( Parameterized.class ) +@RunWith( ParallelParameterized.class ) public class Surefire1158RemoveInfoLinesIT { @Parameters(name = "{0}") public static Iterable<Object[]> data() { - ArrayList<Object[]> args = new ArrayList<Object[]>(); + ArrayList<Object[]> args = new ArrayList<>(); args.add( new Object[] { "junit-option-ff", "JUnitTest", "-ff", "surefire-junit47", false, true } ); args.add( new Object[] { "testng-option-ff", "TestNGSuiteTest", "-ff", "surefire-testng", false, false } ); args.add( new Object[] { "junit-option-X", "JUnitTest", "-X", "surefire-junit47", true, true } ); diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java index 14ecb34..41a2964 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java @@ -19,12 +19,12 @@ package org.apache.maven.surefire.its.jiras; * under the License. */ +import com.googlecode.junittoolbox.ParallelParameterized; import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; @@ -51,7 +51,7 @@ import static org.junit.Assume.assumeTrue; * @author michaeltandy * @since 2.20 */ -@RunWith( Parameterized.class ) +@RunWith( ParallelParameterized.class ) public class Surefire1295AttributeJvmCrashesToTestsIT extends SurefireJUnit4IntegrationTestCase { @@ -81,10 +81,10 @@ public class Surefire1295AttributeJvmCrashesToTestsIT } @Parameter( 0 ) - public static String crashStyle; + public String crashStyle; @Parameter( 1 ) - public static ForkMode forkStyle; + public ForkMode forkStyle; @Test public void test()
