(maven-reporting-impl) 04/04: [MSHARED-1133] Switch to JUnit 5 and drop junit-addons

[slachiewicz]

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch backport1
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git

commit 846e277aeb126ec76fe24fd36054c64731b05bea
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Sun Sep 11 17:44:22 2022 +0200

    [MSHARED-1133] Switch to JUnit 5 and drop junit-addons
    
    (cherry picked from commit 4bcb9be15f66629192a829f01b7d4d3e70764d41)
---
 pom.xml                                            | 12 +++------
 .../reporting/AbstractMavenReportRendererTest.java | 29 ++++++++++++++--------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 26db453..7d09b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,15 +169,9 @@
 
     <!-- test -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit-addons</groupId>
-      <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.9.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git 
a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java 
b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
index f716677..4f29331 100644
--- 
a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
+++ 
b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
@@ -18,31 +18,39 @@
  */
 package org.apache.maven.reporting;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import junitx.util.PrivateAccessor;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test case for some public method in AbstractMavenReportRenderer.
  */
-public class AbstractMavenReportRendererTest extends TestCase {
+public class AbstractMavenReportRendererTest {
     private static List<String> applyPattern(String pattern) throws Throwable {
-        return (List<String>) PrivateAccessor.invoke(
-                AbstractMavenReportRenderer.class, "applyPattern", new Class[] 
{String.class}, new Object[] {pattern});
+        try {
+            Method method = 
AbstractMavenReportRenderer.class.getDeclaredMethod("applyPattern", 
String.class);
+            method.setAccessible(true);
+            return (List<String>) method.invoke(null, pattern);
+        } catch (InvocationTargetException ite) {
+            throw ite.getTargetException();
+        }
     }
 
     private static void checkPattern(String pattern, String[] expectedResult) 
throws Throwable {
         List<String> result = applyPattern(pattern);
-        Assert.assertEquals("result size", expectedResult.length, 
result.size());
+        assertEquals(expectedResult.length, result.size(), "result size");
         int i = 0;
         for (Iterator<String> it = result.iterator(); it.hasNext(); ) {
             String name = it.next();
             String href = it.next();
-            Assert.assertEquals(expectedResult[i], name);
-            Assert.assertEquals(expectedResult[i + 1], href);
+            assertEquals(expectedResult[i], name);
+            assertEquals(expectedResult[i + 1], href);
             i += 2;
         }
     }
@@ -50,7 +58,7 @@ public class AbstractMavenReportRendererTest extends TestCase 
{
     private static void checkPatternIllegalArgument(String cause, String 
pattern) throws Throwable {
         try {
             applyPattern(pattern);
-            Assert.fail(cause + " should throw an IllegalArgumentException");
+            fail(cause + " should throw an IllegalArgumentException");
         } catch (IllegalArgumentException iae) {
             // ok
         }
@@ -59,6 +67,7 @@ public class AbstractMavenReportRendererTest extends TestCase 
{
     /**
      * @throws Throwable if any
      */
+    @Test
     public void testApplyPattern() throws Throwable {
         // the most simple test
         checkPattern("test {text,url}", new String[] {"test ", null, "text", 
"url"});