HDFS-12431. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-hdfs Part17. (#7934)

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

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

Author: zhtttylz

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java

@@ -22,9 +22,9 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileUtil;
@@ -35,7 +35,7 @@
 import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
 import org.apache.hadoop.test.GenericTestUtils;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestBalancerHttpServer {
   private static final String BASEDIR =
@@ -45,7 +45,7 @@ public class TestBalancerHttpServer {
   private static Configuration conf;
   private static URLConnectionFactory connectionFactory;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     conf = new Configuration();
     conf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, HttpConfig.Policy.HTTP_ONLY.name());
@@ -60,7 +60,7 @@ public static void setUp() throws Exception {
     connectionFactory = URLConnectionFactory.newDefaultURLConnectionFactory(conf);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
     FileUtil.fullyDelete(new File(BASEDIR));
     KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir);

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancerHttpServer.java

@@ -50,8 +50,9 @@
 import org.apache.hadoop.metrics2.MetricsSystem;
 import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.test.GenericTestUtils;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
@@ -77,8 +78,8 @@
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY;
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_LAZY_PERSIST_FILE_SCRUB_INTERVAL_SEC;
 import static org.apache.hadoop.test.PlatformAssumptions.assumeNotWindows;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Some long running Balancer tasks.
@@ -101,7 +102,7 @@ public class TestBalancerLongRunningTasks {
   private final static Path FILE_PATH = new Path(FILE_NAME);
   private MiniDFSCluster cluster;
 
-  @After
+  @AfterEach
   public void shutdown() throws Exception {
     if (cluster != null) {
       cluster.shutdown();
@@ -159,7 +160,8 @@ static void initConfWithRamDisk(Configuration conf,
    * Replica in (DN0,SSD) should not be moved to (DN1,SSD).
    * Otherwise DN1 has 2 replicas.
    */
-  @Test(timeout = 100000)
+  @Test
+  @Timeout(value = 100)
   public void testTwoReplicaShouldNotInSameDN() throws Exception {
     final Configuration conf = new HdfsConfiguration();
 
@@ -218,7 +220,8 @@ public void testTwoReplicaShouldNotInSameDN() throws Exception {
    * One DN has two files on RAM_DISK, other DN has no files on RAM_DISK.
    * Then verify that the balancer does not migrate files on RAM_DISK across DN.
    */
-  @Test(timeout = 300000)
+  @Test
+  @Timeout(value = 300)
   public void testBalancerWithRamDisk() throws Exception {
     final int seed = 0xFADED;
     final short replicationFactor = 1;
@@ -285,7 +288,8 @@ public void testBalancerWithRamDisk() throws Exception {
   /**
    * Balancer should not move blocks with size < minBlockSize.
    */
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testMinBlockSizeAndSourceNodes() throws Exception {
     final Configuration conf = new HdfsConfiguration();
     initConf(conf);
@@ -405,7 +409,8 @@ public void testMinBlockSizeAndSourceNodes() throws Exception {
    *
    * @throws Exception
    */
-  @Test(timeout = 100000)
+  @Test
+  @Timeout(value = 100)
   public void testUpgradeDomainPolicyAfterBalance() throws Exception {
     final Configuration conf = new HdfsConfiguration();
     initConf(conf);
@@ -425,7 +430,8 @@ public void testUpgradeDomainPolicyAfterBalance() throws Exception {
    *
    * @throws Exception
    */
-  @Test(timeout = 100000)
+  @Test
+  @Timeout(value = 100)
   public void testRackPolicyAfterBalance() throws Exception {
     final Configuration conf = new HdfsConfiguration();
     initConf(conf);
@@ -505,7 +511,8 @@ private void runBalancerAndVerifyBlockPlacmentPolicy(Configuration conf,
    *
    * @throws Exception
    */
-  @Test(timeout = 100000)
+  @Test
+  @Timeout(value = 100)
   public void testBalancerWithPinnedBlocks() throws Exception {
     // This test assumes stick-bit based block pin mechanism available only
     // in Linux/Unix. It can be unblocked on Windows when HDFS-7759 is ready to
@@ -559,7 +566,8 @@ public void testBalancerWithPinnedBlocks() throws Exception {
     assertEquals(ExitStatus.NO_MOVE_PROGRESS.getExitCode(), r);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testBalancerWithSortTopNodes() throws Exception {
     final Configuration conf = new HdfsConfiguration();
     initConf(conf);
@@ -666,16 +674,17 @@ public void testBalancerWithSortTopNodes() throws Exception {
     // Hence, overall total blocks moved by HDFS balancer would be either of these 2 options:
     // a) 2 blocks of total size (100B + 100B)
     // b) 3 blocks of total size (50B + 100B + 100B)
-    assertTrue("BalancerResult is not as expected. " + balancerResult,
-        (balancerResult.getBytesAlreadyMoved() == 200
+    assertTrue((balancerResult.getBytesAlreadyMoved() == 200
             && balancerResult.getBlocksMoved() == 2)
             || (balancerResult.getBytesAlreadyMoved() == 250
-            && balancerResult.getBlocksMoved() == 3));
+            && balancerResult.getBlocksMoved() == 3),
+        "BalancerResult is not as expected. " + balancerResult);
     // 100% and 95% used nodes will be balanced, so top used will be 900
     assertEquals(900, maxUsage);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testBalancerWithLimitOverUtilizedNum() throws Exception {
     final Configuration conf = new HdfsConfiguration();
     // Init the config (block size to 100)
@@ -762,12 +771,14 @@ public void testBalancerWithLimitOverUtilizedNum() throws Exception {
       }
       // The maxUsage value is 950, only 100% of the nodes will be balanced
       assertEquals(950, maxUsage);
-      assertTrue("BalancerResult is not as expected. " + balancerResult,
-          (balancerResult.getBytesAlreadyMoved() == 100 && balancerResult.getBlocksMoved() == 1));
+      assertTrue(
+          (balancerResult.getBytesAlreadyMoved() == 100 && balancerResult.getBlocksMoved() == 1),
+          "BalancerResult is not as expected. " + balancerResult);
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testBalancerMetricsDuplicate() throws Exception {
     final Configuration conf = new HdfsConfiguration();
     // Init the config (block size to 100)
@@ -824,7 +835,8 @@ public void testBalancerMetricsDuplicate() throws Exception {
     }
   }
 
-  @Test(timeout = 100000)
+  @Test
+  @Timeout(value = 100)
   public void testMaxIterationTime() throws Exception {
     final Configuration conf = new HdfsConfiguration();
     initConf(conf);
@@ -881,8 +893,8 @@ public void testMaxIterationTime() throws Exception {
           // (highly unlikely) and then a block is moved unexpectedly,
           // IN_PROGRESS will be reported. This is highly unlikely unexpected
           // case. See HDFS-15989.
-          assertEquals("We expect ExitStatus.NO_MOVE_PROGRESS to be reported.",
-              ExitStatus.NO_MOVE_PROGRESS, r.getExitStatus());
+          assertEquals(ExitStatus.NO_MOVE_PROGRESS, r.getExitStatus(),
+              "We expect ExitStatus.NO_MOVE_PROGRESS to be reported.");
           assertEquals(0, r.getBlocksMoved());
         }
       } finally {

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancerLongRunningTasks.java

@@ -18,29 +18,27 @@
 package org.apache.hadoop.hdfs.server.balancer;
 
 import org.apache.hadoop.hdfs.DFSConfigKeys;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * The Balancer ensures that it disperses RPCs to the NameNode
  * in order to avoid NN's RPC queue saturation.
  */
+@Timeout(100)
 public class TestBalancerRPCDelay {
-  @Rule
-  public Timeout globalTimeout = Timeout.seconds(100);
 
   private TestBalancer testBalancer;
 
-  @Before
+  @BeforeEach
   public void setup() {
     testBalancer = new TestBalancer();
     testBalancer.setup();
   }
 
-  @After
+  @AfterEach
   public void teardown() throws Exception {
     if (testBalancer != null) {
       testBalancer.shutdown();

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancerRPCDelay.java

@@ -35,17 +35,18 @@
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.VersionInfo;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.lang.management.ManagementFactory;
 import java.util.concurrent.TimeUnit;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test balancer run as a service.
@@ -124,7 +125,8 @@ public void run() {
    * should balance succeed but not exit, then make the cluster imbalanced and
    * wait for balancer to balance it again
    */
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testBalancerServiceBalanceTwice() throws Exception {
     Configuration conf = new HdfsConfiguration();
     conf.setTimeDuration(DFSConfigKeys.DFS_BALANCER_SERVICE_INTERVAL_KEY, 5,
@@ -174,7 +176,8 @@ public void testBalancerServiceBalanceTwice() throws Exception {
     }
   }
 
-  @Test(timeout = 120000)
+  @Test
+  @Timeout(value = 120)
   public void testBalancerServiceOnError() throws Exception {
     Configuration conf = new HdfsConfiguration();
     // retry for every 5 seconds
@@ -217,7 +220,8 @@ public void testBalancerServiceOnError() throws Exception {
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60)
   public void testBalancerServiceMetrics() throws Exception {
     Configuration conf = new HdfsConfiguration();
     conf.setTimeDuration(DFSConfigKeys.DFS_BALANCER_SERVICE_INTERVAL_KEY, 5, TimeUnit.SECONDS);

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancerService.java

@@ -20,30 +20,34 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.HdfsConfiguration;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class TestBalancerWithEncryptedTransfer {
 
   private final Configuration conf = new HdfsConfiguration();
 
-  @Before
+  @BeforeEach
   public void setUpConf() {
     conf.setBoolean(DFSConfigKeys.DFS_ENCRYPT_DATA_TRANSFER_KEY, true);
     conf.setBoolean(DFSConfigKeys.DFS_BLOCK_ACCESS_TOKEN_ENABLE_KEY, true);
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testEncryptedBalancer0() throws Exception {
     new TestBalancer().testBalancer0Internal(conf);
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testEncryptedBalancer1() throws Exception {
     new TestBalancer().testBalancer1Internal(conf);
   }
 
-  @Test(timeout=60000)
+  @Test
+  @Timeout(value = 60)
   public void testEncryptedBalancer2() throws Exception {
     new TestBalancer().testBalancer2Internal(conf);
   }