HDFS-12431. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-hdfs Part13. (#7890) Contributed by Hualong Zhang.

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

Signed-off-by: Shilun Fan <[email protected]>

Author: zhtttylz

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/AclTestHelpers.java

@@ -17,8 +17,6 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
-import static org.junit.Assert.*;
-
 import java.io.IOException;
 
 import org.apache.hadoop.fs.FileStatus;
@@ -33,6 +31,9 @@
 import org.apache.hadoop.security.AccessControlException;
 import org.apache.hadoop.security.UserGroupInformation;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 /**
  * Helper methods useful for writing ACL tests.
  */

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSAclBaseTest.java

@@ -17,9 +17,9 @@
  */
 package org.apache.hadoop.hdfs.server.namenode;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -445,7 +445,7 @@ public static void assertFileContentsDifferent(
   public static Map<File, String> getFileMD5s(File... files) throws Exception {
     Map<File, String> ret = Maps.newHashMap();
     for (File f : files) {
-      assertTrue("Must exist: " + f, f.exists());
+      assertTrue(f.exists(), "Must exist: " + f);
       ret.put(f, getFileMD5(f));
     }
     return ret;
@@ -514,7 +514,7 @@ public static void assertNNHasCheckpoints(MiniDFSCluster cluster,
       for (long checkpointTxId : txids) {
         File image = new File(nameDir,
                               NNStorage.getImageFileName(checkpointTxId));
-        assertTrue("Expected non-empty " + image, image.length() > 0);
+        assertTrue(image.length() > 0, "Expected non-empty " + image);
       }
     }
   }
@@ -531,7 +531,7 @@ public static void assertNNHasRollbackCheckpoints(MiniDFSCluster cluster,
       for (long checkpointTxId : txids) {
         File image = new File(nameDir,
             NNStorage.getRollbackImageFileName(checkpointTxId));
-        assertTrue("Expected non-empty " + image, image.length() > 0);
+        assertTrue(image.length() > 0, "Expected non-empty " + image);
       }
     }
   }