YARN-11262. Upgrade JUnit from 4 to 5 in hadoop-yarn-server-resourcemanager Part5.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java

@@ -69,8 +69,9 @@
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.apache.hadoop.yarn.util.ConverterUtils;
 import org.apache.hadoop.yarn.util.Records;
-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 org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -139,7 +140,7 @@ public void testTokenExpiry() throws Exception {
         LOG.info("Waiting for AM Launch to happen..");
         Thread.sleep(1000);
       }
-      Assert.assertNotNull(containerManager.containerTokens);
+      Assertions.assertNotNull(containerManager.containerTokens);
 
       RMAppAttempt attempt = app.getCurrentAppAttempt();
       ApplicationAttemptId applicationAttemptId = attempt.getAppAttemptId();
@@ -192,7 +193,7 @@ public void testTokenExpiry() throws Exception {
         Thread.sleep(100);
         count++;
       }
-      Assert.assertTrue(attempt.getState() == RMAppAttemptState.FINISHED);
+      Assertions.assertTrue(attempt.getState() == RMAppAttemptState.FINISHED);
 
       // Now simulate trying to allocate. RPC call itself should throw auth
       // exception.
@@ -202,13 +203,13 @@ public void testTokenExpiry() throws Exception {
           Records.newRecord(AllocateRequest.class);
       try {
         rmClient.allocate(allocateRequest);
-        Assert.fail("You got to be kidding me! "
+        Assertions.fail("You got to be kidding me! "
             + "Using App tokens after app-finish should fail!");
       } catch (Throwable t) {
         LOG.info("Exception found is ", t);
         // The exception will still have the earlier appAttemptId as it picks it
         // up from the token.
-        Assert.assertTrue(t.getCause().getMessage().contains(
+        Assertions.assertTrue(t.getCause().getMessage().contains(
           applicationAttemptId.toString()
           + " not found in AMRMTokenSecretManager."));
       }
@@ -247,7 +248,7 @@ public void testMasterKeyRollOver() throws Exception {
     AMRMTokenSecretManager appTokenSecretManager =
         rm.getRMContext().getAMRMTokenSecretManager();
     MasterKeyData oldKey = appTokenSecretManager.getMasterKey();
-    Assert.assertNotNull(oldKey);
+    Assertions.assertNotNull(oldKey);
     try {
       MockNM nm1 = rm.registerNode("localhost:1234", 5120);
 
@@ -260,7 +261,7 @@ public void testMasterKeyRollOver() throws Exception {
         LOG.info("Waiting for AM Launch to happen..");
         Thread.sleep(1000);
       }
-      Assert.assertNotNull(containerManager.containerTokens);
+      Assertions.assertNotNull(containerManager.containerTokens);
 
       RMAppAttempt attempt = app.getCurrentAppAttempt();
       ApplicationAttemptId applicationAttemptId = attempt.getAppAttemptId();
@@ -285,7 +286,7 @@ public void testMasterKeyRollOver() throws Exception {
       // One allocate call.
       AllocateRequest allocateRequest =
           Records.newRecord(AllocateRequest.class);
-      Assert.assertTrue(
+      Assertions.assertTrue(
           rmClient.allocate(allocateRequest).getAMCommand() == null);
 
       // Wait for enough time and make sure the roll_over happens
@@ -296,14 +297,14 @@ public void testMasterKeyRollOver() throws Exception {
       }
 
       MasterKeyData newKey = appTokenSecretManager.getMasterKey();
-      Assert.assertNotNull(newKey);
-      Assert.assertFalse("Master key should have changed!",
-        oldKey.equals(newKey));
+      Assertions.assertNotNull(newKey);
+      Assertions.assertFalse(
+       oldKey.equals(newKey), "Master key should have changed!");
 
       // Another allocate call with old AMRMToken. Should continue to work.
       rpc.stopProxy(rmClient, conf); // To avoid using cached client
       rmClient = createRMClient(rm, conf, rpc, currentUser);
-      Assert
+      Assertions
         .assertTrue(rmClient.allocate(allocateRequest).getAMCommand() == null);
 
       waitCount = 0;
@@ -319,9 +320,9 @@ public void testMasterKeyRollOver() throws Exception {
         Thread.sleep(200);
       }
       // active the nextMasterKey, and replace the currentMasterKey
-      Assert.assertTrue(appTokenSecretManager.getCurrnetMasterKeyData().equals(newKey));
-      Assert.assertTrue(appTokenSecretManager.getMasterKey().equals(newKey));
-      Assert.assertTrue(appTokenSecretManager.getNextMasterKeyData() == null);
+      Assertions.assertTrue(appTokenSecretManager.getCurrnetMasterKeyData().equals(newKey));
+      Assertions.assertTrue(appTokenSecretManager.getMasterKey().equals(newKey));
+      Assertions.assertTrue(appTokenSecretManager.getNextMasterKeyData() == null);
 
       // Create a new Token
       Token<AMRMTokenIdentifier> newToken =
@@ -332,7 +333,7 @@ public void testMasterKeyRollOver() throws Exception {
       rpc.stopProxy(rmClient, conf); // To avoid using cached client
       rmClient = createRMClient(rm, conf, rpc, currentUser);
       allocateRequest = Records.newRecord(AllocateRequest.class);
-      Assert
+      Assertions
         .assertTrue(rmClient.allocate(allocateRequest).getAMCommand() == null);
 
       // Should not work by using the old AMRMToken.
@@ -341,9 +342,9 @@ public void testMasterKeyRollOver() throws Exception {
         currentUser.addToken(amRMToken);
         rmClient = createRMClient(rm, conf, rpc, currentUser);
         allocateRequest = Records.newRecord(AllocateRequest.class);
-        Assert
+        Assertions
           .assertTrue(rmClient.allocate(allocateRequest).getAMCommand() == null);
-        Assert.fail("The old Token should not work");
+        Assertions.fail("The old Token should not work");
       } catch (Exception ex) {
         // expect exception
       }
@@ -355,7 +356,8 @@ public void testMasterKeyRollOver() throws Exception {
     }
   }
 
-  @Test (timeout = 20000)
+  @Test
+  @Timeout(value = 20)
   public void testAMRMMasterKeysUpdate() throws Exception {
     final AtomicReference<AMRMTokenSecretManager> spySecretMgrRef =
         new AtomicReference<AMRMTokenSecretManager>();
@@ -387,7 +389,7 @@ protected AMRMTokenSecretManager createAMRMTokenSecretManager(
     // Do allocate. Should not update AMRMToken
     AllocateResponse response =
         am.allocate(Records.newRecord(AllocateRequest.class));
-    Assert.assertNull(response.getAMRMToken());
+    Assertions.assertNull(response.getAMRMToken());
     Token<AMRMTokenIdentifier> oldToken = rm.getRMContext().getRMApps()
         .get(app.getApplicationId())
         .getRMAppAttempt(am.getApplicationAttemptId()).getAMRMToken();
@@ -396,13 +398,13 @@ protected AMRMTokenSecretManager createAMRMTokenSecretManager(
     // Do allocate again. the AM should get the latest AMRMToken
     rm.getRMContext().getAMRMTokenSecretManager().rollMasterKey();
     response = am.allocate(Records.newRecord(AllocateRequest.class));
-    Assert.assertNotNull(response.getAMRMToken());
+    Assertions.assertNotNull(response.getAMRMToken());
 
     Token<AMRMTokenIdentifier> amrmToken =
         ConverterUtils.convertFromYarn(response.getAMRMToken(), new Text(
           response.getAMRMToken().getService()));
 
-    Assert.assertEquals(amrmToken.decodeIdentifier().getKeyId(), rm
+    Assertions.assertEquals(amrmToken.decodeIdentifier().getKeyId(), rm
       .getRMContext().getAMRMTokenSecretManager().getMasterKey().getMasterKey()
       .getKeyId());
 
@@ -413,19 +415,19 @@ protected AMRMTokenSecretManager createAMRMTokenSecretManager(
         am.getApplicationAttemptId().toString(), new String[0]);
     ugi.addTokenIdentifier(oldToken.decodeIdentifier());
     response = am.doAllocateAs(ugi, Records.newRecord(AllocateRequest.class));
-    Assert.assertNotNull(response.getAMRMToken());
+    Assertions.assertNotNull(response.getAMRMToken());
     verify(spySecretMgr, never()).createAndGetAMRMToken(isA(ApplicationAttemptId.class));
 
     // Do allocate again with the updated token and verify we do not
     // receive a new token to use.
     response = am.allocate(Records.newRecord(AllocateRequest.class));
-    Assert.assertNull(response.getAMRMToken());
+    Assertions.assertNull(response.getAMRMToken());
 
     // Activate the next master key. Since there is new master key generated
     // in AMRMTokenSecretManager. The AMRMToken will not get updated for AM
     rm.getRMContext().getAMRMTokenSecretManager().activateNextMasterKey();
     response = am.allocate(Records.newRecord(AllocateRequest.class));
-    Assert.assertNull(response.getAMRMToken());
+    Assertions.assertNull(response.getAMRMToken());
     rm.stop();
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientToAMTokens.java

@@ -65,9 +65,10 @@
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
 import org.apache.hadoop.yarn.util.ConverterUtils;
 import org.apache.hadoop.yarn.util.Records;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import javax.security.sasl.SaslException;
 import java.io.IOException;
@@ -79,7 +80,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -91,7 +92,7 @@ public TestClientToAMTokens(SchedulerType type) throws IOException {
     super(type);
   }
 
-  @Before
+  @BeforeEach
   public void setup() {
     conf = getConf();
   }
@@ -242,7 +243,7 @@ public RegisterApplicationMasterResponse run() {
             try {
               response = mockAM.registerAppAttempt();
             } catch (Exception e) {
-              Assert.fail("Exception was not expected");
+              Assertions.fail("Exception was not expected");
             }
             return response;
           }
@@ -260,14 +261,14 @@ public RegisterApplicationMasterResponse run() {
 
     // ClientToAMToken master key should have been received on register
     // application master response.
-    Assert.assertNotNull(response.getClientToAMTokenMasterKey());
-    Assert
+    Assertions.assertNotNull(response.getClientToAMTokenMasterKey());
+    Assertions
         .assertTrue(response.getClientToAMTokenMasterKey().array().length > 0);
 
     // Start the AM with the correct shared-secret.
     ApplicationAttemptId appAttemptId =
         app.getAppAttempts().keySet().iterator().next();
-    Assert.assertNotNull(appAttemptId);
+    Assertions.assertNotNull(appAttemptId);
     final CustomAM am =
         new CustomAM(appAttemptId, response.getClientToAMTokenMasterKey()
             .array());
@@ -285,7 +286,7 @@ public RegisterApplicationMasterResponse run() {
       client.ping(null, TestRpcBase.newEmptyRequest());
       fail("Access by unauthenticated user should fail!!");
     } catch (Exception e) {
-      Assert.assertFalse(am.pinged);
+      Assertions.assertFalse(am.pinged);
     }
 
     Token<ClientToAMTokenIdentifier> token =
@@ -360,18 +361,18 @@ public Void run() throws Exception {
         }
       });
     } catch (Exception e) {
-      Assert.assertEquals(RemoteException.class.getName(), e.getClass()
+      Assertions.assertEquals(RemoteException.class.getName(), e.getClass()
           .getName());
       e = ((RemoteException)e).unwrapRemoteException();
-      Assert
+      Assertions
         .assertEquals(SaslException.class
           .getCanonicalName(), e.getClass().getCanonicalName());
-      Assert.assertTrue(e
+      Assertions.assertTrue(e
         .getMessage()
         .contains(
           "DIGEST-MD5: digest response format violation. "
               + "Mismatched response."));
-      Assert.assertFalse(am.pinged);
+      Assertions.assertFalse(am.pinged);
     }
   }
 
@@ -395,7 +396,7 @@ public Void run() throws Exception {
         CustomProtocol client =
             RPC.getProxy(CustomProtocol.class, 1L, am.address, conf);
         client.ping(null, TestRpcBase.newEmptyRequest());
-        Assert.assertTrue(am.pinged);
+        Assertions.assertTrue(am.pinged);
         return null;
       }
     });
@@ -414,13 +415,14 @@ public Void run() throws Exception {
         CustomProtocol client = RPC.getProxy(CustomProtocol.class,
             1L, am.address, conf);
         client.ping(null, TestRpcBase.newEmptyRequest());
-        Assert.assertTrue(am.pinged);
+        Assertions.assertTrue(am.pinged);
         return null;
       }
     });
   }
 
-  @Test(timeout=20000)
+  @Test
+  @Timeout(value = 20)
   public void testClientTokenRace() throws Exception {
 
     conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
@@ -472,7 +474,7 @@ public RegisterApplicationMasterResponse run() {
             try {
               response = mockAM.registerAppAttempt();
             } catch (Exception e) {
-              Assert.fail("Exception was not expected");
+              Assertions.fail("Exception was not expected");
             }
             return response;
           }
@@ -491,13 +493,13 @@ public RegisterApplicationMasterResponse run() {
     // ClientToAMToken master key should have been received on register
     // application master response.
     final ByteBuffer clientMasterKey = response.getClientToAMTokenMasterKey();
-    Assert.assertNotNull(clientMasterKey);
-    Assert.assertTrue(clientMasterKey.array().length > 0);
+    Assertions.assertNotNull(clientMasterKey);
+    Assertions.assertTrue(clientMasterKey.array().length > 0);
 
     // Start the AM with the correct shared-secret.
     ApplicationAttemptId appAttemptId =
         app.getAppAttempts().keySet().iterator().next();
-    Assert.assertNotNull(appAttemptId);
+    Assertions.assertNotNull(appAttemptId);
     final CustomAM am = new CustomAM(appAttemptId, null);
     am.init(conf);
     am.start();