HDFS-12431. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-hdfs Part4.

Author: zhtttylz

hadoop-hdfs-project/hadoop-hdfs/pom.xml

@@ -241,26 +241,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestAdminHelper.java

@@ -17,8 +17,10 @@
  */
 package org.apache.hadoop.hdfs.tools;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test class to test Admin Helper.
@@ -28,11 +30,10 @@ public class TestAdminHelper {
   @Test
   public void prettifyExceptionWithNpe() {
     String pretty = AdminHelper.prettifyException(new NullPointerException());
-    Assert.assertTrue(
+    assertTrue(pretty.startsWith("NullPointerException at org.apache.hadoop.hdfs.tools"
+            + ".TestAdminHelper.prettifyExceptionWithNpe"),
         "Prettified exception message doesn't contain the required exception "
-            + "message",
-        pretty.startsWith("NullPointerException at org.apache.hadoop.hdfs.tools"
-            + ".TestAdminHelper.prettifyExceptionWithNpe"));
+            + "message");
   }
 
   @Test
@@ -42,7 +43,7 @@ public void prettifyException() {
         new IllegalArgumentException("Something is wrong",
             new IllegalArgumentException("Something is illegal")));
 
-    Assert.assertEquals(
+    assertEquals(
         "IllegalArgumentException: Something is wrong",
         pretty);