From 199e549d435504fa6377dbbd94b3283ae14c9adc Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Wed, 16 Apr 2025 15:59:18 +0800 Subject: [PATCH 1/3] HADOOP-19427. Upgrade JUnit from 4 to 5 in hadoop-compat-bench. --- hadoop-tools/hadoop-compat-bench/pom.xml | 25 +++++++++++++++++++ .../common/TestHdfsCompatDefaultSuites.java | 8 +++--- .../common/TestHdfsCompatFsCommand.java | 16 ++++++------ .../TestHdfsCompatInterfaceCoverage.java | 12 ++++----- .../common/TestHdfsCompatShellCommand.java | 20 +++++++-------- 5 files changed, 53 insertions(+), 28 deletions(-) diff --git a/hadoop-tools/hadoop-compat-bench/pom.xml b/hadoop-tools/hadoop-compat-bench/pom.xml index ed032b3db9b3b..ee93c7cf1870f 100644 --- a/hadoop-tools/hadoop-compat-bench/pom.xml +++ b/hadoop-tools/hadoop-compat-bench/pom.xml @@ -69,6 +69,31 @@ mockito-inline test + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.jupiter + junit-jupiter-params + test + + + org.junit.platform + junit-platform-launcher + test + + + org.junit.vintage + junit-vintage-engine + test + diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatDefaultSuites.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatDefaultSuites.java index 882d1fe8ef9b6..2581a40184b54 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatDefaultSuites.java +++ b/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(); diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatFsCommand.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatFsCommand.java index c2d3b0260d005..34e096badd8bf 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatFsCommand.java +++ b/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); } diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java index cbee71d867a1c..b1ecbce9ab670 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java +++ b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java @@ -20,9 +20,9 @@ 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; @@ -30,13 +30,13 @@ public class TestHdfsCompatInterfaceCoverage { @Test - @Ignore + @Disabled public void testFsCompatibility() { Set publicMethods = getPublicInterfaces(FileSystem.class); Set 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); } } diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatShellCommand.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatShellCommand.java index 2602a6fab12ba..c48c8c8a30cdb 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatShellCommand.java +++ b/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); } From efec60fab3ee5a4dd2ec5efabde4ea67c33fa42e Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Wed, 16 Apr 2025 21:51:16 +0800 Subject: [PATCH 2/3] HADOOP-19427. Fix CheckStyle Issue. --- .../compat/common/TestHdfsCompatDefaultSuites.java | 7 ++++--- .../fs/compat/common/TestHdfsCompatFsCommand.java | 14 +++++++------- .../common/TestHdfsCompatInterfaceCoverage.java | 4 ++-- .../compat/common/TestHdfsCompatShellCommand.java | 10 +++++----- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatDefaultSuites.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatDefaultSuites.java index 2581a40184b54..8ddd205a49848 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatDefaultSuites.java +++ b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatDefaultSuites.java @@ -17,11 +17,12 @@ */ package org.apache.hadoop.fs.compat.common; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.hadoop.fs.compat.HdfsCompatTool; 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.jupiter.api.Assertions; import org.junit.jupiter.api.Test; public class TestHdfsCompatDefaultSuites { @@ -35,7 +36,7 @@ public void testSuiteAll() throws Exception { HdfsCompatCommand cmd = new HdfsCompatTestCommand(uri, "ALL", conf); cmd.initialize(); HdfsCompatReport report = cmd.apply(); - Assertions.assertEquals(0, report.getFailedCase().size()); + assertEquals(0, report.getFailedCase().size()); new HdfsCompatTool(conf).printReport(report, System.out); } finally { cluster.shutdown(); @@ -52,7 +53,7 @@ public void testSuiteTpcds() throws Exception { HdfsCompatCommand cmd = new HdfsCompatTestCommand(uri, "TPCDS", conf); cmd.initialize(); HdfsCompatReport report = cmd.apply(); - Assertions.assertEquals(0, report.getFailedCase().size()); + assertEquals(0, report.getFailedCase().size()); new HdfsCompatTool(conf).printReport(report, System.out); } finally { cluster.shutdown(); diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatFsCommand.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatFsCommand.java index 34e096badd8bf..a8a6c7039e5a0 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatFsCommand.java +++ b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatFsCommand.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.fs.compat.common; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.hadoop.fs.compat.HdfsCompatTool; import org.apache.hadoop.fs.compat.hdfs.HdfsCompatMiniCluster; @@ -25,7 +26,6 @@ import org.apache.hadoop.fs.compat.cases.HdfsCompatMkdirTestCases; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -47,8 +47,8 @@ public void testDfsCompatibility() throws Exception { HdfsCompatCommand cmd = new TestCommand(uri, suite, conf); cmd.initialize(); HdfsCompatReport report = cmd.apply(); - Assertions.assertEquals(7, report.getPassedCase().size()); - Assertions.assertEquals(0, report.getFailedCase().size()); + assertEquals(7, report.getPassedCase().size()); + 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(); - Assertions.assertEquals(1, report.getPassedCase().size()); - Assertions.assertEquals(6, report.getFailedCase().size()); + assertEquals(1, report.getPassedCase().size()); + 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(); - Assertions.assertEquals(0, report.getPassedCase().size()); - Assertions.assertEquals(6, report.getFailedCase().size()); + assertEquals(0, report.getPassedCase().size()); + assertEquals(6, report.getFailedCase().size()); show(conf, report); cleanup(cmd, conf); } diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java index b1ecbce9ab670..892eaffa6e4c6 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java +++ b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java @@ -17,10 +17,10 @@ */ package org.apache.hadoop.fs.compat.common; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.hadoop.fs.compat.cases.HdfsCompatBasics; import org.apache.hadoop.fs.FileSystem; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Disabled; @@ -35,7 +35,7 @@ public void testFsCompatibility() { Set publicMethods = getPublicInterfaces(FileSystem.class); Set targets = getTargets(HdfsCompatBasics.class); for (String publicMethod : publicMethods) { - Assertions.assertTrue( + assertTrue( targets.contains(publicMethod), "Method not tested: " + publicMethod); } } diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatShellCommand.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatShellCommand.java index c48c8c8a30cdb..6d4589e9132eb 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatShellCommand.java +++ b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatShellCommand.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.fs.compat.common; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.commons.io.FileUtils; import org.apache.hadoop.fs.compat.HdfsCompatTool; @@ -25,7 +26,6 @@ import org.apache.hadoop.fs.compat.hdfs.HdfsCompatTestShellScope; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -55,8 +55,8 @@ public void testDfsCompatibility() throws Exception { HdfsCompatCommand cmd = new TestCommand(uri, conf); cmd.initialize(); HdfsCompatReport report = cmd.apply(); - Assertions.assertEquals(3, report.getPassedCase().size()); - Assertions.assertEquals(0, report.getFailedCase().size()); + assertEquals(3, report.getPassedCase().size()); + 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(); - Assertions.assertEquals(2, report.getPassedCase().size()); - Assertions.assertEquals(0, report.getFailedCase().size()); + assertEquals(2, report.getPassedCase().size()); + assertEquals(0, report.getFailedCase().size()); show(conf, report); } From cb9186a23609a31d74d4a6110e9f2d749bd1c030 Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Sat, 19 Apr 2025 14:21:48 +0800 Subject: [PATCH 3/3] HADOOP-19427. Fix CheckStyle Issue. --- .../fs/compat/common/TestHdfsCompatInterfaceCoverage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java index 892eaffa6e4c6..af1746a9fa096 100644 --- a/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java +++ b/hadoop-tools/hadoop-compat-bench/src/test/java/org/apache/hadoop/fs/compat/common/TestHdfsCompatInterfaceCoverage.java @@ -35,8 +35,8 @@ public void testFsCompatibility() { Set publicMethods = getPublicInterfaces(FileSystem.class); Set targets = getTargets(HdfsCompatBasics.class); for (String publicMethod : publicMethods) { - assertTrue( - targets.contains(publicMethod), "Method not tested: " + publicMethod); + assertTrue(targets.contains(publicMethod), + "Method not tested: " + publicMethod); } }