YARN-11262. Fix Junit Test Error & CheckStyle Issue.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestAppNameMappingPlacementRule.java

@@ -30,14 +30,14 @@
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerQueueManager;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.SimpleGroupsMapping;
 import org.apache.hadoop.yarn.util.Records;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Collections;
 
 import static org.apache.hadoop.yarn.server.resourcemanager.placement.FairQueuePlacementUtils.DOT;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -108,7 +108,7 @@ private void verifyQueueMapping(QueueMapping queueMapping,
     asc.setApplicationName(appName);
     ApplicationPlacementContext ctx = engine.getPlacementForApp(asc,
         user);
-    Assertions.assertEquals(expectedQueue,
+    assertEquals(expectedQueue,
         ctx != null ? ctx.getQueue() : inputQueue);
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestFairQueuePlacementUtils.java

@@ -52,25 +52,25 @@ public void testCleanName() {
     String cleaned = cleanName(clean);
     assertEquals(clean, cleaned, "Name was changed and it should not");
     cleaned = cleanName(dotted);
-    assertFalse(
-       cleaned.contains(DOT), "Cleaned name contains dots and it should not");
+    assertFalse(cleaned.contains(DOT),
+        "Cleaned name contains dots and it should not");
     cleaned = cleanName(multiDot);
-    assertFalse(
-       cleaned.contains(DOT), "Cleaned name contains dots and it should not");
-    assertNotEquals(
-       cleaned.indexOf(DOT_REPLACEMENT)
-,         cleaned.lastIndexOf(DOT_REPLACEMENT), "Multi dot failed: wrong replacements found");
+    assertFalse(cleaned.contains(DOT),
+        "Cleaned name contains dots and it should not");
+    assertNotEquals(cleaned.indexOf(DOT_REPLACEMENT),
+        cleaned.lastIndexOf(DOT_REPLACEMENT),
+        "Multi dot failed: wrong replacements found");
     cleaned = cleanName(seqDot);
-    assertFalse(
-       cleaned.contains(DOT), "Cleaned name contains dots and it should not");
-    assertNotEquals(
-       cleaned.indexOf(DOT_REPLACEMENT)
-,         cleaned.lastIndexOf(DOT_REPLACEMENT), "Sequential dot failed: wrong replacements found");
+    assertFalse(cleaned.contains(DOT),
+        "Cleaned name contains dots and it should not");
+    assertNotEquals(cleaned.indexOf(DOT_REPLACEMENT),
+        cleaned.lastIndexOf(DOT_REPLACEMENT),
+        "Sequential dot failed: wrong replacements found");
     cleaned = cleanName(unTrimmed);
-    assertTrue(
-       cleaned.startsWith(DOT_REPLACEMENT), "Trimming start failed: space not removed or dot not replaced");
-    assertTrue(
-       cleaned.endsWith(DOT_REPLACEMENT), "Trimming end failed: space not removed or dot not replaced");
+    assertTrue(cleaned.startsWith(DOT_REPLACEMENT),
+        "Trimming start failed: space not removed or dot not replaced");
+    assertTrue(cleaned.endsWith(DOT_REPLACEMENT),
+        "Trimming end failed: space not removed or dot not replaced");
   }
 
   @Test
@@ -82,23 +82,22 @@ public void testAssureRoot() {
     final String alreadyRoot = "root.base";
 
     String rooted = assureRoot(queueName);
-    assertTrue(
-       rooted.startsWith(ROOT_QUEUE + DOT), "Queue should have root prefix (base)");
+    assertTrue(rooted.startsWith(ROOT_QUEUE + DOT),
+        "Queue should have root prefix (base)");
     rooted = assureRoot(rootOnly);
-    assertEquals(
-       rootOnly, rooted, "'root' queue should not have root prefix (root)");
+    assertEquals(rootOnly, rooted,
+        "'root' queue should not have root prefix (root)");
     rooted = assureRoot(rootNoDot);
-    assertTrue(
-       rooted.startsWith(ROOT_QUEUE + DOT), "Queue should have root prefix (rootbase)");
-    assertEquals(5
-,         rooted.lastIndexOf(ROOT_QUEUE), "'root' queue base was replaced and not prefixed");
+    assertTrue(rooted.startsWith(ROOT_QUEUE + DOT),
+        "Queue should have root prefix (rootbase)");
+    assertEquals(5, rooted.lastIndexOf(ROOT_QUEUE),
+        "'root' queue base was replaced and not prefixed");
     rooted = assureRoot(alreadyRoot);
-    assertEquals(
-       rooted, alreadyRoot, "Root prefixed queue changed and it should not (root.base)");
-    assertNull(
-       assureRoot(null), "Null queue did not return null queue");
-    assertEquals("Empty queue did not return empty name", "",
-        assureRoot(""));
+    assertEquals(rooted, alreadyRoot,
+        "Root prefixed queue changed and it should not (root.base)");
+    assertNull(assureRoot(null), "Null queue did not return null queue");
+    assertEquals("", assureRoot(""),
+        "Empty queue did not return empty name");
   }
 
   @Test
@@ -113,25 +112,24 @@ public void testIsValidQueueName() {
     final String endSpace = "invalid ";
     final String unicodeSpace = "\u00A0invalid";
 
-    assertFalse(
-       isValidQueueName(null), "'null' queue was not marked as invalid");
+    assertFalse(isValidQueueName(null), "'null' queue was not marked as invalid");
     assertTrue(isValidQueueName(""), "empty queue was not tagged valid");
-    assertTrue(
-       isValidQueueName(valid), "Simple queue name was not tagged valid (valid)");
-    assertTrue(
-       isValidQueueName(rootOnly), "Root only queue was not tagged valid (root)");
-    assertTrue(
-       isValidQueueName(validRooted), "Root prefixed queue was not tagged valid (root.valid)");
-    assertFalse(
-       isValidQueueName(startDot), "Queue starting with dot was not tagged invalid (.invalid)");
-    assertFalse(
-       isValidQueueName(endDot), "Queue ending with dot was not tagged invalid (invalid.)");
-    assertFalse(
-       isValidQueueName(startSpace), "Queue starting with space was not tagged invalid ( invalid)");
-    assertFalse(
-       isValidQueueName(endSpace), "Queue ending with space was not tagged invalid (invalid )");
+    assertTrue(isValidQueueName(valid),
+        "Simple queue name was not tagged valid (valid)");
+    assertTrue(isValidQueueName(rootOnly),
+        "Root only queue was not tagged valid (root)");
+    assertTrue(isValidQueueName(validRooted),
+        "Root prefixed queue was not tagged valid (root.valid)");
+    assertFalse(isValidQueueName(startDot),
+        "Queue starting with dot was not tagged invalid (.invalid)");
+    assertFalse(isValidQueueName(endDot),
+        "Queue ending with dot was not tagged invalid (invalid.)");
+    assertFalse(isValidQueueName(startSpace),
+        "Queue starting with space was not tagged invalid ( invalid)");
+    assertFalse(isValidQueueName(endSpace),
+        "Queue ending with space was not tagged invalid (invalid )");
     // just one for sanity check extensive tests are in the scheduler utils
-    assertFalse(
-       isValidQueueName(unicodeSpace), "Queue with unicode space was not tagged as invalid (unicode)");
+    assertFalse(isValidQueueName(unicodeSpace),
+        "Queue with unicode space was not tagged as invalid (unicode)");
   }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementFactory.java

@@ -20,7 +20,10 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test for the {@link PlacementFactory}.

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementManager.java

@@ -29,7 +29,6 @@
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
 import org.apache.hadoop.yarn.util.Records;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -38,6 +37,9 @@
 
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.DOT;
 import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.TestCapacitySchedulerAutoCreatedQueueBase.setupQueueConfiguration;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class TestPlacementManager {
 
@@ -96,8 +98,7 @@ public void testPlaceApplicationWithPlacementRuleChain() throws Exception {
     asc.setQueue(YarnConfiguration.DEFAULT_QUEUE_NAME);
     asc.setApplicationName(APP_NAME);
 
-    Assertions.assertNull(
-       pm.placeApplication(asc, USER2), "Placement should be null");
+    assertNull(pm.placeApplication(asc, USER2), "Placement should be null");
     QueueMapping queueMappingEntity = QueueMapping.QueueMappingBuilder.create()
       .type(MappingType.APPLICATION)
       .source(APP_NAME)
@@ -112,7 +113,7 @@ public void testPlaceApplicationWithPlacementRuleChain() throws Exception {
     queuePlacementRules.add(anRule);
     pm.updateRules(queuePlacementRules);
     ApplicationPlacementContext pc = pm.placeApplication(asc, USER2);
-    Assertions.assertNotNull(pc);
+    assertNotNull(pc);
   }
 
   @Test
@@ -135,9 +136,9 @@ public void testPlacementRuleUpdationOrder() throws Exception {
 
     // As we are setting placement rule, It shouldn't update default
     // placement rule ie user-group. Number of placement rules should be 1.
-    Assertions.assertEquals(1, pm.getPlacementRules().size());
+    assertEquals(1, pm.getPlacementRules().size());
     // Verifying if placement rule set is same as the one we configured
-    Assertions.assertEquals(ugRule.getName(),
+    assertEquals(ugRule.getName(),
         pm.getPlacementRules().get(0).getName());
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestPlacementRuleFS.java

@@ -183,8 +183,8 @@ private void ruleInit(Class <? extends PlacementRule> ruleClass) {
     } catch (IOException ioe) {
       exceptionThrown = true;
     }
-    assertTrue(exceptionThrown, "Initialize with parent rule should have thrown exception " +
-            name);
+    assertTrue(exceptionThrown,
+        "Initialize with parent rule should have thrown exception " + name);
   }
 
   private Element createConf(String str) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/TestUserGroupMappingPlacementRule.java

@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.placement;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.isNull;
@@ -42,7 +43,6 @@
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.PrimaryGroupMapping;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.SimpleGroupsMapping;
 import org.apache.hadoop.yarn.util.Records;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -94,11 +94,11 @@ private void verifyQueueMapping(QueueMappingTestData queueMappingTestData)
         ApplicationSubmissionContext.class);
     asc.setQueue(inputQueue);
     ApplicationPlacementContext ctx = engine.getPlacementForApp(asc, inputUser);
-    Assertions.assertEquals(expectedQueue
-,         ctx != null ? ctx.getQueue() : inputQueue, "Queue");
+    assertEquals(expectedQueue,
+        ctx != null ? ctx.getQueue() : inputQueue, "Queue");
     if (ctx != null && expectedParentQueue != null) {
-      Assertions.assertEquals(expectedParentQueue
-,           ctx.getParentQueue(), "Parent Queue");
+      assertEquals(expectedParentQueue,
+          ctx.getParentQueue(), "Parent Queue");
     }
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/csmappingrule/TestCSMappingPlacementRule.java

@@ -33,23 +33,28 @@
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerQueueManager;
 import org.apache.hadoop.yarn.util.Records;
-import org.junit.Rule;
 import org.junit.jupiter.api.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_GROUP_MAPPING;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -59,8 +64,8 @@ public class TestCSMappingPlacementRule {
   private static final Logger LOG = LoggerFactory
       .getLogger(TestCSMappingPlacementRule.class);
 
-  @Rule
-  public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir
+  static Path folder;
 
   private Map<String, Set<String>> userGroups =
       ImmutableMap.<String, Set<String>>builder()
@@ -185,7 +190,7 @@ private void assertPlace(String message, CSMappingPlacementRule engine,
       String queue = apc.getParentQueue() == null ? "" :
           (apc.getParentQueue() + DOT);
       queue += apc.getQueue();
-      assertEquals(message, expectedQueue,  queue);
+      assertEquals(expectedQueue,  queue, message);
     } catch (YarnException e) {
       LOG.error(message, e);
       fail(message);
@@ -706,7 +711,7 @@ public void testJSONFileConfiguration() throws IOException {
     conf.set(CapacitySchedulerConfiguration.MAPPING_RULE_FORMAT,
         CapacitySchedulerConfiguration.MAPPING_RULE_FORMAT_JSON);
 
-    File jsonFile = folder.newFile("testJSONFileConfiguration.json");
+    File jsonFile = folder.resolve("testJSONFileConfiguration.json").toFile();
 
     BufferedWriter writer = new BufferedWriter(new FileWriter(jsonFile));
     try {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/csmappingrule/TestMappingRuleActions.java

@@ -20,7 +20,10 @@
 import org.apache.hadoop.yarn.server.resourcemanager.placement.VariableContext;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class TestMappingRuleActions {
   void assertRejectResult(MappingRuleResult result) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/placement/csmappingrule/TestMappingRuleMatchers.java

@@ -66,12 +66,12 @@ public void testVariableMatcher() {
         new MappingRuleMatchers.VariableMatcher("%custom", "Matching string"));
 
     matchers.forEach((matcherName, matcher) -> {
-      assertTrue(
-         matcher.match(matchingContext), matcherName + " with matchingContext should match");
-      assertFalse(
-         matcher.match(mismatchingContext), matcherName + " with mismatchingContext shouldn't match");
-      assertFalse(
-         matcher.match(emptyContext), matcherName + " with emptyContext shouldn't match");
+      assertTrue(matcher.match(matchingContext),
+          matcherName + " with matchingContext should match");
+      assertFalse(matcher.match(mismatchingContext),
+          matcherName + " with mismatchingContext shouldn't match");
+      assertFalse(matcher.match(emptyContext),
+          matcherName + " with emptyContext shouldn't match");
     });
   }
 
@@ -108,31 +108,27 @@ public void testVariableMatcherSubstitutions() {
     MappingRuleMatcher userStatic =
         new MappingRuleMatchers.VariableMatcher("%user", "bob");
 
-    assertTrue(
-       customUser.match(matchingContext), "%custom should match %user in matching context");
-    assertTrue(
-       userCustom.match(matchingContext), "%user should match %custom in matching context");
-    assertTrue(
-       userCusTom.match(matchingContext), "%user (bob) should match %cus%tom (b + ob) in matching context");
-    assertTrue(
-       userUser.match(matchingContext), "%user should match %user in any context");
-    assertTrue(
-       userStatic.match(matchingContext), "%user (bob) should match bob in in matching context");
-
-    assertFalse(
-    
-       customUser.match(mismatchingContext), "%custom (bob) should NOT match %user (dave) in mismatching context");
-    assertFalse(
-    
-       userCustom.match(mismatchingContext), "%user (dave) should NOT match %custom (bob) in mismatching context");
-    assertFalse(
-    
-       userCusTom.match(mismatchingContext), "%user (dave) should NOT match %cus%tom (b+ob) in mismatching context");
-    assertTrue(
-       userUser.match(mismatchingContext), "%user should match %user in any context");
-    assertFalse(
-    
-       userStatic.match(mismatchingContext), "%user (dave) should NOT match match bob in in matching context");
+    assertTrue(customUser.match(matchingContext),
+        "%custom should match %user in matching context");
+    assertTrue(userCustom.match(matchingContext),
+        "%user should match %custom in matching context");
+    assertTrue(userCusTom.match(matchingContext),
+        "%user (bob) should match %cus%tom (b + ob) in matching context");
+    assertTrue(userUser.match(matchingContext),
+        "%user should match %user in any context");
+    assertTrue(userStatic.match(matchingContext),
+        "%user (bob) should match bob in in matching context");
+
+    assertFalse(customUser.match(mismatchingContext),
+        "%custom (bob) should NOT match %user (dave) in mismatching context");
+    assertFalse(userCustom.match(mismatchingContext),
+        "%user (dave) should NOT match %custom (bob) in mismatching context");
+    assertFalse(userCusTom.match(mismatchingContext),
+       "%user (dave) should NOT match %cus%tom (b+ob) in mismatching context");
+    assertTrue(userUser.match(mismatchingContext),
+        "%user should match %user in any context");
+    assertFalse(userStatic.match(mismatchingContext),
+        "%user (dave) should NOT match match bob in in matching context");
   }
 
   @Test