From 778de43fddb6a038575393b651213eab0eb16bc5 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Wed, 23 Feb 2022 22:09:33 +0100 Subject: [PATCH] [SUREFIRE-2026] Improve assertions in Surefire1787JUnit5IT --- .../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 0a493f50c4..3e7e056b53 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 @@ */ 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,7 +115,9 @@ 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 @@ -117,6 +125,8 @@ 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 index 74928ec892..7e7e07e28b 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 @@ 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 620f93243a..08c822f4fd 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 @@ 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 3a36713d7d..6395c3f816 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 @@ 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(); } }