YARN-11760. Upgrade JUnit from 4 to 5 in hadoop-yarn-applications-distributedshell.

Author: fanshilun

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellBaseTest.java

@@ -34,11 +34,11 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
@@ -117,7 +117,7 @@ public abstract class DistributedShellBaseTest {
  // location of the filesystem timeline writer for timeline service v.2
  private String timelineV2StorageDir = null;
 
- @BeforeClass
+ @BeforeAll
  public static void setupUnitTests() throws Exception {
  URL url = Thread.currentThread().getContextClassLoader().getResource(
  "yarn-site.xml");
@@ -134,7 +134,7 @@ public static void setupUnitTests() throws Exception {
  StandardCopyOption.REPLACE_EXISTING);
  }
 
- @AfterClass
+ @AfterAll
  public static void tearDownUnitTests() throws Exception {
  // shutdown the clusters.
  shutdownYarnCluster();
@@ -215,12 +215,12 @@ public void setTimelineV2StorageDir() throws Exception {
  timelineV2StorageDir = tmpFolder.newFolder().getAbsolutePath();
  }
 
- @Before
+ @BeforeEach
  public void setup() throws Exception {
  setupInternal(NUM_NMS, new YarnConfiguration());
  }
 
- @After
+ @AfterEach
  public void tearDown() throws IOException {
  cleanUpDFSClient();
  FileContext fsContext = FileContext.getLocalFSFileContext();
@@ -329,7 +329,7 @@ protected void baseTestDSShell(boolean haveDomain, boolean defaultFlow)
  YarnClient yarnClient;
  dsClient = setAndGetDSClient(new Configuration(yarnCluster.getConfig()));
  boolean initSuccess = dsClient.init(args);
- Assert.assertTrue(initSuccess);
+ Assertions.assertTrue(initSuccess);
  LOG.info("Running DS Client");
  final AtomicBoolean result = new AtomicBoolean(false);
  Thread t = new Thread(() -> {
@@ -379,11 +379,11 @@ protected void baseTestDSShell(boolean haveDomain, boolean defaultFlow)
  t.join();
  if (waitResult.get() == 2) {
  // Exception was raised
- Assert.fail("Exception in getting application report. Failed");
+ Assertions.fail("Exception in getting application report. Failed");
  }
  if (waitResult.get() == 1) {
- Assert.assertEquals("Failed waiting for expected rpc port to be -1.",
-  -1, appReportRef.get().getRpcPort());
+ Assertions.assertEquals(
+ -1, appReportRef.get().getRpcPort(), "Failed waiting for expected rpc port to be -1.");
  }
  checkTimeline(appIdRef.get(), defaultFlow, haveDomain, appReportRef.get());
  }
@@ -399,22 +399,22 @@ protected void checkTimeline(ApplicationId appId,
  if (haveDomain) {
  domain = yarnCluster.getApplicationHistoryServer()
  .getTimelineStore().getDomain("TEST_DOMAIN");
- Assert.assertNotNull(domain);
- Assert.assertEquals("reader_user reader_group", domain.getReaders());
- Assert.assertEquals("writer_user writer_group", domain.getWriters());
+ Assertions.assertNotNull(domain);
+ Assertions.assertEquals("reader_user reader_group", domain.getReaders());
+ Assertions.assertEquals("writer_user writer_group", domain.getWriters());
  }
  TimelineEntities entitiesAttempts = yarnCluster
  .getApplicationHistoryServer()
  .getTimelineStore()
  .getEntities(ApplicationMaster.DSEntity.DS_APP_ATTEMPT.toString(),
  null, null, null, null, null, null, null, null, null);
- Assert.assertNotNull(entitiesAttempts);
- Assert.assertEquals(1, entitiesAttempts.getEntities().size());
- Assert.assertEquals(2, entitiesAttempts.getEntities().get(0).getEvents()
+ Assertions.assertNotNull(entitiesAttempts);
+ Assertions.assertEquals(1, entitiesAttempts.getEntities().size());
+ Assertions.assertEquals(2, entitiesAttempts.getEntities().get(0).getEvents()
  .size());
- Assert.assertEquals(entitiesAttempts.getEntities().get(0).getEntityType(),
+ Assertions.assertEquals(entitiesAttempts.getEntities().get(0).getEntityType(),
  ApplicationMaster.DSEntity.DS_APP_ATTEMPT.toString());
- Assert.assertEquals(haveDomain ? domain.getId() : "DEFAULT",
+ Assertions.assertEquals(haveDomain ? domain.getId() : "DEFAULT",
  entitiesAttempts.getEntities().get(0).getDomainId());
  String currAttemptEntityId =
  entitiesAttempts.getEntities().get(0).getEntityId();
@@ -428,19 +428,19 @@ protected void checkTimeline(ApplicationId appId,
  .getTimelineStore()
  .getEntities(ApplicationMaster.DSEntity.DS_CONTAINER.toString(), null,
  null, null, null, null, primaryFilter, null, null, null);
- Assert.assertNotNull(entities);
- Assert.assertEquals(2, entities.getEntities().size());
- Assert.assertEquals(entities.getEntities().get(0).getEntityType(),
+ Assertions.assertNotNull(entities);
+ Assertions.assertEquals(2, entities.getEntities().size());
+ Assertions.assertEquals(entities.getEntities().get(0).getEntityType(),
  ApplicationMaster.DSEntity.DS_CONTAINER.toString());
 
  String entityId = entities.getEntities().get(0).getEntityId();
  TimelineEntity entity =
  yarnCluster.getApplicationHistoryServer().getTimelineStore()
  .getEntity(entityId,
  ApplicationMaster.DSEntity.DS_CONTAINER.toString(), null);
- Assert.assertNotNull(entity);
- Assert.assertEquals(entityId, entity.getEntityId());
- Assert.assertEquals(haveDomain ? domain.getId() : "DEFAULT",
+ Assertions.assertNotNull(entity);
+ Assertions.assertEquals(entityId, entity.getEntityId());
+ Assertions.assertEquals(haveDomain ? domain.getId() : "DEFAULT",
  entities.getEntities().get(0).getDomainId());
  }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestClient.java

@@ -18,12 +18,12 @@
 
 package org.apache.hadoop.yarn.applications.distributedshell;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestClient {
  @Test

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSAppMaster.java

@@ -38,8 +38,8 @@
 import org.apache.hadoop.yarn.server.timelineservice.storage.FileSystemTimelineWriterImpl;
 import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineWriter;
 import org.apache.hadoop.yarn.server.utils.BuilderUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
@@ -105,12 +105,12 @@ public void testDSAppMasterAllocateHandler() throws Exception {
 
  // first allocate a single container, everything should be fine
  handler.onContainersAllocated(containers);
- Assert.assertEquals("Wrong container allocation count", 1,
- master.getAllocatedContainers());
- Assert.assertEquals("Incorrect number of threads launched", 1,
- master.threadsLaunched);
- Assert.assertEquals("Incorrect YARN Shell IDs",
-  Arrays.asList("1"), master.yarnShellIds);
+ Assertions.assertEquals(1
+,  master.getAllocatedContainers(), "Wrong container allocation count");
+ Assertions.assertEquals(1
+,  master.threadsLaunched, "Incorrect number of threads launched");
+ Assertions.assertEquals(
+ Arrays.asList("1"), master.yarnShellIds, "Incorrect YARN Shell IDs");
 
  // now send 3 extra containers
  containers.clear();
@@ -121,14 +121,14 @@ public void testDSAppMasterAllocateHandler() throws Exception {
  ContainerId id4 = BuilderUtils.newContainerId(1, 1, 1, 4);
  containers.add(generateContainer(id4));
  handler.onContainersAllocated(containers);
- Assert.assertEquals("Wrong final container allocation count", 2,
- master.getAllocatedContainers());
+ Assertions.assertEquals(2
+,  master.getAllocatedContainers(), "Wrong final container allocation count");
 
- Assert.assertEquals("Incorrect number of threads launched", 2,
- master.threadsLaunched);
+ Assertions.assertEquals(2
+,  master.threadsLaunched, "Incorrect number of threads launched");
 
- Assert.assertEquals("Incorrect YARN Shell IDs",
-  Arrays.asList("1", "2"), master.yarnShellIds);
+ Assertions.assertEquals(
+ Arrays.asList("1", "2"), master.yarnShellIds, "Incorrect YARN Shell IDs");
  // make sure we handle completion events correctly
  List<ContainerStatus> status = new ArrayList<>();
  status.add(generateContainerStatus(id1, ContainerExitStatus.SUCCESS));
@@ -137,25 +137,25 @@ public void testDSAppMasterAllocateHandler() throws Exception {
  status.add(generateContainerStatus(id4, ContainerExitStatus.ABORTED));
  handler.onContainersCompleted(status);
 
- Assert.assertEquals("Unexpected number of completed containers",
-  targetContainers, master.getNumCompletedContainers());
- Assert.assertTrue("Master didn't finish containers as expected",
-  master.getDone());
+ Assertions.assertEquals(
+ targetContainers, master.getNumCompletedContainers(), "Unexpected number of completed containers");
+ Assertions.assertTrue(
+ master.getDone(), "Master didn't finish containers as expected");
 
  // test for events from containers we know nothing about
  // these events should be ignored
  status = new ArrayList<>();
  ContainerId id5 = BuilderUtils.newContainerId(1, 1, 1, 5);
  status.add(generateContainerStatus(id5, ContainerExitStatus.ABORTED));
- Assert.assertEquals("Unexpected number of completed containers",
-  targetContainers, master.getNumCompletedContainers());
- Assert.assertTrue("Master didn't finish containers as expected",
-  master.getDone());
+ Assertions.assertEquals(
+ targetContainers, master.getNumCompletedContainers(), "Unexpected number of completed containers");
+ Assertions.assertTrue(
+ master.getDone(), "Master didn't finish containers as expected");
  status.add(generateContainerStatus(id5, ContainerExitStatus.SUCCESS));
- Assert.assertEquals("Unexpected number of completed containers",
-  targetContainers, master.getNumCompletedContainers());
- Assert.assertTrue("Master didn't finish containers as expected",
-  master.getDone());
+ Assertions.assertEquals(
+ targetContainers, master.getNumCompletedContainers(), "Unexpected number of completed containers");
+ Assertions.assertTrue(
+ master.getDone(), "Master didn't finish containers as expected");
  }
 
  private Container generateContainer(ContainerId cid) {
@@ -200,15 +200,15 @@ private void runTimelineClientInDSAppMaster(boolean v1Enabled,
  private void validateAppMasterTimelineService(boolean v1Enabled,
  boolean v2Enabled, ApplicationMaster appMaster) {
  if (v1Enabled) {
- Assert.assertEquals(appMaster.appSubmitterUgi,
+ Assertions.assertEquals(appMaster.appSubmitterUgi,
  ((TimelineClientImpl)appMaster.timelineClient).getUgi());
  } else {
- Assert.assertNull(appMaster.timelineClient);
+ Assertions.assertNull(appMaster.timelineClient);
  }
  if (v2Enabled) {
- Assert.assertNotNull(appMaster.timelineV2Client);
+ Assertions.assertNotNull(appMaster.timelineV2Client);
  } else {
- Assert.assertNull(appMaster.timelineV2Client);
+ Assertions.assertNull(appMaster.timelineV2Client);
  }
  }
 
@@ -227,7 +227,7 @@ private ApplicationMaster createAppMasterWithStartedTimelineService(
  private Configuration getTimelineServiceConf(boolean v1Enabled,
  boolean v2Enabled) {
  Configuration conf = new YarnConfiguration(new Configuration(false));
- Assert.assertFalse(YarnConfiguration.timelineServiceEnabled(conf));
+ Assertions.assertFalse(YarnConfiguration.timelineServiceEnabled(conf));
 
  if (v1Enabled || v2Enabled) {
  conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);