YARN-11263. Fix Junit Test & CheckStyle.

Author: slfan1989

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestContainerManagerWithLCE.java

@@ -20,6 +20,9 @@
 
 import java.io.File;
 import java.io.IOException;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,8 +31,8 @@
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.TestContainerManager;
-import org.junit.After;
-import org.junit.Assume;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class TestContainerManagerWithLCE extends TestContainerManager {
 
@@ -49,10 +52,10 @@ public TestContainerManagerWithLCE() throws UnsupportedFileSystemException {
         TestContainerManagerWithLCE.class.getName() + "-tmpDir");
   }
 
+  @BeforeEach
   @Override
   public void setup() throws IOException {
-    Assume.assumeTrue("LCE binary path is not passed. Not running the test",
-        shouldRunTest());
+    assumeTrue(shouldRunTest(), "LCE binary path is not passed. Not running the test");
     super.setup();
     localFS.setPermission(new Path(localDir.getCanonicalPath()),
         new FsPermission(
@@ -62,7 +65,7 @@ public void setup() throws IOException {
             (short) 0777));
   }
 
-  @After
+  @AfterEach
   @Override
   public void tearDown() throws IOException, InterruptedException {
     if (shouldRunTest()) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java

@@ -1193,19 +1193,19 @@ protected void testContainerLaunchAndExit(int exitCode) throws IOException,
     ContainerStatus containerStatus = containerManager.
         getContainerStatuses(gcsRequest).getContainerStatuses().get(0);
 
-	 // Verify exit status matches exit state of script
-     assertEquals(exitCode, containerStatus.getExitStatus());
+    // Verify exit status matches exit state of script
+    assertEquals(exitCode, containerStatus.getExitStatus());
   }
 
   @Test
   public void testContainerLaunchAndExitSuccess() throws IOException,
       InterruptedException, YarnException {
-	  containerManager.start();
-	  int exitCode = 0;
+	containerManager.start();
+    int exitCode = 0;
 
-	  // launch context for a command that will return exit code 0 
-	  // and verify exit code returned 
-	  testContainerLaunchAndExit(exitCode);	  
+	// launch context for a command that will return exit code 0
+	// and verify exit code returned
+	testContainerLaunchAndExit(exitCode);
   }
 
   @Test
@@ -2265,8 +2265,8 @@ public void testGetLocalizationStatuses() throws Exception {
         .get(containerId).size());
     LocalizationStatus status = statusResponse.getLocalizationStatuses()
         .get(containerId).iterator().next();
-    assertEquals("resource key", "dest_file1",
-        status.getResourceKey());
+    assertEquals("dest_file1",
+        status.getResourceKey(), "resource key");
     assertEquals(LocalizationState.COMPLETED,
         status.getLocalizationState(), "resource status");
 
@@ -2331,8 +2331,8 @@ public void testGetLocalizationStatusesMultiContainers() throws Exception {
           .getLocalizationStatuses().get(container1);
       assertEquals(1, statuses.size());
       LocalizationStatus status = statuses.get(0);
-      assertEquals("resource key", "dest_file1",
-          status.getResourceKey());
+      assertEquals("dest_file1",
+          status.getResourceKey(), "resource key");
       assertEquals(LocalizationState.COMPLETED,
           status.getLocalizationState(), "resource status");
     });

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/TestCGroupElasticMemoryController.java

@@ -59,14 +59,14 @@ public class TestCGroupElasticMemoryController {
   public void testConstructorOff()
       throws YarnException {
     assertThrows(YarnException.class, () -> {
-        new CGroupElasticMemoryController(
+      new CGroupElasticMemoryController(
           conf,
           null,
           null,
           false,
           false,
           10000
-        );
+      );
     });
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/fpga/TestFpgaResourceHandlerImpl.java

@@ -506,10 +506,10 @@ public void testReacquireContainer() throws ResourceHandlerException {
   @Test
   public void testSha256CalculationFails() throws ResourceHandlerException {
     ResourceHandlerException exception =
-      assertThrows(ResourceHandlerException.class, () -> {
-        dummyAocx.delete();
-        fpgaResourceHandler.preStart(mockContainer(0, 1, "GEMM"));
-      });
+        assertThrows(ResourceHandlerException.class, () -> {
+          dummyAocx.delete();
+          fpgaResourceHandler.preStart(mockContainer(0, 1, "GEMM"));
+        });
     assertEquals("Could not calculate SHA-256", exception.getMessage());
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceAllocator.java

@@ -343,28 +343,28 @@ public void testThreeContainersJustTwoOfThemSatisfied()
       throws ResourceHandlerException, IOException {
     ResourceHandlerException exception =
         assertThrows(ResourceHandlerException.class, () -> {
-        addGpus(new GpuDevice(1, 1), new GpuDevice(1, 2),
-            new GpuDevice(1, 3), new GpuDevice(1, 4),
-            new GpuDevice(1, 5), new GpuDevice(1, 6));
-        Container container = createMockContainer(3, 5L);
-        Container container2 = createMockContainer(2, 6L);
-        Container container3 = createMockContainer(2, 6L);
-
-        GpuAllocation allocation = testSubject.assignGpus(container);
-        assertAllocatedGpus(3, 3, container, allocation);
-        assertEquals(3, testSubject.getDeviceAllocationMapping().size());
-        assertEquals(3, testSubject.getAssignedGpus().size());
-        assertEquals(6, testSubject.getAllowedGpus().size());
-        assertEquals(3, testSubject.getAvailableGpus());
-
-        GpuAllocation allocation2 = testSubject.assignGpus(container2);
-        assertAllocatedGpus(2, 4, container2, allocation2);
-        assertEquals(5, testSubject.getDeviceAllocationMapping().size());
-        assertEquals(5, testSubject.getAssignedGpus().size());
-        assertEquals(6, testSubject.getAllowedGpus().size());
-        assertEquals(1, testSubject.getAvailableGpus());
-
-        testSubject.assignGpus(container3);
+          addGpus(new GpuDevice(1, 1), new GpuDevice(1, 2),
+              new GpuDevice(1, 3), new GpuDevice(1, 4),
+              new GpuDevice(1, 5), new GpuDevice(1, 6));
+          Container container = createMockContainer(3, 5L);
+          Container container2 = createMockContainer(2, 6L);
+          Container container3 = createMockContainer(2, 6L);
+
+          GpuAllocation allocation = testSubject.assignGpus(container);
+          assertAllocatedGpus(3, 3, container, allocation);
+          assertEquals(3, testSubject.getDeviceAllocationMapping().size());
+          assertEquals(3, testSubject.getAssignedGpus().size());
+          assertEquals(6, testSubject.getAllowedGpus().size());
+          assertEquals(3, testSubject.getAvailableGpus());
+
+          GpuAllocation allocation2 = testSubject.assignGpus(container2);
+          assertAllocatedGpus(2, 4, container2, allocation2);
+          assertEquals(5, testSubject.getDeviceAllocationMapping().size());
+          assertEquals(5, testSubject.getAssignedGpus().size());
+          assertEquals(6, testSubject.getAllowedGpus().size());
+          assertEquals(1, testSubject.getAvailableGpus());
+
+          testSubject.assignGpus(container3);
       });
 
     assertThat(exception.getMessage()).contains("Failed to find enough GPUs");

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/runtime/TestDockerContainerRuntime.java

@@ -182,7 +182,6 @@ public class TestDockerContainerRuntime {
   private final static String ENV_OCI_CONTAINER_RUN_PRIVILEGED_CONTAINER =
       formatOciEnvKey(RUNTIME_TYPE, RUN_PRIVILEGED_CONTAINER_SUFFIX);
 
-  // @Parameterized.Parameters(name = "https={0}")
   public static Collection<Object[]> data() {
     return Arrays.asList(new Object[][] {
         {true}, {false}
@@ -1846,7 +1845,7 @@ public void testDefaultRWMountsInvalid(boolean pHttps) throws ContainerExecution
   public void testContainerLivelinessFileExistsNoException(boolean pHttps,
       @TempDir java.nio.file.Path path) throws Exception {
     initHttps(pHttps);
-    File testTempDir = Files.createDirectory(path).toFile();
+    File testTempDir = path.toFile();
     File procPidPath = new File(testTempDir + File.separator + signalPid);
     procPidPath.createNewFile();
     procPidPath.deleteOnExit();

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java

@@ -820,7 +820,7 @@ public void testLocalizerRunnerException() throws Exception {
 
   @Test
   @Timeout(value = 10)
-  @SuppressWarnings("unchecked") // mocked generics
+  @SuppressWarnings({"unchecked", "methodlength"}) // mocked generics
   public void testLocalizationHeartbeat() throws Exception {
     List<Path> localDirs = new ArrayList<Path>();
     String[] sDirs = new String[1];

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java

@@ -1585,7 +1585,7 @@ public void testFailedDirsLocalFileDeletionAfterUpload() throws Exception {
 
   @Test
   @Timeout(value = 50)
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "methodlength"})
   public void testLogAggregationServiceWithPatterns() throws Exception {
 
     LogAggregationContext logAggregationContextWithIncludePatterns =

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/com/nec/TestVEDeviceDiscoverer.java

@@ -240,11 +240,11 @@ public void testNonVESlotFilesAreSkipped() throws IOException {
   @Test
   public void testNonBlockOrCharFilesAreRejected() throws IOException {
     IllegalArgumentException exception =
-        assertThrows(IllegalArgumentException.class, () -> {
-        createVeSlotFile(0);
-        when(mockCommandExecutor.getOutput()).thenReturn("0:0:regular file");
-        discoverer.getDevicesFromPath(testFolder);
-      });
+          assertThrows(IllegalArgumentException.class, () -> {
+          createVeSlotFile(0);
+          when(mockCommandExecutor.getOutput()).thenReturn("0:0:regular file");
+          discoverer.getDevicesFromPath(testFolder);
+        });
     assertThat(exception.getMessage()).contains("File is neither a char nor block device");
   }