This is an automated email from the ASF dual-hosted git repository.
sor pushed a commit to branch 1564
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/1564 by this push:
new 1d84b39 Upgrade surefire-junit-platform to use JUnit Platform 1.3.1
1d84b39 is described below
commit 1d84b3927285a257af39cb99042722a9f275f395
Author: Christian Stein <sormu...@gmail.com>
AuthorDate: Wed Sep 26 13:33:32 2018 +0200
Upgrade surefire-junit-platform to use JUnit Platform 1.3.1
Also upgraded internal unit test to use JUnit Jupiter 5.3.1 which
introduce a new parameter `ConfigurationParameters` in the constructor
of `ClassTestDescriptor`.
---
.../java/org/apache/maven/surefire/its/JUnitPlatformIT.java | 10 +++++-----
surefire-providers/surefire-junit-platform/pom.xml | 4 ++--
.../maven/surefire/junitplatform/RunListenerAdapterTest.java | 5 ++++-
.../maven/surefire/junitplatform/TestMethodFilterTest.java | 6 +++++-
4 files changed, 16 insertions(+), 9 deletions(-)
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 87f338a..fbe527d 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
@@ -67,7 +67,7 @@ public class JUnitPlatformIT
.executeTest()
.verifyErrorFree( 1 );
- validator.verifyTextInLog( "test(compact) classpath" ) // is fine, all
versions are coming from the project
+ validator.verifyTextInLog( "test(compact) classpath" )
.verifyTextInLog( "apiguardian-api-1.0.0.jar" )
.verifyTextInLog( "junit-jupiter-api-5.0.0.jar" )
.verifyTextInLog( "junit-jupiter-engine-5.0.0.jar" )
@@ -75,14 +75,14 @@ public class JUnitPlatformIT
.verifyTextInLog( "junit-platform-engine-1.0.0.jar" )
.verifyTextInLog( "opentest4j-1.0.0.jar" );
- validator.verifyTextInLog( "provider(compact) classpath" ) // is
broken, some versions remain on "1.2.0"
+ validator.verifyTextInLog( "provider(compact) classpath" )
.verifyTextInLog( "surefire-api-" ) // and current version,
like "2.22.1-SNAPSHOT.jar"
.verifyTextInLog( "surefire-junit-platform-" ) // and current
version, like "2.22.1-SNAPSHOT.jar"
.verifyTextInLog( "apiguardian-api-1.0.0.jar" )
.verifyTextInLog( "junit-jupiter-engine-5.0.0.jar" )
- .verifyTextInLog( "junit-platform-commons-1.0.0.jar" ) // is
always "1.2.0"
- .verifyTextInLog( "junit-platform-engine-1.0.0.jar" ) // is
always "1.2.0"
- .verifyTextInLog( "junit-platform-launcher-1.0.0.jar" ) // is
always "1.2.0"
+ .verifyTextInLog( "junit-platform-commons-1.0.0.jar" )
+ .verifyTextInLog( "junit-platform-engine-1.0.0.jar" )
+ .verifyTextInLog( "junit-platform-launcher-1.3.1.jar" ) // is
always "1.3.1" for now
.verifyTextInLog( "opentest4j-1.0.0.jar" );
}
diff --git a/surefire-providers/surefire-junit-platform/pom.xml
b/surefire-providers/surefire-junit-platform/pom.xml
index 18be313..4a57646 100644
--- a/surefire-providers/surefire-junit-platform/pom.xml
+++ b/surefire-providers/surefire-junit-platform/pom.xml
@@ -86,12 +86,12 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
- <version>1.2.0</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.2.0</version>
+ <version>5.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java
b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java
index 0cf526c..5fa9bad 100644
---
a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java
+++
b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java
@@ -48,6 +48,7 @@ import org.junit.Test;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
+import org.junit.platform.engine.ConfigurationParameters;
import org.junit.platform.engine.TestDescriptor;
import org.junit.platform.engine.TestDescriptor.Type;
import org.junit.platform.engine.TestExecutionResult;
@@ -68,6 +69,8 @@ import org.mockito.InOrder;
*/
public class RunListenerAdapterTest
{
+ private static final ConfigurationParameters configParams =
mock(ConfigurationParameters.class);
+
private RunListener listener;
private RunListenerAdapter adapter;
@@ -444,7 +447,7 @@ public class RunListenerAdapterTest
private static TestDescriptor newClassDescriptor()
{
- return new ClassTestDescriptor( UniqueId.root( "class",
MyTestClass.class.getName() ), MyTestClass.class );
+ return new ClassTestDescriptor( UniqueId.root( "class",
MyTestClass.class.getName() ), MyTestClass.class, configParams );
}
private static TestIdentifier newSourcelessChildIdentifierWithParent(
diff --git
a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/TestMethodFilterTest.java
b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/TestMethodFilterTest.java
index efb0589..aeb86a7 100644
---
a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/TestMethodFilterTest.java
+++
b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/TestMethodFilterTest.java
@@ -31,6 +31,7 @@ import org.apache.maven.surefire.testset.TestListResolver;
import org.junit.Test;
import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
+import org.junit.platform.engine.ConfigurationParameters;
import org.junit.platform.engine.FilterResult;
import org.junit.platform.engine.UniqueId;
@@ -41,6 +42,9 @@ import org.junit.platform.engine.UniqueId;
*/
public class TestMethodFilterTest
{
+
+ private static final ConfigurationParameters configParams =
mock(ConfigurationParameters.class);
+
private final TestListResolver resolver = mock( TestListResolver.class );
private final TestMethodFilter filter = new TestMethodFilter(
this.resolver );
@@ -90,7 +94,7 @@ public class TestMethodFilterTest
private static ClassTestDescriptor newClassTestDescriptor()
{
UniqueId uniqueId = UniqueId.forEngine( "class" );
- return new ClassTestDescriptor( uniqueId, TestClass.class );
+ return new ClassTestDescriptor( uniqueId, TestClass.class,
configParams );
}
public static class TestClass
