Migrate to JUnit 5 - avoid using TestCase (#11547)

* Migrate to JUnit 5 - avoid using TestCase

Only simply migration to remove usage of JUnit 3 - TestCase
More improvements to tests can be done in the future.

Author: slawekjaranowski

apache-maven/pom.xml

@@ -96,6 +96,11 @@ under the License.
       <groupId>org.fusesource.jansi</groupId>
       <artifactId>jansi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <pluginRepositories>

apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java

@@ -19,28 +19,32 @@
 package org.apache.maven.settings;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
-import junit.framework.TestCase;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests that the global settings.xml shipped with the distribution is in good state.
  *
  * @author Benjamin Bentmann
  */
-public class GlobalSettingsTest extends TestCase {
+class GlobalSettingsTest {
 
-    public void testValidGlobalSettings() throws Exception {
+    @Test
+    void testValidGlobalSettings() throws Exception {
         String basedir = System.getProperty("basedir", System.getProperty("user.dir"));
 
         File globalSettingsFile = new File(basedir, "src/conf/settings.xml");
-        assertTrue(globalSettingsFile.getAbsolutePath(), globalSettingsFile.isFile());
+        assertTrue(globalSettingsFile.isFile(), globalSettingsFile.getAbsolutePath());
 
-        try (Reader reader = new InputStreamReader(new FileInputStream(globalSettingsFile), StandardCharsets.UTF_8)) {
+        try (Reader reader =
+                new InputStreamReader(Files.newInputStream(globalSettingsFile.toPath()), StandardCharsets.UTF_8)) {
             new SettingsXpp3Reader().read(reader);
         }
     }

maven-artifact/pom.xml

@@ -35,6 +35,11 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java

@@ -22,20 +22,24 @@
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.TestCase;
 import org.apache.maven.artifact.versioning.VersionRange;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Tests {@link ArtifactUtils}.
  *
  * @author Benjamin Bentmann
  */
-public class ArtifactUtilsTest extends TestCase {
+public class ArtifactUtilsTest {
 
     private Artifact newArtifact(String aid) {
         return new DefaultArtifact("group", aid, VersionRange.createFromVersion("1.0"), "test", "jar", "tests", null);
     }
 
+    @Test
     public void testIsSnapshot() {
         assertEquals(false, ArtifactUtils.isSnapshot(null));
         assertEquals(false, ArtifactUtils.isSnapshot(""));
@@ -46,6 +50,7 @@ public void testIsSnapshot() {
         assertEquals(false, ArtifactUtils.isSnapshot("1.2.3-20090413X094722-2"));
     }
 
+    @Test
     public void testToSnapshotVersion() {
         assertEquals("1.2.3", ArtifactUtils.toSnapshotVersion("1.2.3"));
         assertEquals("1.2.3-SNAPSHOT", ArtifactUtils.toSnapshotVersion("1.2.3-SNAPSHOT"));
@@ -56,6 +61,7 @@ public void testToSnapshotVersion() {
     /**
      * Tests that the ordering of the map resembles the ordering of the input collection of artifacts.
      */
+    @Test
     public void testArtifactMapByVersionlessIdOrdering() throws Exception {
         List<Artifact> list = new ArrayList<>();
         list.add(newArtifact("b"));

maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java

@@ -18,11 +18,14 @@
  */
 package org.apache.maven.artifact;
 
-import junit.framework.TestCase;
 import org.apache.maven.artifact.handler.ArtifactHandlerMock;
 import org.apache.maven.artifact.versioning.VersionRange;
+import org.junit.jupiter.api.BeforeEach;
 
-public class DefaultArtifactTest extends TestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DefaultArtifactTest {
 
     private DefaultArtifact artifact;
 
@@ -43,8 +46,8 @@ public class DefaultArtifactTest extends TestCase {
 
     private ArtifactHandlerMock artifactHandler;
 
+    @BeforeEach
     protected void setUp() throws Exception {
-        super.setUp();
         artifactHandler = new ArtifactHandlerMock();
         versionRange = VersionRange.createFromVersion(version);
         artifact = new DefaultArtifact(groupId, artifactId, versionRange, scope, type, classifier, artifactHandler);

maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java

@@ -27,10 +27,10 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.regex.Pattern;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ComparableVersionIT {
 
@@ -52,7 +52,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
                     });
 
                     try {
-                        assertEquals("Unexpected exit code", 0, p.waitFor());
+                        assertEquals(0, p.waitFor(), "Unexpected exit code");
                     } catch (InterruptedException e) {
                         fail(e.getMessage());
                     }

maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java

@@ -20,25 +20,28 @@
 
 import java.util.Locale;
 
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test ComparableVersion.
  *
  * @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
  */
 @SuppressWarnings("unchecked")
-public class ComparableVersionTest extends TestCase {
+public class ComparableVersionTest {
     private Comparable newComparable(String version) {
         ComparableVersion ret = new ComparableVersion(version);
         String canonical = ret.getCanonical();
         String parsedCanonical = new ComparableVersion(canonical).getCanonical();
 
         System.out.println("canonical( " + version + " ) = " + canonical);
         assertEquals(
-                "canonical( " + version + " ) = " + canonical + " -> canonical: " + parsedCanonical,
                 canonical,
-                parsedCanonical);
+                parsedCanonical,
+                "canonical( " + version + " ) = " + canonical + " -> canonical: " + parsedCanonical);
 
         return ret;
     }
@@ -83,20 +86,20 @@ private void checkVersionsOrder(String[] versions) {
             Comparable low = c[i - 1];
             for (int j = i; j < versions.length; j++) {
                 Comparable high = c[j];
-                assertTrue("expected " + low + " < " + high, low.compareTo(high) < 0);
-                assertTrue("expected " + high + " > " + low, high.compareTo(low) > 0);
+                assertTrue(low.compareTo(high) < 0, "expected " + low + " < " + high);
+                assertTrue(high.compareTo(low) > 0, "expected " + high + " > " + low);
             }
         }
     }
 
     private void checkVersionsEqual(String v1, String v2) {
         Comparable c1 = newComparable(v1);
         Comparable c2 = newComparable(v2);
-        assertTrue("expected " + v1 + " == " + v2, c1.compareTo(c2) == 0);
-        assertTrue("expected " + v2 + " == " + v1, c2.compareTo(c1) == 0);
-        assertTrue("expected same hashcode for " + v1 + " and " + v2, c1.hashCode() == c2.hashCode());
-        assertTrue("expected " + v1 + ".equals( " + v2 + " )", c1.equals(c2));
-        assertTrue("expected " + v2 + ".equals( " + v1 + " )", c2.equals(c1));
+        assertTrue(c1.compareTo(c2) == 0, "expected " + v1 + " == " + v2);
+        assertTrue(c2.compareTo(c1) == 0, "expected " + v2 + " == " + v1);
+        assertTrue(c1.hashCode() == c2.hashCode(), "expected same hashcode for " + v1 + " and " + v2);
+        assertTrue(c1.equals(c2), "expected " + v1 + ".equals( " + v2 + " )");
+        assertTrue(c2.equals(c1), "expected " + v2 + ".equals( " + v1 + " )");
     }
 
     private void checkVersionsArrayEqual(String[] array) {
@@ -111,18 +114,21 @@ private void checkVersionsArrayEqual(String[] array) {
     private void checkVersionsOrder(String v1, String v2) {
         Comparable c1 = newComparable(v1);
         Comparable c2 = newComparable(v2);
-        assertTrue("expected " + v1 + " < " + v2, c1.compareTo(c2) < 0);
-        assertTrue("expected " + v2 + " > " + v1, c2.compareTo(c1) > 0);
+        assertTrue(c1.compareTo(c2) < 0, "expected " + v1 + " < " + v2);
+        assertTrue(c2.compareTo(c1) > 0, "expected " + v2 + " > " + v1);
     }
 
+    @Test
     public void testVersionsQualifier() {
         checkVersionsOrder(VERSIONS_QUALIFIER);
     }
 
+    @Test
     public void testVersionsNumber() {
         checkVersionsOrder(VERSIONS_NUMBER);
     }
 
+    @Test
     public void testVersionsEqual() {
         newComparable("1.0-alpha");
         checkVersionsEqual("1", "1");
@@ -175,6 +181,7 @@ public void testVersionsEqual() {
         checkVersionsEqual("1m3", "1MILESTONE3");
     }
 
+    @Test
     public void testVersionComparing() {
         checkVersionsOrder("1", "2");
         checkVersionsOrder("1.5", "2");
@@ -212,6 +219,7 @@ public void testVersionComparing() {
      * see Netbeans issues <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=240845">240845</a> and
      * <a href="https://netbeans.org/bugzilla/show_bug.cgi?id=226100">226100</a>
      */
+    @Test
     public void testMng5568() {
         String a = "6.1.0";
         String b = "6.1.0rc3";
@@ -225,6 +233,7 @@ public void testMng5568() {
     /**
      * Test <a href="https://jira.apache.org/jira/browse/MNG-6572">MNG-6572</a> optimization.
      */
+    @Test
     public void testMng6572() {
         String a = "20190126.230843"; // resembles a SNAPSHOT
         String b = "1234567890.12345"; // 10 digit number
@@ -243,6 +252,7 @@ public void testMng6572() {
      * Test all versions are equal when starting with many leading zeroes regardless of string length
      * (related to MNG-6572 optimization)
      */
+    @Test
     public void testVersionEqualWithLeadingZeroes() {
         // versions with string lengths from 1 to 19
         String[] arr = new String[] {
@@ -274,6 +284,7 @@ public void testVersionEqualWithLeadingZeroes() {
      * Test all "0" versions are equal when starting with many leading zeroes regardless of string length
      * (related to MNG-6572 optimization)
      */
+    @Test
     public void testVersionZeroEqualWithLeadingZeroes() {
         // versions with string lengths from 1 to 19
         String[] arr = new String[] {
@@ -305,6 +316,7 @@ public void testVersionZeroEqualWithLeadingZeroes() {
      * Test <a href="https://issues.apache.org/jira/browse/MNG-6964">MNG-6964</a> edge cases
      * for qualifiers that start with "-0.", which was showing A == C and B == C but A &lt; B.
      */
+    @Test
     public void testMng6964() {
         String a = "1-0.alpha";
         String b = "1-0.beta";
@@ -315,6 +327,7 @@ public void testMng6964() {
         checkVersionsOrder(a, b); // Should still be true
     }
 
+    @Test
     public void testLocaleIndependent() {
         Locale orig = Locale.getDefault();
         Locale[] locales = {Locale.ENGLISH, new Locale("tr"), Locale.getDefault()};
@@ -328,20 +341,22 @@ public void testLocaleIndependent() {
         }
     }
 
+    @Test
     public void testReuse() {
         ComparableVersion c1 = new ComparableVersion("1");
         c1.parseVersion("2");
 
         Comparable c2 = newComparable("2");
 
-        assertEquals("reused instance should be equivalent to new instance", c1, c2);
+        assertEquals(c1, c2, "reused instance should be equivalent to new instance");
     }
 
     /**
      * Test <a href="https://issues.apache.org/jira/browse/MNG-7644">MNG-7644</a> edge cases
      * 1.0.0.RC1 &lt; 1.0.0-RC2 and more generally:
      * 1.0.0.X1 &lt; 1.0.0-X2 for any string X
      */
+    @Test
     public void testMng7644() {
         for (String x : new String[] {"abc", "alpha", "a", "beta", "b", "def", "milestone", "m", "RC"}) {
             // 1.0.0.X1 < 1.0.0-X2 for any string x