Use newer version of surefire for itself testing, enable JUnit 5 in tests

Author: slawekjaranowski

maven-failsafe-plugin/pom.xml

@@ -109,8 +109,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -151,16 +151,13 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
-          <includes>
-            <include>**/JUnit4SuiteTest.java</include>
-          </includes>
         </configuration>
         <dependencies>
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.5.0</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+            <version>3.5.2</version>
           </dependency>
         </dependencies>
       </plugin>

maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/IntegrationTestMojoTest.java

@@ -25,8 +25,8 @@
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.project.MavenProject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,11 +36,11 @@
 /**
  * @since 2.20
  */
-public class IntegrationTestMojoTest {
+class IntegrationTestMojoTest {
     private IntegrationTestMojo mojo;
 
-    @Before
-    public void init() throws InvalidVersionSpecificationException, IOException {
+    @BeforeEach
+    void init() throws InvalidVersionSpecificationException, IOException {
         Artifact artifact = new DefaultArtifact("g", "a", createFromVersionSpec("1.0"), "compile", "jar", "", null);
         artifact.setFile(new File("./target/tmp/a-1.0.jar"));
         new File("./target/tmp").mkdir();
@@ -52,47 +52,47 @@ public void init() throws InvalidVersionSpecificationException, IOException {
     }
 
     @Test
-    public void shouldBeJar() {
+    void shouldBeJar() {
         mojo.setDefaultClassesDirectory(new File("./target/classes"));
         File binaries = mojo.getMainBuildPath();
         assertThat(binaries.getName()).isEqualTo("a-1.0.jar");
     }
 
     @Test
-    public void shouldBeAnotherJar() {
+    void shouldBeAnotherJar() {
         mojo.setMainBuildPath(new File("./target/another-1.0.jar"));
         mojo.setDefaultClassesDirectory(new File("./target/classes"));
         File binaries = mojo.getMainBuildPath();
         assertThat(binaries.getName()).isEqualTo("another-1.0.jar");
     }
 
     @Test
-    public void shouldBeClasses() {
+    void shouldBeClasses() {
         mojo.setMainBuildPath(new File("./target/classes"));
         mojo.setDefaultClassesDirectory(new File("./target/classes"));
         File binaries = mojo.getMainBuildPath();
         assertThat(binaries.getName()).isEqualTo("classes");
     }
 
     @Test
-    public void shouldGetNullEnv() {
+    void shouldGetNullEnv() {
         assertThat(mojo.getExcludedEnvironmentVariables()).hasSize(0);
     }
 
     @Test
-    public void shouldGetEnv() {
+    void shouldGetEnv() {
         mojo.setExcludedEnvironmentVariables(new String[] {"ABC", "KLM"});
         assertThat(mojo.getExcludedEnvironmentVariables()).hasSize(2).contains("ABC", "KLM");
     }
 
     @Test
-    public void testShouldGetPropertyFile() {
+    void testShouldGetPropertyFile() {
         mojo.setSystemPropertiesFile(new File("testShouldGetPropertyFile"));
         assertThat(mojo.getSystemPropertiesFile()).isEqualTo(new File("testShouldGetPropertyFile"));
     }
 
     @Test
-    public void shouldHaveJUnit5EnginesFilter() {
+    void shouldHaveJUnit5EnginesFilter() {
         mojo.setIncludeJUnit5Engines(new String[] {"e1", "e2"});
         assertThat(mojo.getIncludeJUnit5Engines()).isEqualTo(new String[] {"e1", "e2"});
 

maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/JUnit4SuiteTest.java

@@ -23,16 +23,16 @@
 import org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils;
 import org.apache.maven.surefire.api.suite.RunResult;
 import org.apache.maven.surefire.api.util.SureFireFileManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  *
  */
-public class MarshallerUnmarshallerTest {
+class MarshallerUnmarshallerTest {
     @Test
-    public void shouldUnmarshallExistingXmlFile() throws Exception {
+    void shouldUnmarshallExistingXmlFile() throws Exception {
         File xml = new File("target/test-classes/org/apache/maven/plugin/failsafe/failsafe-summary.xml");
         RunResult summary = FailsafeSummaryXmlUtils.toRunResult(xml);
 
@@ -56,7 +56,7 @@ public void shouldUnmarshallExistingXmlFile() throws Exception {
     }
 
     @Test
-    public void shouldMarshallAndUnmarshallSameXml() throws Exception {
+    void shouldMarshallAndUnmarshallSameXml() throws Exception {
         RunResult expected = new RunResult(
                 7,
                 1,

maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java

@@ -27,7 +27,7 @@
 import org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils;
 import org.apache.maven.surefire.api.suite.RunResult;
 import org.apache.maven.surefire.api.util.SureFireFileManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -37,10 +37,10 @@
  * @since 2.20
  */
 @SuppressWarnings("checkstyle:magicnumber")
-public class RunResultTest {
+class RunResultTest {
 
     @Test
-    public void testAggregatedValues() {
+    void testAggregatedValues() {
         RunResult simple = getSimpleAggregate();
 
         assertThat(simple.getCompletedCount()).isEqualTo(20);
@@ -55,27 +55,27 @@ public void testAggregatedValues() {
     }
 
     @Test
-    public void testSerialization() throws Exception {
+    void testSerialization() throws Exception {
         writeReadCheck(getSimpleAggregate());
     }
 
     @Test
-    public void testFailures() throws Exception {
+    void testFailures() throws Exception {
         writeReadCheck(new RunResult(0, 1, 2, 3, "stacktraceHere", false));
     }
 
     @Test
-    public void testSkipped() throws Exception {
+    void testSkipped() throws Exception {
         writeReadCheck(new RunResult(3, 2, 1, 0, null, true));
     }
 
     @Test
-    public void testFlakes() throws Exception {
+    void testFlakes() throws Exception {
         writeReadCheck(new RunResult(3, 2, 1, 0, 2, null, true));
     }
 
     @Test
-    public void testLegacyDeserialization() throws Exception {
+    void testLegacyDeserialization() throws Exception {
         File legacySummary = SureFireFileManager.createTempFile("failsafe", "test");
         String legacyFailsafeSummaryXmlTemplate = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 + "<failsafe-summary xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
@@ -113,7 +113,7 @@ public void testLegacyDeserialization() throws Exception {
     }
 
     @Test
-    public void testAppendSerialization() throws Exception {
+    void testAppendSerialization() throws Exception {
         RunResult simpleAggregate = getSimpleAggregate();
         RunResult additional = new RunResult(2, 1, 2, 2, "msg " + ((char) 0x0E01), true);
 

maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java

@@ -27,27 +27,27 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.Logger;
 
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class VerifyMojoTest {
+class VerifyMojoTest {
     private VerifyMojo mojo;
 
-    @Rule
-    public TemporaryFolder tempFolder = new TemporaryFolder();
+    @TempDir
+    private File tempFolder;
 
     private Logger logger = mock(Logger.class);
 
-    @Before
-    public void init() throws UnsupportedEncodingException {
+    @BeforeEach
+    void init() throws UnsupportedEncodingException {
         mojo = new VerifyMojo(logger);
-        mojo.setTestClassesDirectory(tempFolder.getRoot());
+        mojo.setTestClassesDirectory(tempFolder);
         mojo.setReportsDirectory(getTestBaseDir());
     }
 
@@ -71,26 +71,25 @@ private File getTestBaseDir() throws UnsupportedEncodingException {
         return new File(URLDecoder.decode(resource.getPath(), "UTF-8")).getAbsoluteFile();
     }
 
-    @Test(expected = MojoExecutionException.class)
-    public void executeForForkError()
-            throws MojoExecutionException, MojoFailureException, UnsupportedEncodingException {
+    @Test
+    void executeForForkError() throws UnsupportedEncodingException {
         setupExecuteMocks();
         mojo.setSummaryFile(new File(getTestBaseDir(), "failsafe-summary-booter-fork-error.xml"));
-        mojo.execute();
+
+        assertThatCode(mojo::execute).isExactlyInstanceOf(MojoExecutionException.class);
     }
 
-    @Test(expected = MojoExecutionException.class)
-    public void executeForForkErrorTestFailureIgnore()
-            throws MojoExecutionException, MojoFailureException, UnsupportedEncodingException {
+    @Test
+    void executeForForkErrorTestFailureIgnore() throws UnsupportedEncodingException {
         setupExecuteMocks();
         mojo.setSummaryFile(new File(getTestBaseDir(), "failsafe-summary-booter-fork-error.xml"));
         mojo.setTestFailureIgnore(true);
-        mojo.execute();
+
+        assertThatCode(mojo::execute).isExactlyInstanceOf(MojoExecutionException.class);
     }
 
     @Test
-    public void executeForPassingTests()
-            throws MojoExecutionException, MojoFailureException, UnsupportedEncodingException {
+    void executeForPassingTests() throws MojoExecutionException, MojoFailureException, UnsupportedEncodingException {
         setupExecuteMocks();
         mojo.setSummaryFile(new File(getTestBaseDir(), "failsafe-summary-success.xml"));
         mojo.execute();

maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/VerifyMojoTest.java

@@ -133,6 +133,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -201,9 +207,6 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>${jvm.args.tests}</argLine>
-          <includes>
-            <include>**/JUnit4SuiteTest.java</include>
-          </includes>
           <systemPropertyVariables>
             <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
           </systemPropertyVariables>
@@ -212,8 +215,8 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shadefire</artifactId>
-            <version>3.5.0</version>
             <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+            <version>3.5.2</version>
           </dependency>
         </dependencies>
       </plugin>

maven-surefire-common/pom.xml

@@ -44,6 +44,7 @@
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResolutionException;
 import org.eclipse.aether.resolution.DependencyResult;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -105,6 +106,7 @@ public void shouldBeFailWithinRange() throws InvalidVersionSpecificationExceptio
     }
 
     @Test
+    @Ignore("old not executing tests - to review")
     public void testResolveArtifact()
             throws InvalidVersionSpecificationException, MojoExecutionException, DependencyResolutionException {