YARN-8943. Upgrade JUnit from 4 to 5 in hadoop-yarn-api.

Signed-off-by: Takanobu Asanuma <[email protected]>

Author: aajisaka

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml

@@ -72,6 +72,27 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- Only required to run tests in an IDE that bundles an older version -->
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/api/records/TestResource.java

@@ -17,27 +17,29 @@
  */
 package org.apache.hadoop.yarn.api.records;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * The class to test {@link Resource}.
  */
-public class TestResource {
+class TestResource {
 
   @Test
-  public void testCastToIntSafely() {
+  void testCastToIntSafely() {
     assertEquals(0, Resource.castToIntSafely(0));
     assertEquals(1, Resource.castToIntSafely(1));
     assertEquals(Integer.MAX_VALUE,
         Resource.castToIntSafely(Integer.MAX_VALUE));
 
-    assertEquals("Cast to Integer.MAX_VALUE if the long is greater than "
-            + "Integer.MAX_VALUE", Integer.MAX_VALUE,
-        Resource.castToIntSafely(Integer.MAX_VALUE + 1L));
-    assertEquals("Cast to Integer.MAX_VALUE if the long is greater than "
-            + "Integer.MAX_VALUE", Integer.MAX_VALUE,
-        Resource.castToIntSafely(Long.MAX_VALUE));
+    assertEquals(Integer.MAX_VALUE,
+        Resource.castToIntSafely(Integer.MAX_VALUE + 1L),
+        "Cast to Integer.MAX_VALUE if the long is greater than "
+            + "Integer.MAX_VALUE");
+    assertEquals(Integer.MAX_VALUE,
+        Resource.castToIntSafely(Long.MAX_VALUE),
+        "Cast to Integer.MAX_VALUE if the long is greater than "
+            + "Integer.MAX_VALUE");
   }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/api/records/TestURL.java

@@ -17,19 +17,19 @@
  */
 package org.apache.hadoop.yarn.api.records;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.factories.RecordFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Test for the URL class. */
-public class TestURL {
+class TestURL {
 
   @Test
-  public void testConversion() throws Exception {
+  void testConversion() throws Exception {
     Configuration conf = new Configuration();
     conf.set(YarnConfiguration.IPC_RECORD_FACTORY_CLASS,
         RecordFactoryForTest.class.getName());

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestApplicationEntity.java

@@ -18,18 +18,18 @@
 
 package org.apache.hadoop.yarn.api.records.timelineservice;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 /**
  * Various tests for the ApplicationEntity class.
  *
  */
-public class TestApplicationEntity {
+class TestApplicationEntity {
 
   @Test
-  public void testIsApplicationEntity() {
+  void testIsApplicationEntity() {
     TimelineEntity te = new TimelineEntity();
     te.setType(TimelineEntityType.YARN_APPLICATION.toString());
     assertTrue(ApplicationEntity.isApplicationEntity(te));
@@ -43,7 +43,7 @@ public void testIsApplicationEntity() {
   }
 
   @Test
-  public void testGetApplicationEvent() {
+  void testGetApplicationEvent() {
     TimelineEntity te = null;
     TimelineEvent tEvent = ApplicationEntity.getApplicationEvent(te,
         "no event");

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/api/records/timelineservice/TestTimelineMetric.java

@@ -17,20 +17,20 @@
  */
 package org.apache.hadoop.yarn.api.records.timelineservice;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.hadoop.yarn.api.records.timelineservice.TimelineMetric.Type;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class TestTimelineMetric {
+class TestTimelineMetric {
 
   @Test
-  public void testTimelineMetricAggregation() {
+  void testTimelineMetricAggregation() {
     long ts = System.currentTimeMillis();
     // single_value metric add against null metric
     TimelineMetric m1 = getSingleValueMetric("MEGA_BYTES_MILLIS",