diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapred/TestLocalContainerLauncher.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapred/TestLocalContainerLauncher.java index 42d6642d22485..548d1cab30ef8 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapred/TestLocalContainerLauncher.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapred/TestLocalContainerLauncher.java @@ -201,8 +201,8 @@ public void testRenameMapOutputForReduce() throws Exception { final Path mapOut = mrOutputFiles.getOutputFileForWrite(1); conf.set(MRConfig.LOCAL_DIR, localDirs[1].toString()); final Path mapOutIdx = mrOutputFiles.getOutputIndexFileForWrite(1); - assertNotEquals( - mapOut.getParent(), mapOutIdx.getParent(), "Paths must be different!"); + assertNotEquals(mapOut.getParent(), mapOutIdx.getParent(), + "Paths must be different!"); // make both dirs part of LOCAL_DIR conf.setStrings(MRConfig.LOCAL_DIR, localDirs); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java index dacd17572ecba..2a34d0ef177dc 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java @@ -427,16 +427,15 @@ public void testPropertyRedactionForJHS() throws Exception { // load the job_conf.xml in JHS directory and verify property redaction. Path jhsJobConfFile = getJobConfInIntermediateDoneDir(conf, params.jobId); - assertTrue( - FileContext.getFileContext(conf).util().exists(jhsJobConfFile), "The job_conf.xml file is not in the JHS directory"); + assertTrue(FileContext.getFileContext(conf).util().exists(jhsJobConfFile), + "The job_conf.xml file is not in the JHS directory"); Configuration jhsJobConf = new Configuration(); try (InputStream input = FileSystem.get(conf).open(jhsJobConfFile)) { jhsJobConf.addResource(input); - assertEquals( - - MRJobConfUtil.REDACTION_REPLACEMENT_VAL -, jhsJobConf.get(sensitivePropertyName), sensitivePropertyName + " is not redacted in HDFS."); + assertEquals(MRJobConfUtil.REDACTION_REPLACEMENT_VAL, + jhsJobConf.get(sensitivePropertyName), + sensitivePropertyName + " is not redacted in HDFS."); } } finally { jheh.stop(); @@ -497,11 +496,11 @@ public void testDefaultFsIsUsedForHistory() throws Exception { // If we got here then event handler worked but we don't know with which // file system. Now we check that history stuff was written to minicluster FileSystem dfsFileSystem = dfsCluster.getFileSystem(); - assertTrue( - dfsFileSystem.globStatus(new Path(t.dfsWorkDir + "/*")).length != 0, "Minicluster contains some history files"); + assertTrue(dfsFileSystem.globStatus(new Path(t.dfsWorkDir + "/*")).length != 0, + "Minicluster contains some history files"); FileSystem localFileSystem = LocalFileSystem.get(conf); - assertFalse( - localFileSystem.exists(new Path(t.dfsWorkDir)), "No history directory on non-default file system"); + assertFalse(localFileSystem.exists(new Path(t.dfsWorkDir)), + "No history directory on non-default file system"); } finally { jheh.stop(); purgeHdfsHistoryIntermediateDoneDirectory(conf); @@ -947,9 +946,8 @@ public void testSigTermedFunctionality() throws IOException { //Make sure events were handled, 4 + 1 finish event assertTrue(jheh.eventsHandled == 5, "handleEvent should've been called only 5 times but was " + jheh.eventsHandled); - assertTrue( - jheh.lastEventHandled.getHistoryEvent() - instanceof JobUnsuccessfulCompletionEvent, "Last event handled wasn't JobUnsuccessfulCompletionEvent"); + assertTrue(jheh.lastEventHandled.getHistoryEvent() instanceof JobUnsuccessfulCompletionEvent, + "Last event handled wasn't JobUnsuccessfulCompletionEvent"); } @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java index c1a5ef8edb939..8cd552ff7979d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java @@ -421,7 +421,7 @@ public void verifyCompleted() { LOG.info("Job finish time :{}", jobReport.getFinishTime()); assertTrue(jobReport.getStartTime() <= jobReport.getFinishTime(), "Job start time is not less than finish time"); - assertTrue(jobReport.getFinishTime() <= System.currentTimeMillis(), + assertTrue(jobReport.getFinishTime() <= System.currentTimeMillis(), "Job finish time is in future"); for (Task task : job.getTasks().values()) { TaskReport taskReport = task.getReport(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java index b8e0a83f73221..575c69c85d6f9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebApp.java @@ -72,7 +72,6 @@ import org.junit.jupiter.api.Test; import com.google.inject.Injector; -import org.junit.jupiter.api.extension.RegisterExtension; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -85,9 +84,6 @@ public class TestAMWebApp { System.getProperty("java.io.tmpdir")), TestAMWebApp.class.getName()); - @RegisterExtension - public final EnvironmentVariablesExtension extension = new EnvironmentVariablesExtension(); - @AfterEach public void tearDown() { TEST_DIR.delete(); @@ -130,7 +126,7 @@ public void tearDown() { public static Map getJobParams(AppContext appContext) { JobId jobId = appContext.getAllJobs().entrySet().iterator().next().getKey(); - Map params = new HashMap<>(); + Map params = new HashMap(); params.put(AMParams.JOB_ID, MRApps.toString(jobId)); return params; } @@ -139,7 +135,7 @@ public static Map getTaskParams(AppContext appContext) { JobId jobId = appContext.getAllJobs().entrySet().iterator().next().getKey(); Entry e = appContext.getJob(jobId).getTasks().entrySet().iterator().next(); e.getValue().getType(); - Map params = new HashMap<>(); + Map params = new HashMap(); params.put(AMParams.JOB_ID, MRApps.toString(jobId)); params.put(AMParams.TASK_ID, MRApps.toString(e.getKey())); params.put(AMParams.TASK_TYPE, MRApps.taskSymbol(e.getValue().getType())); @@ -256,9 +252,8 @@ protected ClientService createClientService(AppContext context) { keystoreFile.getParentFile().mkdirs(); KeyStoreTestUtil.createKeyStore(keystoreFile.getAbsolutePath(), "password", "server", keyPair.getPrivate(), cert); - extension.getEnvironmentVariables().set("KEYSTORE_FILE_LOCATION", - keystoreFile.getAbsolutePath()); - extension.getEnvironmentVariables().set("KEYSTORE_PASSWORD", "password"); + System.setProperty("KEYSTORE_FILE_LOCATION", keystoreFile.getAbsolutePath()); + System.setProperty("KEYSTORE_PASSWORD", "password"); Job job = app.submit(conf); @@ -291,6 +286,8 @@ protected ClientService createClientService(AppContext context) { app.verifyCompleted(); keystoreFile.delete(); + System.clearProperty("KEYSTORE_FILE_LOCATION"); + System.clearProperty("KEYSTORE_PASSWORD"); } @Test @@ -312,9 +309,8 @@ protected ClientService createClientService(AppContext context) { keystoreFile.getParentFile().mkdirs(); KeyStoreTestUtil.createKeyStore(keystoreFile.getAbsolutePath(), "password", "server", keyPair.getPrivate(), cert); - extension.getEnvironmentVariables().set("KEYSTORE_FILE_LOCATION", - keystoreFile.getAbsolutePath()); - extension.getEnvironmentVariables().set("KEYSTORE_PASSWORD", "password"); + System.setProperty("KEYSTORE_FILE_LOCATION", keystoreFile.getAbsolutePath()); + System.setProperty("KEYSTORE_PASSWORD", "password"); KeyPair clientKeyPair = KeyStoreTestUtil.generateKeyPair("RSA"); X509Certificate clientCert = KeyStoreTestUtil.generateCertificate( @@ -323,9 +319,8 @@ protected ClientService createClientService(AppContext context) { truststoreFile.getParentFile().mkdirs(); KeyStoreTestUtil.createTrustStore(truststoreFile.getAbsolutePath(), "password", "client", clientCert); - extension.getEnvironmentVariables().set("TRUSTSTORE_FILE_LOCATION", - truststoreFile.getAbsolutePath()); - extension.getEnvironmentVariables().set("TRUSTSTORE_PASSWORD", "password"); + System.setProperty("TRUSTSTORE_FILE_LOCATION", truststoreFile.getAbsolutePath()); + System.setProperty("TRUSTSTORE_PASSWORD", "password"); Job job = app.submit(conf); @@ -363,6 +358,11 @@ protected ClientService createClientService(AppContext context) { keystoreFile.delete(); truststoreFile.delete(); + + System.clearProperty("KEYSTORE_FILE_LOCATION"); + System.clearProperty("KEYSTORE_PASSWORD"); + System.clearProperty("TRUSTSTORE_FILE_LOCATION"); + System.clearProperty("TRUSTSTORE_PASSWORD"); } static String webProxyBase = null; @@ -417,11 +417,11 @@ protected ClientService createClientService(AppContext context) { } } - /*public static void main(String[] args) { + public static void main(String[] args) { AppContext context = new MockAppContext(0, 8, 88, 4); WebApps.$for("yarn", AppContext.class, context).withResourceConfig(configure(context)). at(58888).inDevMode().start(new AMWebApp(context)).joinThread(); - }*/ + } protected static ResourceConfig configure(AppContext context) { ResourceConfig config = new ResourceConfig(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java index 5e65726257b1f..89b6dead1e764 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java @@ -337,8 +337,8 @@ public void verifyBlacklistedNodesInfoXML(String xml, AppContext ctx) assertEquals(1, infonodes.getLength(), "incorrect number of elements"); NodeList nodes = dom.getElementsByTagName("blacklistedNodes"); Set blacklistedNodes = ctx.getBlacklistedNodes(); - assertEquals(blacklistedNodes.size() -, nodes.getLength(), "incorrect number of elements"); + assertEquals(blacklistedNodes.size(), + nodes.getLength(), "incorrect number of elements"); for (int i = 0; i < nodes.getLength(); i++) { Element element = (Element) nodes.item(i); assertTrue( diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java index c5b5445c7cea9..e44901b1d80d7 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempt.java @@ -128,11 +128,6 @@ protected Properties getConfiguration(String configPrefix, } } - @Override - public void setUp() throws Exception { - super.setUp(); - } - public TestAMWebServicesAttempt() { } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java index d5d54b0d0d8e2..ecebf1403487e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobConf.java @@ -58,6 +58,7 @@ import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -69,7 +70,7 @@ import org.glassfish.jersey.server.ResourceConfig; /** * Test the app master web service Rest API for getting the job conf. This - * requires to be created a temporary configuration file. + * requires created a temporary configuration file. * * /ws/v1/mapreduce/job/{jobid}/conf */ @@ -130,9 +131,9 @@ protected void configure() { } } - @Override - public void setUp() throws Exception { - super.setUp(); + + @BeforeAll + public static void setTestConfDir() throws Exception { testConfDir.mkdir(); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java index 367fd6d2d4e7b..c4f24e2fa504c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesJobs.java @@ -470,8 +470,7 @@ public void verifyAMJob(JSONObject info, Job job) throws JSONException { } else { fail("should have acls in the web service info"); } - assertTrue( - found, "acl: " + expectName + " not found in webservice output"); + assertTrue(found, "acl: " + expectName + " not found in webservice output"); } } @@ -545,8 +544,7 @@ public void verifyAMJobXML(NodeList nodes, AppContext appContext) { } else { fail("should have acls in the web service info"); } - assertTrue( - found, "acl: " + expectName + " not found in webservice output"); + assertTrue(found, "acl: " + expectName + " not found in webservice output"); } } } @@ -568,17 +566,15 @@ public void verifyAMJobGeneric(Job job, String id, String user, String name, assertEquals(report.getStartTime(), startTime, "startTime incorrect"); assertEquals(report.getFinishTime(), finishTime, "finishTime incorrect"); - assertEquals( - Times.elapsed(report.getStartTime(), report.getFinishTime()) -, elapsedTime, "elapsedTime incorrect"); + assertEquals(Times.elapsed(report.getStartTime(), report.getFinishTime()), + elapsedTime, "elapsedTime incorrect"); assertEquals(job.getTotalMaps(), mapsTotal, "mapsTotal incorrect"); - assertEquals(job.getCompletedMaps() -, mapsCompleted, "mapsCompleted incorrect"); + assertEquals(job.getCompletedMaps(), + mapsCompleted, "mapsCompleted incorrect"); assertEquals(job.getTotalReduces(), reducesTotal, "reducesTotal incorrect"); - assertEquals(job.getCompletedReduces() -, reducesCompleted, "reducesCompleted incorrect"); - assertEquals(report.getMapProgress() * 100, - mapProgress, 0, "mapProgress incorrect"); + assertEquals(job.getCompletedReduces(), + reducesCompleted, "reducesCompleted incorrect"); + assertEquals(report.getMapProgress() * 100, mapProgress, 0, "mapProgress incorrect"); assertEquals(report.getReduceProgress() * 100, reduceProgress, 0, "reduceProgress incorrect"); } @@ -617,8 +613,7 @@ public void verifyAMJobGenericSecure(Job job, int mapsPending, assertTrue(runningReduceAttempts >= 0, "runningReduceAttempts not >= 0"); assertTrue(failedReduceAttempts >= 0, "failedReduceAttempts not >= 0"); assertTrue(killedReduceAttempts >= 0, "killedReduceAttempts not >= 0"); - assertTrue( - successfulReduceAttempts >= 0, "successfulReduceAttempts not >= 0"); + assertTrue(successfulReduceAttempts >= 0, "successfulReduceAttempts not >= 0"); assertTrue(newMapAttempts >= 0, "newMapAttempts not >= 0"); assertTrue(runningMapAttempts >= 0, "runningMapAttempts not >= 0"); @@ -724,8 +719,8 @@ public void verifyAMJobCounters(JSONObject info, Job job) for (int j = 0; j < counters.length(); j++) { JSONObject counter = counters.getJSONObject(j); String counterName = counter.getString("name"); - assertTrue( - (counterName != null && !counterName.isEmpty()), "counter name not set"); + assertTrue((counterName != null && !counterName.isEmpty()), + "counter name not set"); long mapValue = counter.getLong("mapCounterValue"); assertTrue(mapValue >= 0, "mapCounterValue >= 0"); @@ -764,8 +759,8 @@ public void verifyAMJobCountersXML(NodeList nodes, Job job) { Element counter = (Element) counterArr.item(z); String counterName = WebServicesTestUtils.getXmlString(counter, "name"); - assertTrue( - (counterName != null && !counterName.isEmpty()), "counter name not set"); + assertTrue((counterName != null && !counterName.isEmpty()), + "counter name not set"); long mapValue = WebServicesTestUtils.getXmlLong(counter, "mapCounterValue"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java index c893dbd696e7c..dc3cf9e597dfe 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesTasks.java @@ -738,8 +738,7 @@ public void verifyAMJobTaskCounters(JSONObject info, Task task) for (int j = 0; j < counters.length(); j++) { JSONObject counter = counters.getJSONObject(j); String counterName = counter.getString("name"); - assertTrue( - (counterName != null && !counterName.isEmpty()), "name not set"); + assertTrue((counterName != null && !counterName.isEmpty()), "name not set"); long value = counter.getLong("value"); assertTrue(value >= 0, "value >= 0"); } @@ -769,8 +768,7 @@ public void verifyAMTaskCountersXML(NodeList nodes, Task task) { Element counter = (Element) counterArr.item(z); String counterName = WebServicesTestUtils.getXmlString(counter, "name"); - assertTrue( - (counterName != null && !counterName.isEmpty()), "counter name not set"); + assertTrue((counterName != null && !counterName.isEmpty()), "counter name not set"); long value = WebServicesTestUtils.getXmlLong(counter, "value"); assertTrue(value >= 0, "value not >= 0"); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java index 123b46c45a3bc..ad0f09b284648 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java @@ -17,7 +17,13 @@ */ package org.apache.hadoop.mapreduce.v2.app.webapp; -import static org.mockito.Mockito.*; +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.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.io.IOException; import java.util.Iterator; @@ -39,7 +45,6 @@ import org.apache.hadoop.yarn.webapp.ResponseInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; public class TestAppController { @@ -275,7 +280,7 @@ public void testConfiguration() { public void testDownloadConfiguration() { appController.downloadConf(); String jobConfXml = appController.getData(); - assertFalse(jobConfXml.contains("Error"), "Error downloading the job configuration file."); + assertTrue(!jobConfXml.contains("Error"), "Error downloading the job configuration file."); } /** diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestBlocks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestBlocks.java index 9fe18f480b3fc..793924975eace 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestBlocks.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestBlocks.java @@ -51,8 +51,12 @@ import org.apache.hadoop.yarn.webapp.view.HtmlBlock; import org.apache.hadoop.yarn.webapp.view.HtmlBlock.Block; -import static org.mockito.Mockito.*; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; public class TestBlocks { private ByteArrayOutputStream data = new ByteArrayOutputStream(); @@ -125,7 +129,7 @@ public void testTasksBlock() throws Exception { when(task.getType()).thenReturn(TaskType.MAP); - Map tasks = new HashMap<>(); + Map tasks = new HashMap(); tasks.put(taskId, task); AppContext ctx = mock(AppContext.class); Job job = mock(Job.class); @@ -174,8 +178,10 @@ public void testAttemptsBlock() { when(task.getReport()).thenReturn(report); when(task.getType()).thenReturn(TaskType.REDUCE); - Map tasks = new HashMap<>(); - Map attempts = new HashMap<>(); + Map tasks = + new HashMap(); + Map attempts = + new HashMap(); TaskAttempt attempt = mock(TaskAttempt.class); TaskAttemptId taId = new TaskAttemptIdPBImpl(); taId.setId(0); @@ -239,7 +245,8 @@ public void testSingleCounterBlock() { when(reduceTask.getReport()).thenReturn(reduceReport); when(reduceTask.getType()).thenReturn(TaskType.REDUCE); - Map tasks = new HashMap<>(); + Map tasks = + new HashMap(); tasks.put(mapTaskId, mapTask); tasks.put(reduceTaskId, reduceTask); @@ -248,11 +255,11 @@ public void testSingleCounterBlock() { when(appCtx.getJob(any(JobId.class))).thenReturn(job); // SingleCounter for map task - SingleCounterBlockForMapTest blockForMapTest = - spy(new SingleCounterBlockForMapTest(appCtx, ctx)); + SingleCounterBlockForMapTest blockForMapTest + = spy(new SingleCounterBlockForMapTest(appCtx, ctx)); PrintWriter pWriterForMapTest = new PrintWriter(data); Block htmlForMapTest = new BlockForTest(new HtmlBlockForTest(), - pWriterForMapTest, 0, false); + pWriterForMapTest, 0, false); blockForMapTest.render(htmlForMapTest); pWriterForMapTest.flush(); assertTrue(data.toString().contains("task_0_0001_m_000000")); @@ -273,7 +280,7 @@ public void testSingleCounterBlock() { } private class ConfBlockForTest extends ConfBlock { - private final Map params = new HashMap<>(); + private final Map params = new HashMap(); public void addParameter(String name, String value) { params.put(name, value); @@ -300,7 +307,7 @@ protected void render(Block html) { } private class AttemptsBlockForTest extends FewAttemptsBlock { - private final Map params = new HashMap<>(); + private final Map params = new HashMap(); public void addParameter(String name, String value) { params.put(name, value); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java index 6aed17982c900..63e3679a5d1d0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java @@ -369,9 +369,15 @@ public void setup() { if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) { String amKeystoreLoc = System.getenv("KEYSTORE_FILE_LOCATION"); + if (StringUtils.isBlank(amKeystoreLoc)) { + amKeystoreLoc = System.getProperty("KEYSTORE_FILE_LOCATION"); + } if (amKeystoreLoc != null) { LOG.info("Setting keystore location to " + amKeystoreLoc); String password = System.getenv("KEYSTORE_PASSWORD"); + if (StringUtils.isBlank(password)) { + password = System.getProperty("KEYSTORE_PASSWORD"); + } builder.keyStore(amKeystoreLoc, password, "jks"); } else { LOG.info("Loading standard ssl config"); @@ -380,9 +386,15 @@ public void setup() { builder.needsClientAuth(needsClientAuth); if (needsClientAuth) { String amTruststoreLoc = System.getenv("TRUSTSTORE_FILE_LOCATION"); + if (StringUtils.isBlank(amTruststoreLoc)) { + amTruststoreLoc = System.getProperty("TRUSTSTORE_FILE_LOCATION"); + } if (amTruststoreLoc != null) { LOG.info("Setting truststore location to " + amTruststoreLoc); String password = System.getenv("TRUSTSTORE_PASSWORD"); + if (StringUtils.isBlank(password)) { + password = System.getProperty("TRUSTSTORE_PASSWORD"); + } builder.trustStore(amTruststoreLoc, password, "jks"); } }