You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/02/23 21:10:01 UTC
[maven-surefire] 01/01: [SUREFIRE-2000] Improve assertions in Surefire1787JUnit5IT
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch SUREFIRE-2000-assertions
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 50660385223f2b426c86bb726eac5af70fb25569
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Wed Feb 23 22:09:33 2022 +0100
[SUREFIRE-2000] Improve assertions in Surefire1787JUnit5IT
---
.../surefire/its/jiras/Surefire1787JUnit5IT.java | 42 +++++++++++++---------
.../src/test/java/examples/RootTest.java | 10 ++++--
.../src/test/java/examples/a/ATest.java | 8 +++--
.../src/test/java/examples/b/BTest.java | 10 ++++--
4 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit5IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit5IT.java
index 0a493f5..3e7e056 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit5IT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit5IT.java
@@ -20,22 +20,14 @@ package org.apache.maven.surefire.its.jiras;
*/
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Before;
import org.junit.Test;
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-
/**
*
*/
@SuppressWarnings( "checkstyle:magicnumber" )
public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
{
- @Before
- public void javaVersion()
- {
- assumeJavaVersion( 1.8d );
- }
@Test
public void bothEngines()
@@ -45,7 +37,9 @@ public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
.executeTest()
.verifyErrorFree( 2 )
.verifyTextInLog( "Running pkg.JUnit4Test" )
- .verifyTextInLog( "Running pkg.JUnit5Test" );
+ .verifyTextInLog( "Running pkg.JUnit5Test" )
+ .verifyTextInLog(
+ "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
}
@Test
@@ -56,7 +50,10 @@ public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
.executeTest()
.verifyErrorFree( 2 )
.verifyTextInLog( "Running pkg.JUnit4Test" )
- .verifyTextInLog( "Running pkg.JUnit5Test" );
+ .verifyTextInLog( "Running pkg.JUnit5Test" )
+ .verifyTextInLog(
+ "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
+
}
@Test
@@ -67,7 +64,9 @@ public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
.executeTest()
.verifyErrorFree( 2 )
.verifyTextInLog( "Running pkg.JUnit4Test" )
- .verifyTextInLog( "Running pkg.JUnit5Test" );
+ .verifyTextInLog( "Running pkg.JUnit5Test" )
+ .verifyTextInLog(
+ "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
}
@Test
@@ -77,7 +76,9 @@ public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
.activateProfile( "select-junit4" )
.executeTest()
.verifyErrorFree( 1 )
- .verifyTextInLog( "Running pkg.JUnit4Test" );
+ .verifyTextInLog( "Running pkg.JUnit4Test" )
+ .verifyTextInLog(
+ "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
}
@Test
@@ -87,7 +88,9 @@ public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
.activateProfile( "select-junit5" )
.executeTest()
.verifyErrorFree( 1 )
- .verifyTextInLog( "Running pkg.JUnit5Test" );
+ .verifyTextInLog( "Running pkg.JUnit5Test" )
+ .verifyTextInLog(
+ "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
}
@Test
@@ -98,7 +101,10 @@ public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
.executeTest()
.verifyErrorFree( 2 )
.verifyTextInLog( "Running pkg.JUnit5Test" )
- .verifyTextInLog( "Running pkg.TestNGTest" );
+ .verifyTextInLog( "Running pkg.TestNGTest" )
+ .verifyTextInLog(
+ "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
+
}
@Test
@@ -109,7 +115,9 @@ public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
.executeTest()
.verifyErrorFree( 2 )
.verifyTextInLog( "Running pkg.JUnit5Test" )
- .verifyTextInLog( "Running pkg.TestNGTest" );
+ .verifyTextInLog( "Running pkg.TestNGTest" )
+ .verifyTextInLog(
+ "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
}
@Test
@@ -117,6 +125,8 @@ public class Surefire1787JUnit5IT extends SurefireJUnit4IntegrationTestCase
{
unpack( "junit5-runner" )
.executeTest()
- .verifyErrorFreeLog();
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "Running pkg.JUnit5Tests" )
+ .verifyTextInLog( "Using auto detected provider org.apache.maven.surefire.junit4.JUnit4Provider" );
}
}
diff --git a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/RootTest.java b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/RootTest.java
index 74928ec..7e7e07e 100644
--- a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/RootTest.java
+++ b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/RootTest.java
@@ -2,9 +2,13 @@ package examples;
import org.junit.Test;
-class RootTest {
- @Test
- public void test() {
+import static org.junit.Assert.fail;
+class RootTest
+{
+ @Test
+ public void test()
+ {
+ fail();
}
}
diff --git a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/a/ATest.java b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/a/ATest.java
index 620f932..08c822f 100644
--- a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/a/ATest.java
+++ b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/a/ATest.java
@@ -2,9 +2,11 @@ package examples.a;
import org.junit.Test;
-public class ATest {
+public class ATest
+{
@Test
- public void test() {
-
+ public void test()
+ {
+ // ok
}
}
diff --git a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/b/BTest.java b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/b/BTest.java
index 3a36713..6395c3f 100644
--- a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/b/BTest.java
+++ b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/b/BTest.java
@@ -2,9 +2,13 @@ package examples.b;
import org.junit.Test;
-public class BTest {
- @Test
- public void test() {
+import static org.junit.Assert.fail;
+public class BTest
+{
+ @Test
+ public void test()
+ {
+ fail();
}
}