HADOOP-19415. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-common Part7.

Author: slfan1989

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java

@@ -1001,13 +1001,13 @@ private void doTestRenameDirectoryAsNonExistentDirectory(Rename... options)
     fSys.mkdirs(dst.getParent());
 
     rename(src, dst, true, false, true, options);
-    Assert.assertFalse("Nested file1 exists",
+    Assert.assertFalse("Nested file1 exists", 
         exists(fSys, getTestRootPath(fSys, "test/hadoop/dir/file1")));
-    Assert.assertFalse("Nested file2 exists",
+    Assert.assertFalse("Nested file2 exists", 
         exists(fSys, getTestRootPath(fSys, "test/hadoop/dir/subdir/file2")));
     Assert.assertTrue("Renamed nested file1 exists",
         exists(fSys, getTestRootPath(fSys, "test/new/newdir/file1")));
-    Assert.assertTrue("Renamed nested exists",
+    Assert.assertTrue("Renamed nested exists", 
         exists(fSys, getTestRootPath(fSys, "test/new/newdir/subdir/file2")));
   }
 
@@ -1117,7 +1117,7 @@ public void testGetWrappedInputStream() throws IOException {
     FSDataInputStream in = fSys.open(src);
     InputStream is = in.getWrappedStream();
     in.close();
-    Assert.assertNotNull(is);
+    Assert.assertNotNull(is);  
   }
 
   @Test

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java

@@ -357,7 +357,7 @@ public void testListStatus() throws Exception {
     // test listStatus that returns an iterator
     RemoteIterator<FileStatus> pathsIterator = 
       fc.listStatus(getTestRootPath(fc, "test"));
-    Assert.assertEquals(getTestRootPath(fc, "test/hadoop"),
+    Assert.assertEquals(getTestRootPath(fc, "test/hadoop"), 
         pathsIterator.next().getPath());
     Assert.assertFalse(pathsIterator.hasNext());
 
@@ -1123,7 +1123,7 @@ public void testRenameDirectoryToItself() throws Exception {
       rename(src, src, true, true, Rename.OVERWRITE);
       Assert.fail("Renamed directory to itself");
     } catch (IOException e) {
-      Assert.assertTrue(unwrapException(e) instanceof FileAlreadyExistsException);
+      Assert.assertTrue(unwrapException(e) instanceof FileAlreadyExistsException);      
     }
   }
 
@@ -1169,13 +1169,13 @@ private void testRenameDirectoryAsNonExistentDirectory(Rename... options) throws
     fc.mkdir(dst.getParent(), FileContext.DEFAULT_PERM, true);
 
     rename(src, dst, false, true, options);
-    Assert.assertFalse("Nested file1 exists",
+    Assert.assertFalse("Nested file1 exists", 
         exists(fc, getTestRootPath(fc, "test/hadoop/dir/file1")));
-    Assert.assertFalse("Nested file2 exists",
+    Assert.assertFalse("Nested file2 exists", 
         exists(fc, getTestRootPath(fc, "test/hadoop/dir/subdir/file2")));
     Assert.assertTrue("Renamed nested file1 exists",
         exists(fc, getTestRootPath(fc, "test/new/newdir/file1")));
-    Assert.assertTrue("Renamed nested exists",
+    Assert.assertTrue("Renamed nested exists", 
         exists(fc, getTestRootPath(fc, "test/new/newdir/subdir/file2")));
   }
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java

@@ -17,10 +17,6 @@
  */
 package org.apache.hadoop.fs;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.FileNotFoundException;
@@ -30,6 +26,7 @@
 import org.apache.hadoop.fs.Options.CreateOpts.BlockSize;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.test.GenericTestUtils;
+import org.junit.Assert;
 
 /**
  * Helper class for unit tests.
@@ -223,28 +220,28 @@ public enum fileType {isDir, isFile, isSymlink};
   public static void checkFileStatus(FileContext aFc, String path,
       fileType expectedType) throws IOException {
     FileStatus s = aFc.getFileStatus(new Path(path));
-    assertNotNull(s);
+    Assert.assertNotNull(s);
     if (expectedType == fileType.isDir) {
-      assertTrue(s.isDirectory());
+      Assert.assertTrue(s.isDirectory());
     } else if (expectedType == fileType.isFile) {
-      assertTrue(s.isFile());
+      Assert.assertTrue(s.isFile());
     } else if (expectedType == fileType.isSymlink) {
-      assertTrue(s.isSymlink());
+      Assert.assertTrue(s.isSymlink());
     }
-    assertEquals(aFc.makeQualified(new Path(path)), s.getPath());
+    Assert.assertEquals(aFc.makeQualified(new Path(path)), s.getPath());
   }
 
   public static void checkFileLinkStatus(FileContext aFc, String path,
       fileType expectedType) throws IOException {
     FileStatus s = aFc.getFileLinkStatus(new Path(path));
-    assertNotNull(s);
+    Assert.assertNotNull(s);
     if (expectedType == fileType.isDir) {
-      assertTrue(s.isDirectory());
+      Assert.assertTrue(s.isDirectory());
     } else if (expectedType == fileType.isFile) {
-      assertTrue(s.isFile());
+      Assert.assertTrue(s.isFile());
     } else if (expectedType == fileType.isSymlink) {
-      assertTrue(s.isSymlink());
+      Assert.assertTrue(s.isSymlink());
     }
-    assertEquals(aFc.makeQualified(new Path(path)), s.getPath());
+    Assert.assertEquals(aFc.makeQualified(new Path(path)), s.getPath());
   }
 }