HDFS-17720.[JDK17] Upgrade JUnit from 4 to 5 in hadoop-hdfs-rbf Part2.

Closes #7531 Signed-off-by: Shilun Fan <slfan1989@apache.org> Signed-off-by: Chris Nauroth <cnauroth@apache.org>

Author: zhtttylz

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/fairness/TestRouterAsyncRpcFairnessPolicyController.java

@@ -24,7 +24,7 @@
 import org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.util.Time;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.TimeUnit;
@@ -34,9 +34,9 @@
 import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_ASYNC_RPC_MAX_ASYNC_CALL_PERMIT_DEFAULT;
 import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_FAIRNESS_ACQUIRE_TIMEOUT;
 import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_MONITOR_NAMENODE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test functionality of {@link RouterAsyncRpcFairnessPolicyController).
@@ -116,8 +116,8 @@ private void verifyInstantiationStatus(Configuration conf, int permits) {
  }
  String infoMsg = String.format(
  RouterAsyncRpcFairnessPolicyController.INIT_MSG, permits);
- assertTrue("Should contain info message: " + infoMsg,
- logs.getOutput().contains(infoMsg));
+ assertTrue(logs.getOutput().contains(infoMsg), "Should contain info message: " +
+ infoMsg);
  }
 
  private RouterRpcFairnessPolicyController getFairnessPolicyController(

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestConnectionManager.java

@@ -27,23 +27,22 @@
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.test.LambdaTestUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.Rule;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * Test functionalities of {@link ConnectionManager}, which manages a pool
@@ -62,7 +61,7 @@ public class TestConnectionManager {
  private static final String TEST_NN_ADDRESS = "nn1:8080";
  private static final String UNRESOLVED_TEST_NN_ADDRESS = "unknownhost:8080";
 
- @Before
+ @BeforeEach
  public void setup() throws Exception {
  conf = new Configuration();
  connManager = new ConnectionManager(conf);
@@ -71,10 +70,7 @@ public void setup() throws Exception {
  connManager.start();
  }
 
- @Rule
- public ExpectedException exceptionRule = ExpectedException.none();
-
- @After
+ @AfterEach
  public void shutdown() {
  if (connManager != null) {
  connManager.close();
@@ -199,13 +195,13 @@ public void testConnectionCreatorWithException() throws Exception {
  @Test
  public void testGetConnectionWithException() throws Exception {
  String exceptionCause = "java.net.UnknownHostException: unknownhost";
- exceptionRule.expect(IllegalArgumentException.class);
- exceptionRule.expectMessage(exceptionCause);
 
- // Create a bad connection pool pointing to unresolvable namenode address.
- ConnectionPool badPool = new ConnectionPool(
- conf, UNRESOLVED_TEST_NN_ADDRESS, TEST_USER1, 1, 10, 0.5f,
- ClientProtocol.class, null);
+ assertThrows(IllegalArgumentException.class, () -> {
+ // Create a bad connection pool pointing to unresolvable namenode address.
+ ConnectionPool badPool = new ConnectionPool(
+ conf, UNRESOLVED_TEST_NN_ADDRESS, TEST_USER1, 1, 10, 0.5f,
+ ClientProtocol.class, null);
+ }, exceptionCause);
  }
 
  @Test

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestDFSRouter.java

@@ -17,8 +17,8 @@
  */
 package org.apache.hadoop.hdfs.server.federation.router;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.ha.HAServiceProtocol;
@@ -29,7 +29,7 @@
 
 import static org.apache.hadoop.hdfs.server.federation.FederationTestUtils.createNamenodeReport;
 import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.FEDERATION_STORE_MEMBERSHIP_EXPIRATION_MS;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestDFSRouter {
 
@@ -40,8 +40,8 @@ public void testDefaultConfigs() {
  configuration.get(FedBalanceConfigs.SCHEDULER_JOURNAL_URI);
  int workerThreads =
  configuration.getInt(FedBalanceConfigs.WORK_THREAD_NUM, -1);
- Assert.assertEquals("hdfs://localhost:8020/tmp/procedure", journalUri);
- Assert.assertEquals(10, workerThreads);
+ Assertions.assertEquals("hdfs://localhost:8020/tmp/procedure", journalUri);
+ Assertions.assertEquals(10, workerThreads);
  }
 
  @Test

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestDisableNameservices.java

@@ -19,8 +19,8 @@
 
 import static org.apache.hadoop.hdfs.server.federation.FederationTestUtils.simulateSlowNamenode;
 import static org.apache.hadoop.util.Time.monotonicNow;
-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;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -50,10 +50,10 @@
 import org.apache.hadoop.hdfs.server.federation.store.records.MountTable;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.codehaus.jettison.json.JSONObject;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test the behavior when disabling name services.
@@ -65,7 +65,7 @@ public class TestDisableNameservices {
  private static RouterClient routerAdminClient;
  private static ClientProtocol routerProtocol;
 
- @BeforeClass
+ @BeforeAll
  public static void setUp() throws Exception {
  // Build and start a federated cluster
  cluster = new StateStoreDFSCluster(false, 2);
@@ -131,7 +131,7 @@ private static void setupNamespace() throws IOException {
  nn1.getFileSystem().mkdirs(new Path("/dirns1/1"));
  }
 
- @AfterClass
+ @AfterAll
  public static void tearDown() {
  if (cluster != null) {
  cluster.stopRouter(routerContext);
@@ -140,7 +140,7 @@ public static void tearDown() {
  }
  }
 
- @After
+ @AfterEach
  public void cleanup() throws IOException {
  Router router = routerContext.getRouter();
  StateStoreService stateStore = router.getStateStore();
@@ -161,8 +161,7 @@ public void testWithoutDisabling() throws IOException {
  long t0 = monotonicNow();
  routerProtocol.renewLease("client0", null);
  long t = monotonicNow() - t0;
- assertTrue("It took too little: " + t + "ms",
- t > TimeUnit.SECONDS.toMillis(1));
+ assertTrue(t > TimeUnit.SECONDS.toMillis(1), "It took too little: " + t + "ms");
  // Return the results from all subclusters even if slow
  FileSystem routerFs = routerContext.getFileSystem();
  FileStatus[] filesStatus = routerFs.listStatus(new Path("/"));
@@ -180,8 +179,7 @@ public void testDisabling() throws Exception {
  long t0 = monotonicNow();
  routerProtocol.renewLease("client0", null);
  long t = monotonicNow() - t0;
- assertTrue("It took too long: " + t + "ms",
- t < TimeUnit.SECONDS.toMillis(1));
+ assertTrue(t < TimeUnit.SECONDS.toMillis(1), "It took too long: " + t + "ms");
  // We should not report anything from ns0
  FileSystem routerFs = routerContext.getFileSystem();
 

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestDisableRouterQuota.java

@@ -24,13 +24,13 @@
 
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.test.LambdaTestUtils;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test the behavior when disabling the Router quota.
@@ -39,7 +39,7 @@ public class TestDisableRouterQuota {
 
  private static Router router;
 
- @BeforeClass
+ @BeforeAll
  public static void setUp() throws Exception {
  // Build and start a router
  router = new Router();
@@ -53,15 +53,15 @@ public static void setUp() throws Exception {
  router.start();
  }
 
- @AfterClass
+ @AfterAll
  public static void tearDown() throws IOException {
  if (router != null) {
  router.stop();
  router.close();
  }
  }
 
- @Before
+ @BeforeEach
  public void checkDisableQuota() {
  assertFalse(router.isQuotaEnabled());
  }

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestFederationUtil.java

@@ -24,9 +24,9 @@
 import org.apache.hadoop.hdfs.server.federation.resolver.ActiveNamenodeResolver;
 import org.apache.hadoop.hdfs.server.federation.resolver.FileSubclusterResolver;
 import org.apache.hadoop.hdfs.server.federation.store.StateStoreService;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.FEDERATION_FILE_RESOLVER_CLIENT_CLASS;
 import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.FEDERATION_NAMENODE_RESOLVER_CLIENT_CLASS;
 

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestNoNamenodesAvailableLongTime.java

@@ -36,8 +36,8 @@
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.util.Lists;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 
 import java.io.IOException;
@@ -47,9 +47,9 @@
 import static org.apache.hadoop.ha.HAServiceProtocol.HAServiceState.ACTIVE;
 import static org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster.DEFAULT_HEARTBEAT_INTERVAL_MS;
 import static org.apache.hadoop.hdfs.server.namenode.AclTestHelpers.aclEntry;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * When failover occurs, the router may record that the ns has no active namenode
@@ -68,7 +68,7 @@ public class TestNoNamenodesAvailableLongTime {
  private RouterContext routerContext;
  private FederationRPCMetrics rpcMetrics;
 
- @After
+ @AfterEach
  public void cleanup() throws IOException {
  rpcMetrics = null;
  routerContext = null;