[SUREFIRE-2026] Improve assertions in Surefire1787JUnit5IT

apache · Feb 25, 2022 · 778de43 · 778de43
1 parent 3c207f5
commit 778de43
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 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
@@ -20,22 +20,14 @@
  */
 
 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 void bothEngines()
             .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 void apiAndEngine()
             .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 void bothApis()
             .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 void selectJUnit4()
             .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 void selectJUnit5()
             .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 void testNgWithJupiterApi()
             .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,14 +115,18 @@ public void testNgWithJupiterEngine()
             .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
     public void junit4Runner()
     {
         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
@@ -2,9 +2,13 @@
 
 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
@@ -2,9 +2,11 @@
 
 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
@@ -2,9 +2,13 @@
 
 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();
     }
 }