YARN-11263. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-yarn-server-n…

…odemanager Part1. (#7390) [JDK17] Upgrade JUnit from 4 to 5 in hadoop-yarn-server-nodemanager. Co-authored-by: Chris Nauroth <[email protected]> Reviewed-by: Chris Nauroth <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
apache · Mar 2, 2025 · f1f27e1 · f1f27e1
1 parent 89f9c5a
commit f1f27e1
Show file tree

Hide file tree

Showing 102 changed files with 4,237 additions and 3,862 deletions.
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -105,13 +105,18 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+       <groupId>org.junit.vintage</groupId>
+       <artifactId>junit-vintage-engine</artifactId>
+       <scope>test</scope>
     </dependency>
     <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
     <dependency>

diff --git a/.../src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestContainerManagerWithLCE.java b/.../src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestContainerManagerWithLCE.java
@@ -20,6 +20,9 @@
 
 import java.io.File;
 import java.io.IOException;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,8 +31,8 @@
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.TestContainerManager;
-import org.junit.After;
-import org.junit.Assume;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class TestContainerManagerWithLCE extends TestContainerManager {
 
@@ -49,10 +52,10 @@ public TestContainerManagerWithLCE() throws UnsupportedFileSystemException {
         TestContainerManagerWithLCE.class.getName() + "-tmpDir");
   }
 
+  @BeforeEach
   @Override
   public void setup() throws IOException {
-    Assume.assumeTrue("LCE binary path is not passed. Not running the test",
-        shouldRunTest());
+    assumeTrue(shouldRunTest(), "LCE binary path is not passed. Not running the test");
     super.setup();
     localFS.setPermission(new Path(localDir.getCanonicalPath()),
         new FsPermission(
@@ -62,7 +65,7 @@ public void setup() throws IOException {
             (short) 0777));
   }
 
-  @After
+  @AfterEach
   @Override
   public void tearDown() throws IOException, InterruptedException {
     if (shouldRunTest()) {

diff --git a/.../src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/BaseAMRMProxyTest.java b/.../src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/BaseAMRMProxyTest.java
@@ -69,9 +69,8 @@
 import org.apache.hadoop.yarn.server.nodemanager.timelineservice.NMTimelinePublisher;
 import org.apache.hadoop.yarn.server.security.ApplicationACLsManager;
 import org.apache.hadoop.yarn.util.Records;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -90,6 +89,10 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * Base class for all the AMRMProxyService test cases. It provides utility
  * methods that can be used by the concrete test case classes
@@ -108,16 +111,16 @@ public abstract class BaseAMRMProxyTest {
   private Context nmContext;
 
   protected MockAMRMProxyService getAMRMProxyService() {
-    Assert.assertNotNull(this.amrmProxyService);
+    assertNotNull(this.amrmProxyService);
     return this.amrmProxyService;
   }
 
   protected Context getNMContext() {
-    Assert.assertNotNull(this.nmContext);
+    assertNotNull(this.nmContext);
     return this.nmContext;
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws IOException {
     this.conf = createConfiguration();
     this.dispatcher = new AsyncDispatcher();
@@ -144,7 +147,7 @@ protected YarnConfiguration createConfiguration() {
     return config;
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.amrmProxyService.stop();
     this.amrmProxyService = null;
@@ -311,8 +314,8 @@ protected <T> List<RegisterApplicationMasterResponseInfo<T>> registerApplication
               int index = testContexts.indexOf(testContext);
               response = new RegisterApplicationMasterResponseInfo<>(
                   registerApplicationMaster(index), testContext);
-              Assert.assertNotNull(response.getResponse());
-              Assert.assertEquals(Integer.toString(index), response.getResponse().getQueue());
+              assertNotNull(response.getResponse());
+              assertEquals(Integer.toString(index), response.getResponse().getQueue());
 
               LOG.info("Successfully registered application master with test context: {}.",
                   testContext);
@@ -325,16 +328,16 @@ protected <T> List<RegisterApplicationMasterResponseInfo<T>> registerApplication
             return response;
           });
 
-    Assert.assertEquals("Number of responses received does not match with request",
-        testContexts.size(), responses.size());
+    assertEquals(testContexts.size(), responses.size(),
+        "Number of responses received does not match with request");
 
     Set<T> contextResponses = new TreeSet<>();
     for (RegisterApplicationMasterResponseInfo<T> item : responses) {
       contextResponses.add(item.getTestContext());
     }
 
     for (T ep : testContexts) {
-      Assert.assertTrue(contextResponses.contains(ep));
+      assertTrue(contextResponses.contains(ep));
     }
 
     return responses;
@@ -387,7 +390,7 @@ protected <T> List<FinishApplicationMasterResponseInfo<T>> finishApplicationMast
                 response = new FinishApplicationMasterResponseInfo<>(
                     finishApplicationMaster(testContexts.indexOf(testContext),
                     FinalApplicationStatus.SUCCEEDED), testContext);
-                Assert.assertNotNull(response.getResponse());
+                assertNotNull(response.getResponse());
 
                 LOG.info("Successfully finished application master with test contexts: {}.",
                     testContext);
@@ -399,18 +402,18 @@ protected <T> List<FinishApplicationMasterResponseInfo<T>> finishApplicationMast
               return response;
             });
 
-    Assert.assertEquals("Number of responses received does not match with request",
-        testContexts.size(), responses.size());
+    assertEquals(testContexts.size(), responses.size(),
+        "Number of responses received does not match with request");
 
     Set<T> contextResponses = new TreeSet<>();
     for (FinishApplicationMasterResponseInfo<T> item : responses) {
-      Assert.assertNotNull(item);
-      Assert.assertNotNull(item.getResponse());
+      assertNotNull(item);
+      assertNotNull(item.getResponse());
       contextResponses.add(item.getTestContext());
     }
 
     for (T ep : testContexts) {
-      Assert.assertTrue(contextResponses.contains(ep));
+      assertTrue(contextResponses.contains(ep));
     }
 
     return responses;

diff --git a/...c/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestAMRMProxyMetrics.java b/...c/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestAMRMProxyMetrics.java
@@ -22,39 +22,43 @@
 import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterResponse;
 import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
 import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+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.jupiter.api.Assertions.fail;
+
 public class TestAMRMProxyMetrics extends BaseAMRMProxyTest {
   public static final Logger LOG =
       LoggerFactory.getLogger(TestAMRMProxyMetrics.class);
   private static AMRMProxyMetrics metrics;
 
-  @BeforeClass
+  @BeforeAll
   public static void init() {
     metrics = AMRMProxyMetrics.getMetrics();
     LOG.info("Test: aggregate metrics are initialized correctly");
 
-    Assert.assertEquals(0, metrics.getFailedAppStartRequests());
-    Assert.assertEquals(0, metrics.getFailedRegisterAMRequests());
-    Assert.assertEquals(0, metrics.getFailedFinishAMRequests());
-    Assert.assertEquals(0, metrics.getFailedAllocateRequests());
-    Assert.assertEquals(0, metrics.getFailedAppRecoveryCount());
-    Assert.assertEquals(0, metrics.getFailedAppStopRequests());
-    Assert.assertEquals(0, metrics.getFailedUpdateAMRMTokenRequests());
-    Assert.assertEquals(0, metrics.getAllocateCount());
-    Assert.assertEquals(0, metrics.getRequestCount());
-
-    Assert.assertEquals(0, metrics.getNumSucceededAppStartRequests());
-    Assert.assertEquals(0, metrics.getNumSucceededRegisterAMRequests());
-    Assert.assertEquals(0, metrics.getNumSucceededFinishAMRequests());
-    Assert.assertEquals(0, metrics.getNumSucceededAllocateRequests());
-    Assert.assertEquals(0, metrics.getNumSucceededRecoverRequests());
-    Assert.assertEquals(0, metrics.getNumSucceededAppStopRequests());
-    Assert.assertEquals(0, metrics.getNumSucceededUpdateAMRMTokenRequests());
+    assertEquals(0, metrics.getFailedAppStartRequests());
+    assertEquals(0, metrics.getFailedRegisterAMRequests());
+    assertEquals(0, metrics.getFailedFinishAMRequests());
+    assertEquals(0, metrics.getFailedAllocateRequests());
+    assertEquals(0, metrics.getFailedAppRecoveryCount());
+    assertEquals(0, metrics.getFailedAppStopRequests());
+    assertEquals(0, metrics.getFailedUpdateAMRMTokenRequests());
+    assertEquals(0, metrics.getAllocateCount());
+    assertEquals(0, metrics.getRequestCount());
+
+    assertEquals(0, metrics.getNumSucceededAppStartRequests());
+    assertEquals(0, metrics.getNumSucceededRegisterAMRequests());
+    assertEquals(0, metrics.getNumSucceededFinishAMRequests());
+    assertEquals(0, metrics.getNumSucceededAllocateRequests());
+    assertEquals(0, metrics.getNumSucceededRecoverRequests());
+    assertEquals(0, metrics.getNumSucceededAppStopRequests());
+    assertEquals(0, metrics.getNumSucceededUpdateAMRMTokenRequests());
 
     LOG.info("Test: aggregate metrics are updated correctly");
   }
@@ -76,33 +80,33 @@ public void testAllocateRequestWithNullValues() throws Exception {
 
     int testAppId = 1;
     RegisterApplicationMasterResponse registerResponse = registerApplicationMaster(testAppId);
-    Assert.assertNotNull(registerResponse);
-    Assert.assertEquals(Integer.toString(testAppId), registerResponse.getQueue());
+    assertNotNull(registerResponse);
+    assertEquals(Integer.toString(testAppId), registerResponse.getQueue());
 
     AllocateResponse allocateResponse = allocate(testAppId);
-    Assert.assertNotNull(allocateResponse);
+    assertNotNull(allocateResponse);
 
     FinishApplicationMasterResponse finishResponse =
         finishApplicationMaster(testAppId, FinalApplicationStatus.SUCCEEDED);
 
-    Assert.assertNotNull(finishResponse);
-    Assert.assertTrue(finishResponse.getIsUnregistered());
+    assertNotNull(finishResponse);
+    assertTrue(finishResponse.getIsUnregistered());
 
-    Assert.assertEquals(failedAppStartRequests, metrics.getFailedAppStartRequests());
-    Assert.assertEquals(failedRegisterAMRequests, metrics.getFailedRegisterAMRequests());
-    Assert.assertEquals(failedFinishAMRequests, metrics.getFailedFinishAMRequests());
-    Assert.assertEquals(failedAllocateRequests, metrics.getFailedAllocateRequests());
-    Assert.assertEquals(failedAppRecoveryRequests, metrics.getFailedAppRecoveryCount());
-    Assert.assertEquals(failedAppStopRequests, metrics.getFailedAppStopRequests());
-    Assert.assertEquals(failedUpdateAMRMTokenRequests, metrics.getFailedUpdateAMRMTokenRequests());
+    assertEquals(failedAppStartRequests, metrics.getFailedAppStartRequests());
+    assertEquals(failedRegisterAMRequests, metrics.getFailedRegisterAMRequests());
+    assertEquals(failedFinishAMRequests, metrics.getFailedFinishAMRequests());
+    assertEquals(failedAllocateRequests, metrics.getFailedAllocateRequests());
+    assertEquals(failedAppRecoveryRequests, metrics.getFailedAppRecoveryCount());
+    assertEquals(failedAppStopRequests, metrics.getFailedAppStopRequests());
+    assertEquals(failedUpdateAMRMTokenRequests, metrics.getFailedUpdateAMRMTokenRequests());
 
-    Assert.assertEquals(succeededAppStartRequests,
+    assertEquals(succeededAppStartRequests,
         metrics.getNumSucceededAppStartRequests());
-    Assert.assertEquals(1 + succeededRegisterAMRequests,
+    assertEquals(1 + succeededRegisterAMRequests,
         metrics.getNumSucceededRegisterAMRequests());
-    Assert.assertEquals(1 + succeededFinishAMRequests,
+    assertEquals(1 + succeededFinishAMRequests,
         metrics.getNumSucceededFinishAMRequests());
-    Assert.assertEquals(1 + succeededAllocateRequests,
+    assertEquals(1 + succeededAllocateRequests,
         metrics.getNumSucceededAllocateRequests());
   }
 
@@ -122,42 +126,40 @@ public void testFinishOneApplicationMasterWithFailure() throws Exception {
     int testAppId = 1;
     RegisterApplicationMasterResponse registerResponse =
         registerApplicationMaster(testAppId);
-    Assert.assertNotNull(registerResponse);
-    Assert
-        .assertEquals(Integer.toString(testAppId), registerResponse.getQueue());
+    assertNotNull(registerResponse);
+    assertEquals(Integer.toString(testAppId), registerResponse.getQueue());
 
     FinishApplicationMasterResponse finishResponse =
         finishApplicationMaster(testAppId, FinalApplicationStatus.FAILED);
 
-    Assert.assertNotNull(finishResponse);
+    assertNotNull(finishResponse);
 
     try {
       // Try to finish an application master that is already finished.
       finishApplicationMaster(testAppId, FinalApplicationStatus.SUCCEEDED);
-      Assert
-          .fail("The request to finish application master should have failed");
+      fail("The request to finish application master should have failed");
     } catch (Throwable ex) {
       // This is expected. So nothing required here.
       LOG.info("Finish registration failed as expected because it was not "
           + "registered");
     }
 
-    Assert.assertEquals(failedAppStartRequests,
+    assertEquals(failedAppStartRequests,
         metrics.getFailedAppStartRequests());
-    Assert.assertEquals(failedRegisterAMRequests,
+    assertEquals(failedRegisterAMRequests,
         metrics.getFailedRegisterAMRequests());
-    Assert.assertEquals(1 + failedFinishAMRequests,
+    assertEquals(1 + failedFinishAMRequests,
         metrics.getFailedFinishAMRequests());
-    Assert.assertEquals(failedAllocateRequests,
+    assertEquals(failedAllocateRequests,
         metrics.getFailedAllocateRequests());
 
-    Assert.assertEquals(succeededAppStartRequests,
+    assertEquals(succeededAppStartRequests,
         metrics.getNumSucceededAppStartRequests());
-    Assert.assertEquals(1 + succeededRegisterAMRequests,
+    assertEquals(1 + succeededRegisterAMRequests,
         metrics.getNumSucceededRegisterAMRequests());
-    Assert.assertEquals(1 + succeededFinishAMRequests,
+    assertEquals(1 + succeededFinishAMRequests,
         metrics.getNumSucceededFinishAMRequests());
-    Assert.assertEquals(succeededAllocateRequests,
+    assertEquals(succeededAllocateRequests,
         metrics.getNumSucceededAllocateRequests());
   }
 }