[MSHARED-1152] - Migrate tests to JUnit5

apache · Oct 25, 2022 · 6c26c63 · 6c26c63
1 parent 24550e3
commit 6c26c63
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 76 deletions.
diff --git a/pom.xml b/pom.xml
@@ -72,6 +72,18 @@ under the License.
     <project.build.outputTimestamp>2022-04-05T18:45:23Z</project.build.outputTimestamp>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.9.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -84,9 +96,8 @@ under the License.
       <version>1</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
@@ -20,7 +20,6 @@
  */
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -30,9 +29,9 @@
 
 import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DefaultInvokerTest
 {
@@ -121,7 +120,7 @@ public void testSpacePom()
         request.setDebug( true );
         request.setGoals( Collections.singletonList( "clean" ) );
         request.setProperties( getProperties() );
-        
+
         InvocationResult result = invoker.execute( request );
 
         assertEquals( 0, result.getExitCode() );
@@ -344,7 +343,7 @@ private void logTestStart()
 
         System.out.println( "Starting: " + element.getMethodName() );
     }
-    
+
     private Properties getProperties()
     {
         Properties properties = new Properties();
@@ -353,7 +352,7 @@ private Properties getProperties()
             properties.put( "maven.compiler.source", "1.7" );
             properties.put( "maven.compiler.target", "1.7" );
         }
-        
+
         String httpProtocols = System.getProperty( "https.protocols" );
         if ( httpProtocols != null )
         {