You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/07/14 23:59:07 UTC
[maven-surefire] branch master updated (5145915 -> 2d09927)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
from 5145915 Java 13 EA
new f46044e [SUREFIRE-1678] JUnit5 Integration Tests should test wide spectrum of versions
new 175c5d9 ParallelParameterized to speed up the ITs
new 2d09927 investigating build failure: removed jenkinsNotify()
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 2 +-
pom.xml | 5 +++
surefire-its/pom.xml | 8 ++++
.../maven/surefire/its/AbstractFailFastIT.java | 4 +-
.../its/CheckTestNgListenerReporterIT.java | 11 ++---
.../maven/surefire/its/JUnit4VersionsIT.java | 4 +-
.../maven/surefire/its/JUnitPlatformEnginesIT.java | 9 ++--
.../apache/maven/surefire/its/JUnitPlatformIT.java | 51 +++++++++++++++++++---
.../surefire/its/TestMultipleMethodPatternsIT.java | 7 +--
.../its/TestMultipleMethodPatternsTestNGIT.java | 7 +--
.../its/jiras/Surefire1158RemoveInfoLinesIT.java | 6 +--
.../Surefire1295AttributeJvmCrashesToTestsIT.java | 8 ++--
.../resources/junit-platform-engine-jqwik/pom.xml | 2 +-
.../junit-platform-engine-jupiter/pom.xml | 18 ++++++--
.../junit-platform-engine-vintage/pom.xml | 15 ++++++-
.../junit-platform-multiple-engines/pom.xml | 39 +++++++++++++++--
.../src/test/resources/junit-platform-tags/pom.xml | 15 ++++++-
17 files changed, 167 insertions(+), 44 deletions(-)
[maven-surefire] 01/03: [SUREFIRE-1678] JUnit5 Integration Tests
should test wide spectrum of versions
Posted by ti...@apache.org.
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 f46044ea1d20618a01ea9c9b0d04e1efa8af960a
Author: tibordigana <ti...@apache.org>
AuthorDate: Fri Jul 12 18:40:29 2019 +0200
[SUREFIRE-1678] JUnit5 Integration Tests should test wide spectrum of versions
---
pom.xml | 5 +++
surefire-its/pom.xml | 8 ++++
.../maven/surefire/its/JUnitPlatformEnginesIT.java | 5 ++-
.../apache/maven/surefire/its/JUnitPlatformIT.java | 51 +++++++++++++++++++---
.../resources/junit-platform-engine-jqwik/pom.xml | 2 +-
.../junit-platform-engine-jupiter/pom.xml | 18 ++++++--
.../junit-platform-engine-vintage/pom.xml | 15 ++++++-
.../junit-platform-multiple-engines/pom.xml | 39 +++++++++++++++--
.../src/test/resources/junit-platform-tags/pom.xml | 15 ++++++-
9 files changed, 139 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 78ebe81..d27edf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,6 +403,11 @@
<classifier>runtime</classifier>
<version>${jacocoVersion}</version>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.junit-toolbox</groupId>
+ <artifactId>junit-toolbox</artifactId>
+ <version>1.11</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index c6523cd..2c4a7e6 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -78,6 +78,11 @@
<artifactId>commons-lang3</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.junit-toolbox</groupId>
+ <artifactId>junit-toolbox</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -183,6 +188,9 @@
<verifier.forkMode>forked</verifier.forkMode>
<jdk.home>${jdk.home}</jdk.home>
<jacoco.agent>${jacoco-it.agent}</jacoco.agent>
+
+ <!-- see the f/w com.googlecode.junit-toolbox:junit-toolbox -->
+ <maxParallelTestThreads>3</maxParallelTestThreads>
</systemPropertyVariables>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
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 6ef402b..15bcbfb 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
@@ -57,7 +57,7 @@ public class JUnitPlatformEnginesIT
public String apiguardian;
@Parameters(name = "{0}")
- public static Iterable<Object[]> regexVersions()
+ public static Iterable<Object[]> artifactVersions()
{
ArrayList<Object[]> args = new ArrayList<>();
args.add( new Object[] { "1.0.3", "5.0.3", "1.0.0", "1.0.0" } );
@@ -66,7 +66,8 @@ public class JUnitPlatformEnginesIT
args.add( new Object[] { "1.3.2", "5.3.2", "1.1.1", "1.0.0" } );
args.add( new Object[] { "1.4.2", "5.4.2", "1.1.1", "1.0.0" } );
args.add( new Object[] { "1.5.0-RC1", "5.5.0-RC1", "1.2.0", "1.1.0" } );
- args.add( new Object[] { "1.5.0-SNAPSHOT", "5.5.0-SNAPSHOT", "1.2.0", "1.1.0" } );
+ args.add( new Object[] { "1.5.0", "5.5.0", "1.2.0", "1.1.0" } );
+ args.add( new Object[] { "1.6.0-SNAPSHOT", "5.6.0-SNAPSHOT", "1.2.0", "1.1.0" } );
return args;
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
index 9522ebe..2cf431a 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
@@ -19,15 +19,21 @@ package org.apache.maven.surefire.its;
* 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.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.convertUnicodeToUTF8;
+@RunWith( ParallelParameterized.class )
public class JUnitPlatformIT
extends SurefireJUnit4IntegrationTestCase
{
@@ -36,6 +42,26 @@ public class JUnitPlatformIT
+ "\"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd\" "
+ "version=\"3.0\" name=\"<< ✨ >>\"";
+ @Parameter
+ public String junit5Version;
+
+ @Parameter( 1 )
+ public String jqwikVersion;
+
+ @Parameters( name = "{0}" )
+ public static Iterable<Object[]> artifactVersions()
+ {
+ ArrayList<Object[]> args = new ArrayList<>();
+ args.add( new Object[] { "5.2.0", "0.8.0" } );
+ args.add( new Object[] { "5.3.0", "0.8.15" } );
+ args.add( new Object[] { "5.3.2", "0.9.0" } );
+ args.add( new Object[] { "5.4.0", "0.9.3" } );
+ args.add( new Object[] { "5.4.2", "1.0.0" } );
+ args.add( new Object[] { "5.5.0", "1.1.0" } );
+ args.add( new Object[] { "5.6.0-SNAPSHOT", "1.1.6" } );
+ return args;
+ }
+
@Before
public void setUp()
{
@@ -45,8 +71,10 @@ public class JUnitPlatformIT
@Test
public void testJupiterEngine()
{
- unpack( "/junit-platform-engine-jupiter" )
+ unpack( "junit-platform-engine-jupiter", "-" + junit5Version + "-" + jqwikVersion )
.setTestToRun( "Basic*Test" )
+ .sysProp( "junit5.version", junit5Version )
+ .sysProp( "jqwik.version", jqwikVersion )
.executeTest()
.verifyErrorFree( 5 );
}
@@ -54,7 +82,9 @@ public class JUnitPlatformIT
@Test
public void testJupiterEngineWithDisplayNames()
{
- OutputValidator validator = unpack( "/junit-platform-engine-jupiter" )
+ OutputValidator validator = unpack( "junit-platform-engine-jupiter", "-" + junit5Version + "-" + jqwikVersion )
+ .sysProp( "junit5.version", junit5Version )
+ .sysProp( "jqwik.version", jqwikVersion )
.executeTest()
.verifyErrorFree( 7 );
@@ -87,7 +117,9 @@ public class JUnitPlatformIT
@Test
public void testVintageEngine()
{
- unpack( "/junit-platform-engine-vintage" )
+ unpack( "junit-platform-engine-vintage", "-" + junit5Version + "-" + jqwikVersion )
+ .sysProp( "junit5.version", junit5Version )
+ .sysProp( "jqwik.version", jqwikVersion )
.executeTest()
.verifyErrorFree( 1 );
}
@@ -95,7 +127,9 @@ public class JUnitPlatformIT
@Test
public void testJQwikEngine()
{
- unpack( "/junit-platform-engine-jqwik" )
+ unpack( "junit-platform-engine-jqwik", "-" + junit5Version + "-" + jqwikVersion )
+ .sysProp( "junit5.version", junit5Version )
+ .sysProp( "jqwik.version", jqwikVersion )
.executeTest()
.verifyErrorFree( 1 );
}
@@ -103,7 +137,9 @@ public class JUnitPlatformIT
@Test
public void testMultipleEngines()
{
- unpack( "/junit-platform-multiple-engines" )
+ unpack( "junit-platform-multiple-engines", "-" + junit5Version + "-" + jqwikVersion )
+ .sysProp( "junit5.version", junit5Version )
+ .sysProp( "jqwik.version", jqwikVersion )
.executeTest()
.verifyErrorFree( 7 );
}
@@ -111,7 +147,8 @@ public class JUnitPlatformIT
@Test
public void testTags()
{
- unpack( "/junit-platform-tags" )
+ unpack( "junit-platform-tags", "-" + junit5Version + "-" + jqwikVersion )
+ .sysProp( "junit5.version", junit5Version )
.executeTest()
.verifyErrorFree( 2 );
}
diff --git a/surefire-its/src/test/resources/junit-platform-engine-jqwik/pom.xml b/surefire-its/src/test/resources/junit-platform-engine-jqwik/pom.xml
index 8e27d56..4631dea 100644
--- a/surefire-its/src/test/resources/junit-platform-engine-jqwik/pom.xml
+++ b/surefire-its/src/test/resources/junit-platform-engine-jqwik/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik</artifactId>
- <version>0.8.10</version>
+ <version>${jqwik.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/junit-platform-engine-jupiter/pom.xml b/surefire-its/src/test/resources/junit-platform-engine-jupiter/pom.xml
index 4947646..a7128ae 100644
--- a/surefire-its/src/test/resources/junit-platform-engine-jupiter/pom.xml
+++ b/surefire-its/src/test/resources/junit-platform-engine-jupiter/pom.xml
@@ -31,7 +31,6 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <junit.jupiter.version>5.2.0</junit.jupiter.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -45,13 +44,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>${junit.jupiter.version}</version>
+ <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <version>${junit.jupiter.version}</version>
+ <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -95,4 +94,17 @@
</plugin>
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>oss-sonatype</id>
+ <name>oss-sonatype</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
diff --git a/surefire-its/src/test/resources/junit-platform-engine-vintage/pom.xml b/surefire-its/src/test/resources/junit-platform-engine-vintage/pom.xml
index 38b788f..20ad7b3 100644
--- a/surefire-its/src/test/resources/junit-platform-engine-vintage/pom.xml
+++ b/surefire-its/src/test/resources/junit-platform-engine-vintage/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>5.2.0</version>
+ <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -57,4 +57,17 @@
</plugin>
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>oss-sonatype</id>
+ <name>oss-sonatype</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
diff --git a/surefire-its/src/test/resources/junit-platform-multiple-engines/pom.xml b/surefire-its/src/test/resources/junit-platform-multiple-engines/pom.xml
index e7f50a3..2cd1827 100644
--- a/surefire-its/src/test/resources/junit-platform-multiple-engines/pom.xml
+++ b/surefire-its/src/test/resources/junit-platform-multiple-engines/pom.xml
@@ -37,26 +37,44 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.2.0</version>
+ <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <version>5.2.0</version>
+ <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>5.2.0</version>
+ <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.jqwik</groupId>
<artifactId>jqwik</artifactId>
- <version>0.8.10</version>
+ <version>${jqwik.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-commons</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-engine</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apiguardian</groupId>
+ <artifactId>apiguardian-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opentest4j</groupId>
+ <artifactId>opentest4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -69,4 +87,17 @@
</plugin>
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>oss-sonatype</id>
+ <name>oss-sonatype</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
diff --git a/surefire-its/src/test/resources/junit-platform-tags/pom.xml b/surefire-its/src/test/resources/junit-platform-tags/pom.xml
index 0fb64cf..cef7f35 100644
--- a/surefire-its/src/test/resources/junit-platform-tags/pom.xml
+++ b/surefire-its/src/test/resources/junit-platform-tags/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.2.0</version>
+ <version>${junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -54,4 +54,17 @@
</plugin>
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>oss-sonatype</id>
+ <name>oss-sonatype</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
[maven-surefire] 02/03: ParallelParameterized to speed up the ITs
Posted by ti...@apache.org.
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 <ti...@apache.org>
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:tibordigana@apache.org">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:dfabulich@apache.org">Dan Fabulich</a>
* @author <a href="mailto:krosenvold@apache.org">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:dfabulich@apache.org">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()
[maven-surefire] 03/03: investigating build failure: removed
jenkinsNotify()
Posted by ti...@apache.org.
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 2d0992771b501bf8ac3adb4f07057d57802a1dfa
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Jul 15 01:55:30 2019 +0200
investigating build failure: removed jenkinsNotify()
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 043b18c..175c763 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -109,7 +109,7 @@ timeout(time: 12, unit: 'HOURS') {
currentBuild.result = 'FAILURE'
throw e
} finally {
- jenkinsNotify()
+ // jenkinsNotify()
}
}