From e6edbf1b4b914c687cef25be58c29f835bb15800 Mon Sep 17 00:00:00 2001 From: Ashutosh Gupta Date: Tue, 25 Oct 2022 09:21:12 +0100 Subject: [PATCH] YARN-11338. Upgrade Junit 4 to 5 in hadoop-yarn-applications-unmanaged-am-launcher (#4994) Co-authored-by: Ashutosh Gupta Signed-off-by: Akira Ajisaka --- .../pom.xml | 15 ++++++ .../TestUnmanagedAMLauncher.java | 49 ++++++++++--------- 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml index 405e44188d..67be3758a5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml @@ -72,6 +72,21 @@ test-jar test + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.platform + junit-platform-launcher + test + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/TestUnmanagedAMLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/TestUnmanagedAMLauncher.java index 134cba80dd..ed903f7f9b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/TestUnmanagedAMLauncher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/TestUnmanagedAMLauncher.java @@ -18,8 +18,10 @@ package org.apache.hadoop.yarn.applications.unmanagedamlauncher; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayOutputStream; import java.io.File; @@ -41,10 +43,10 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnException; import org.apache.hadoop.yarn.server.MiniYARNCluster; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +57,7 @@ public class TestUnmanagedAMLauncher { protected static MiniYARNCluster yarnCluster = null; protected static Configuration conf = new YarnConfiguration(); - @BeforeClass + @BeforeAll public static void setup() throws InterruptedException, IOException { LOG.info("Starting up YARN cluster"); conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 128); @@ -71,9 +73,9 @@ public static void setup() throws InterruptedException, IOException { LOG.info("MiniYARN ResourceManager published web address: " + yarnClusterConfig.get(YarnConfiguration.RM_WEBAPP_ADDRESS)); String webapp = yarnClusterConfig.get(YarnConfiguration.RM_WEBAPP_ADDRESS); - assertTrue("Web app address still unbound to a host at " + webapp, - !webapp.startsWith("0.0.0.0")); - LOG.info("Yarn webapp is at "+ webapp); + assertFalse(webapp.startsWith("0.0.0.0"), + "Web app address still unbound to a host at " + webapp); + LOG.info("Yarn webapp is at " + webapp); URL url = Thread.currentThread().getContextClassLoader() .getResource("yarn-site.xml"); if (url == null) { @@ -97,7 +99,7 @@ public static void setup() throws InterruptedException, IOException { } } - @AfterClass + @AfterAll public static void tearDown() throws IOException { if (yarnCluster != null) { try { @@ -123,8 +125,9 @@ private static String getTestRuntimeClasspath() { return envClassPath; } - @Test(timeout=30000) - public void testUMALauncher() throws Exception { + @Test + @Timeout(30000) + void testUMALauncher() throws Exception { String classpath = getTestRuntimeClasspath(); String javaHome = System.getenv("JAVA_HOME"); if (javaHome == null) { @@ -140,7 +143,7 @@ public void testUMALauncher() throws Exception { javaHome + "/bin/java -Xmx512m " + TestUnmanagedAMLauncher.class.getCanonicalName() - + " success" }; + + " success"}; LOG.info("Initializing Launcher"); UnmanagedAMLauncher launcher = @@ -149,24 +152,24 @@ public void launchAM(ApplicationAttemptId attemptId) throws IOException, YarnException { YarnApplicationAttemptState attemptState = rmClient.getApplicationAttemptReport(attemptId) - .getYarnApplicationAttemptState(); - Assert.assertTrue(attemptState - .equals(YarnApplicationAttemptState.LAUNCHED)); + .getYarnApplicationAttemptState(); + assertEquals(YarnApplicationAttemptState.LAUNCHED, attemptState); super.launchAM(attemptId); } }; boolean initSuccess = launcher.init(args); - Assert.assertTrue(initSuccess); + assertTrue(initSuccess); LOG.info("Running Launcher"); boolean result = launcher.run(); LOG.info("Launcher run completed. Result=" + result); - Assert.assertTrue(result); + assertTrue(result); } - @Test(timeout=30000) - public void testUMALauncherError() throws Exception { + @Test + @Timeout(30000) + void testUMALauncherError() throws Exception { String classpath = getTestRuntimeClasspath(); String javaHome = System.getenv("JAVA_HOME"); if (javaHome == null) { @@ -182,13 +185,13 @@ public void testUMALauncherError() throws Exception { javaHome + "/bin/java -Xmx512m " + TestUnmanagedAMLauncher.class.getCanonicalName() - + " failure" }; + + " failure"}; LOG.info("Initializing Launcher"); UnmanagedAMLauncher launcher = new UnmanagedAMLauncher(new Configuration( yarnCluster.getConfig())); boolean initSuccess = launcher.init(args); - Assert.assertTrue(initSuccess); + assertTrue(initSuccess); LOG.info("Running Launcher"); try {