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

Author: fanshilun

hadoop-common-project/hadoop-common/pom.xml

@@ -381,6 +381,26 @@
       <artifactId>lz4-java</artifactId>
       <scope>provided</scope>
     </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-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextTestHelper.java

@@ -26,10 +26,7 @@
 import org.apache.hadoop.fs.Options.CreateOpts.BlockSize;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.test.GenericTestUtils;
-
-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 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());
   }
 }

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

@@ -28,10 +28,7 @@
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.security.AccessControlException;
-
-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 org.junit.Assert;
 
 /**
  * Helper class for unit tests.
@@ -172,29 +169,29 @@ public FileStatus containsPath(String path, FileStatus[] dirList)
   public void checkFileStatus(String path, fileType expectedType)
       throws IOException {
     FileStatus s = fc.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(fc.makeQualified(new Path(path)), s.getPath());
+    Assert.assertEquals(fc.makeQualified(new Path(path)), s.getPath());
   }
 
   public void checkFileLinkStatus(String path, fileType expectedType)
       throws IOException {
     FileStatus s = fc.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(fc.makeQualified(new Path(path)), s.getPath());
+    Assert.assertEquals(fc.makeQualified(new Path(path)), s.getPath());
   }
 
   //

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

@@ -25,10 +25,9 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.test.GenericTestUtils;
+import org.junit.Assert;
 
-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 static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -242,15 +241,15 @@ public enum fileType {isDir, isFile, isSymlink};
   public static void checkFileStatus(FileSystem aFs, String path,
       fileType expectedType) throws IOException {
     FileStatus s = aFs.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(aFs.makeQualified(new Path(path)), s.getPath());
+    Assert.assertEquals(aFs.makeQualified(new Path(path)), s.getPath());
   }
 
   /**

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

@@ -29,7 +29,7 @@
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.security.AccessControlException;
 import org.apache.hadoop.util.Progressable;
-import org.junit.jupiter.api.Assertions;
+import org.junit.Assert;
 
 /**
  * Helper class for unit tests.
@@ -170,29 +170,29 @@ public FileStatus containsPath(String path, FileStatus[] dirList)
   public void checkFileStatus(String path, fileType expectedType)
       throws IOException {
     FileStatus s = fs.getFileStatus(new Path(path));
-    Assertions.assertNotNull(s);
+    Assert.assertNotNull(s);
     if (expectedType == fileType.isDir) {
-      Assertions.assertTrue(s.isDirectory());
+      Assert.assertTrue(s.isDirectory());
     } else if (expectedType == fileType.isFile) {
-      Assertions.assertTrue(s.isFile());
+      Assert.assertTrue(s.isFile());
     } else if (expectedType == fileType.isSymlink) {
-      Assertions.assertTrue(s.isSymlink());
+      Assert.assertTrue(s.isSymlink());
     }
-    Assertions.assertEquals(fs.makeQualified(new Path(path)), s.getPath());
+    Assert.assertEquals(fs.makeQualified(new Path(path)), s.getPath());
   }
 
   public void checkFileLinkStatus(String path, fileType expectedType)
       throws IOException {
     FileStatus s = fs.getFileLinkStatus(new Path(path));
-    Assertions.assertNotNull(s);
+    Assert.assertNotNull(s);
     if (expectedType == fileType.isDir) {
-      Assertions.assertTrue(s.isDirectory());
+      Assert.assertTrue(s.isDirectory());
     } else if (expectedType == fileType.isFile) {
-      Assertions.assertTrue(s.isFile());
+      Assert.assertTrue(s.isFile());
     } else if (expectedType == fileType.isSymlink) {
-      Assertions.assertTrue(s.isSymlink());
+      Assert.assertTrue(s.isSymlink());
     }
-    Assertions.assertEquals(fs.makeQualified(new Path(path)), s.getPath());
+    Assert.assertEquals(fs.makeQualified(new Path(path)), s.getPath());
   }
 
   //

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

@@ -25,7 +25,7 @@
 import org.apache.hadoop.test.GenericTestUtils;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestAvroFSInput {
 

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

@@ -29,7 +29,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class TestChecksumFileSystem {
   static final String TEST_ROOT_DIR =

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

@@ -17,8 +17,7 @@
  */
 package org.apache.hadoop.fs;
 
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -17,8 +17,10 @@
  */
 package org.apache.hadoop.fs;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.DataInput;
 import java.io.DataOutput;

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

@@ -18,8 +18,8 @@
 package org.apache.hadoop.fs;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -34,8 +34,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 public class TestDFVariations {
   private static final String TEST_ROOT_DIR =
       GenericTestUtils.getTestDir("testdfvariations").getAbsolutePath();
@@ -165,12 +163,11 @@ public void testGetMountCurrentDirectory() throws Exception {
     DF df = new DF(new File(workingDir), 0L);
     String mountPath = df.getMount();
     File mountDir = new File(mountPath);
-    assertTrue(
-        mountDir.exists(), "Mount dir ["+mountDir.getAbsolutePath()+"] should exist.");
-    assertTrue(
-        mountDir.isDirectory(), "Mount dir ["+mountDir.getAbsolutePath()+"] should be directory.");
-    assertTrue(
-       workingDir.startsWith(mountPath), "Working dir ["+workingDir+"] should start with ["+mountPath+"].");
+    assertTrue(mountDir.exists(), "Mount dir ["+mountDir.getAbsolutePath()+"] should exist.");
+    assertTrue(mountDir.isDirectory(), 
+        "Mount dir ["+mountDir.getAbsolutePath()+"] should be directory.");
+    assertTrue(workingDir.startsWith(mountPath), 
+        "Working dir ["+workingDir+"] should start with ["+mountPath+"].");
   }
 }