HADOOP-19433. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-extras.

Author: slfan1989

hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/mapred/tools/TestGetGroups.java

@@ -24,25 +24,25 @@
 import org.apache.hadoop.mapred.tools.GetGroups;
 import org.apache.hadoop.tools.GetGroupsTestBase;
 import org.apache.hadoop.util.Tool;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 
 /**
  * Tests for the MR implementation of {@link GetGroups}
  */
-@Ignore
+@Disabled
 public class TestGetGroups extends GetGroupsTestBase {
 
   private MiniMRCluster cluster;
 
-  @Before
+  @BeforeEach
   public void setUpJobTracker() throws IOException, InterruptedException {
     cluster = new MiniMRCluster(0, "file:///", 1);
     conf = cluster.createJobConf();
   }
 
-  @After
+  @AfterEach
   public void tearDownJobTracker() throws IOException {
     cluster.shutdown();
   }

hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java

@@ -38,11 +38,12 @@
 import org.apache.hadoop.mapred.MiniMRClientClusterFactory;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.event.Level;
 
 import static org.slf4j.LoggerFactory.getLogger;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestDistCh {
   {
@@ -77,20 +78,20 @@ static class FileTree {
 
     Path createSmallFile(Path dir) throws IOException {
       final Path f = new Path(dir, "f" + ++fcount);
-      Assert.assertTrue(!fs.exists(f));
+      assertTrue(!fs.exists(f));
       final DataOutputStream out = fs.create(f);
       try {
         out.writeBytes("createSmallFile: f=" + f);
       } finally {
         out.close();
       }
-      Assert.assertTrue(fs.exists(f));
+      assertTrue(fs.exists(f));
       return f;
     }
 
     Path mkdir(Path dir) throws IOException {
-      Assert.assertTrue(fs.mkdirs(dir));
-      Assert.assertTrue(fs.getFileStatus(dir).isDirectory());
+      assertTrue(fs.mkdirs(dir));
+      assertTrue(fs.getFileStatus(dir).isDirectory());
       return dir;
     }
 
@@ -193,13 +194,13 @@ public void testDistCh() throws Exception {
   }
 
   static void checkFileStatus(ChPermissionStatus expected, FileStatus actual) {
-    Assert.assertEquals(expected.getUserName(), actual.getOwner());
-    Assert.assertEquals(expected.getGroupName(), actual.getGroup());
+    assertEquals(expected.getUserName(), actual.getOwner());
+    assertEquals(expected.getGroupName(), actual.getGroup());
     FsPermission perm = expected.getPermission();
     if (actual.isFile() && expected.defaultPerm) {
       perm = perm.applyUMask(UMASK);
     }
-    Assert.assertEquals(perm, actual.getPermission());
+    assertEquals(perm, actual.getPermission());
   }
 
   private static String runLsr(final FsShell shell, String root, int returnvalue
@@ -213,7 +214,7 @@ private static String runLsr(final FsShell shell, String root, int returnvalue
     System.setErr(out);
     final String results;
     try {
-      Assert.assertEquals(returnvalue, shell.run(new String[]{"-lsr", root}));
+      assertEquals(returnvalue, shell.run(new String[]{"-lsr", root}));
       results = bytes.toString();
     } finally {
       IOUtils.closeStream(out);