HADOOP-19427. Upgrade JUnit from 4 to 5 in hadoop-compat-bench.

Author: slfan1989

hadoop-tools/hadoop-compat-bench/pom.xml

@@ -69,6 +69,31 @@
       <artifactId>mockito-inline</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatDefaultSuites.java

@@ -21,8 +21,8 @@
 import org.apache.hadoop.fs.compat.hdfs.HdfsCompatMiniCluster;
 import org.apache.hadoop.fs.compat.hdfs.HdfsCompatTestCommand;
 import org.apache.hadoop.conf.Configuration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class TestHdfsCompatDefaultSuites {
   @Test
@@ -35,7 +35,7 @@ public void testSuiteAll() throws Exception {
       HdfsCompatCommand cmd = new HdfsCompatTestCommand(uri, "ALL", conf);
       cmd.initialize();
       HdfsCompatReport report = cmd.apply();
-      Assert.assertEquals(0, report.getFailedCase().size());
+      Assertions.assertEquals(0, report.getFailedCase().size());
       new HdfsCompatTool(conf).printReport(report, System.out);
     } finally {
       cluster.shutdown();
@@ -52,7 +52,7 @@ public void testSuiteTpcds() throws Exception {
       HdfsCompatCommand cmd = new HdfsCompatTestCommand(uri, "TPCDS", conf);
       cmd.initialize();
       HdfsCompatReport report = cmd.apply();
-      Assert.assertEquals(0, report.getFailedCase().size());
+      Assertions.assertEquals(0, report.getFailedCase().size());
       new HdfsCompatTool(conf).printReport(report, System.out);
     } finally {
       cluster.shutdown();

hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatFsCommand.java

@@ -25,8 +25,8 @@
 import org.apache.hadoop.fs.compat.cases.HdfsCompatMkdirTestCases;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -47,8 +47,8 @@ public void testDfsCompatibility() throws Exception {
       HdfsCompatCommand cmd = new TestCommand(uri, suite, conf);
       cmd.initialize();
       HdfsCompatReport report = cmd.apply();
-      Assert.assertEquals(7, report.getPassedCase().size());
-      Assert.assertEquals(0, report.getFailedCase().size());
+      Assertions.assertEquals(7, report.getPassedCase().size());
+      Assertions.assertEquals(0, report.getFailedCase().size());
       show(conf, report);
     } finally {
       if (cluster != null) {
@@ -65,8 +65,8 @@ public void testLocalFsCompatibility() throws Exception {
     HdfsCompatCommand cmd = new TestCommand(uri, suite, conf);
     cmd.initialize();
     HdfsCompatReport report = cmd.apply();
-    Assert.assertEquals(1, report.getPassedCase().size());
-    Assert.assertEquals(6, report.getFailedCase().size());
+    Assertions.assertEquals(1, report.getPassedCase().size());
+    Assertions.assertEquals(6, report.getFailedCase().size());
     show(conf, report);
     cleanup(cmd, conf);
   }
@@ -79,8 +79,8 @@ public void testFsCompatibilityWithSuite() throws Exception {
     HdfsCompatCommand cmd = new TestCommand(uri, suite, conf);
     cmd.initialize();
     HdfsCompatReport report = cmd.apply();
-    Assert.assertEquals(0, report.getPassedCase().size());
-    Assert.assertEquals(6, report.getFailedCase().size());
+    Assertions.assertEquals(0, report.getPassedCase().size());
+    Assertions.assertEquals(6, report.getFailedCase().size());
     show(conf, report);
     cleanup(cmd, conf);
   }

hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java

@@ -20,23 +20,23 @@
 
 import org.apache.hadoop.fs.compat.cases.HdfsCompatBasics;
 import org.apache.hadoop.fs.FileSystem;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.Set;
 
 public class TestHdfsCompatInterfaceCoverage {
   @Test
-  @Ignore
+  @Disabled
   public void testFsCompatibility() {
     Set<String> publicMethods = getPublicInterfaces(FileSystem.class);
     Set<String> targets = getTargets(HdfsCompatBasics.class);
     for (String publicMethod : publicMethods) {
-      Assert.assertTrue("Method not tested: " + publicMethod,
-          targets.contains(publicMethod));
+      Assertions.assertTrue(
+         targets.contains(publicMethod), "Method not tested: " + publicMethod);
     }
   }
 

hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatShellCommand.java

@@ -24,10 +24,10 @@
 import org.apache.hadoop.fs.compat.hdfs.HdfsCompatTestCommand;
 import org.apache.hadoop.fs.compat.hdfs.HdfsCompatTestShellScope;
 import org.apache.hadoop.conf.Configuration;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,13 +36,13 @@
 public class TestHdfsCompatShellCommand {
   private HdfsCompatMiniCluster cluster;
 
-  @Before
+  @BeforeEach
   public void runCluster() throws IOException {
     this.cluster = new HdfsCompatMiniCluster();
     this.cluster.start();
   }
 
-  @After
+  @AfterEach
   public void shutdownCluster() {
     this.cluster.shutdown();
     this.cluster = null;
@@ -55,8 +55,8 @@ public void testDfsCompatibility() throws Exception {
     HdfsCompatCommand cmd = new TestCommand(uri, conf);
     cmd.initialize();
     HdfsCompatReport report = cmd.apply();
-    Assert.assertEquals(3, report.getPassedCase().size());
-    Assert.assertEquals(0, report.getFailedCase().size());
+    Assertions.assertEquals(3, report.getPassedCase().size());
+    Assertions.assertEquals(0, report.getFailedCase().size());
     show(conf, report);
   }
 
@@ -67,8 +67,8 @@ public void testSkipCompatibility() throws Exception {
     HdfsCompatCommand cmd = new TestSkipCommand(uri, conf);
     cmd.initialize();
     HdfsCompatReport report = cmd.apply();
-    Assert.assertEquals(2, report.getPassedCase().size());
-    Assert.assertEquals(0, report.getFailedCase().size());
+    Assertions.assertEquals(2, report.getPassedCase().size());
+    Assertions.assertEquals(0, report.getFailedCase().size());
     show(conf, report);
   }