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/conf/TestConfigRedactor.java

@@ -18,7 +18,7 @@
 
 package org.apache.hadoop.conf;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -34,8 +34,9 @@
 
 import org.apache.hadoop.fs.FileSystem.Statistics;
 import org.apache.hadoop.test.GenericTestUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.function.Supplier;
 import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles;
@@ -59,17 +60,18 @@ public abstract class FCStatisticsBaseTest {
   //fc should be set appropriately by the deriving test.
   protected static FileContext fc = null;
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testStatisticsOperations() throws Exception {
     final Statistics stats = new Statistics("file");
-    Assert.assertEquals(0L, stats.getBytesRead());
-    Assert.assertEquals(0L, stats.getBytesWritten());
-    Assert.assertEquals(0, stats.getWriteOps());
+    Assertions.assertEquals(0L, stats.getBytesRead());
+    Assertions.assertEquals(0L, stats.getBytesWritten());
+    Assertions.assertEquals(0, stats.getWriteOps());
     stats.incrementBytesWritten(1000);
-    Assert.assertEquals(1000L, stats.getBytesWritten());
-    Assert.assertEquals(0, stats.getWriteOps());
+    Assertions.assertEquals(1000L, stats.getBytesWritten());
+    Assertions.assertEquals(0, stats.getWriteOps());
     stats.incrementWriteOps(123);
-    Assert.assertEquals(123, stats.getWriteOps());
+    Assertions.assertEquals(123, stats.getWriteOps());
 
     Thread thread = new Thread() {
       @Override
@@ -79,33 +81,33 @@ public void run() {
     };
     thread.start();
     Uninterruptibles.joinUninterruptibly(thread);
-    Assert.assertEquals(124, stats.getWriteOps());
+    Assertions.assertEquals(124, stats.getWriteOps());
     // Test copy constructor and reset function
     Statistics stats2 = new Statistics(stats);
     stats.reset();
-    Assert.assertEquals(0, stats.getWriteOps());
-    Assert.assertEquals(0L, stats.getBytesWritten());
-    Assert.assertEquals(0L, stats.getBytesRead());
-    Assert.assertEquals(124, stats2.getWriteOps());
-    Assert.assertEquals(1000L, stats2.getBytesWritten());
-    Assert.assertEquals(0L, stats2.getBytesRead());
+    Assertions.assertEquals(0, stats.getWriteOps());
+    Assertions.assertEquals(0L, stats.getBytesWritten());
+    Assertions.assertEquals(0L, stats.getBytesRead());
+    Assertions.assertEquals(124, stats2.getWriteOps());
+    Assertions.assertEquals(1000L, stats2.getBytesWritten());
+    Assertions.assertEquals(0L, stats2.getBytesRead());
   }
 
   @Test
   public void testStatistics() throws IOException, URISyntaxException {
     URI fsUri = getFsUri();
     Statistics stats = FileContext.getStatistics(fsUri);
-    Assert.assertEquals(0, stats.getBytesRead());
+    Assertions.assertEquals(0, stats.getBytesRead());
     Path filePath = fileContextTestHelper .getTestRootPath(fc, "file1");
     createFile(fc, filePath, numBlocks, blockSize);
 
-    Assert.assertEquals(0, stats.getBytesRead());
+    Assertions.assertEquals(0, stats.getBytesRead());
     verifyWrittenBytes(stats);
     FSDataInputStream fstr = fc.open(filePath);
     byte[] buf = new byte[blockSize];
     int bytesRead = fstr.read(buf, 0, blockSize);
     fstr.read(0, buf, 0, blockSize);
-    Assert.assertEquals(blockSize, bytesRead);
+    Assertions.assertEquals(blockSize, bytesRead);
     verifyReadBytes(stats);
     verifyWrittenBytes(stats);
     verifyReadBytes(FileContext.getStatistics(getFsUri()));
@@ -115,7 +117,8 @@ public void testStatistics() throws IOException, URISyntaxException {
     fc.delete(filePath, true);
   }
 
-  @Test(timeout=70000)
+  @Test
+  @Timeout(value = 70)
   public void testStatisticsThreadLocalDataCleanUp() throws Exception {
     final Statistics stats = new Statistics("test");
     // create a small thread pool to test the statistics
@@ -136,8 +139,8 @@ public Boolean call() {
     // assert that the data size is exactly the number of threads
     final AtomicInteger allDataSize = new AtomicInteger(0);
     allDataSize.set(stats.getAllThreadLocalDataSize());
-    Assert.assertEquals(size, allDataSize.get());
-    Assert.assertEquals(size, stats.getReadOps());
+    Assertions.assertEquals(size, allDataSize.get());
+    Assertions.assertEquals(size, stats.getReadOps());
     // force the GC to collect the threads by shutting down the thread pool
     es.shutdownNow();
     es.awaitTermination(1, TimeUnit.MINUTES);
@@ -160,8 +163,8 @@ public Boolean get() {
             return false;
           }
         }, 500, 60*1000);
-    Assert.assertEquals(0, allDataSize.get());
-    Assert.assertEquals(size, stats.getReadOps());
+    Assertions.assertEquals(0, allDataSize.get());
+    Assertions.assertEquals(size, stats.getReadOps());
   }
 
   /**