You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/09/11 16:46:38 UTC
[maven-reporting-impl] 01/01: [MSHARED-1133] Switch to JUnit 5 and drop junit-addons
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSHARED-1133
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit b10cc55f6086cf409d0759897195f11eeb69d5f2
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 11 17:44:22 2022 +0200
[MSHARED-1133] Switch to JUnit 5 and drop junit-addons
---
pom.xml | 12 +++------
.../reporting/AbstractMavenReportRendererTest.java | 30 ++++++++++++++--------
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4760b73..9d13c55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,15 +146,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 cdb9299..8835476 100644
--- a/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
+++ b/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
@@ -19,37 +19,46 @@ package org.apache.maven.reporting;
* under the License.
*/
+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
{
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;
}
}
@@ -59,7 +68,7 @@ public class AbstractMavenReportRendererTest
try
{
applyPattern( pattern );
- Assert.fail( cause + " should throw an IllegalArgumentException" );
+ fail( cause + " should throw an IllegalArgumentException" );
}
catch ( IllegalArgumentException iae )
{
@@ -70,6 +79,7 @@ public class AbstractMavenReportRendererTest
/**
* @throws Throwable if any
*/
+ @Test
public void testApplyPattern() throws Throwable
{
// the most simple test