From 16ab57de2238a23023f3faab6406148fb245d1e9 Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Mon, 21 Apr 2025 13:18:04 +0800 Subject: [PATCH 1/2] HADOOP-19412. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-huaweicloud. --- .../fs/obs/TestOBSFSMainOperations.java | 21 ++++++++++--------- .../fs/obs/TestOBSFileContextCreateMkdir.java | 11 +++++----- .../obs/TestOBSFileContextMainOperations.java | 15 ++++++------- .../hadoop/fs/obs/TestOBSFileContextURI.java | 13 ++++++------ .../hadoop/fs/obs/TestOBSFileContextUtil.java | 9 ++++---- .../fs/obs/TestOBSFileSystemContract.java | 13 ++++++------ 6 files changed, 44 insertions(+), 38 deletions(-) diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFSMainOperations.java b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFSMainOperations.java index b62023b642486..9864e5008a02f 100644 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFSMainOperations.java +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFSMainOperations.java @@ -18,12 +18,13 @@ package org.apache.hadoop.fs.obs; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.TestFSMainOperationsLocalFileSystem; -import org.junit.After; -import org.junit.Assume; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; /** *

@@ -46,7 +47,7 @@ public class TestOBSFSMainOperations extends TestFSMainOperationsLocalFileSystem { @Override - @Before + @BeforeEach public void setUp() throws Exception { skipTestCheck(); Configuration conf = new Configuration(); @@ -56,17 +57,17 @@ public void setUp() throws Exception { @Override public void testWorkingDirectory() { - Assume.assumeTrue("unspport.", false); + assumeTrue(false, "unspport."); } @Override public void testListStatusThrowsExceptionForUnreadableDir() { - Assume.assumeTrue("unspport.", false); + assumeTrue(false, "unspport."); } @Override public void testRenameDirectoryToItself() { - Assume.assumeTrue("unspport.", false); + assumeTrue(false, "unspport."); } @Override @@ -76,11 +77,11 @@ public void testGlobStatusThrowsExceptionForUnreadableDir() { @Override public void testRenameFileToItself() { - Assume.assumeTrue("unspport.", false); + assumeTrue(false, "unspport."); } @Override - @After + @AfterEach public void tearDown() throws Exception { if(fSys != null) { super.tearDown(); @@ -88,6 +89,6 @@ public void tearDown() throws Exception { } public void skipTestCheck() { - Assume.assumeTrue(OBSContract.isContractTestEnabled()); + assumeTrue(OBSContract.isContractTestEnabled()); } } diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextCreateMkdir.java b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextCreateMkdir.java index 7860f356aa3ee..90e5062167722 100644 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextCreateMkdir.java +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextCreateMkdir.java @@ -18,19 +18,20 @@ package org.apache.hadoop.fs.obs; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.DelegateToFileSystem; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.FileContextCreateMkdirBaseTest; import org.apache.hadoop.fs.FileContextTestHelper; import org.apache.hadoop.fs.FileSystem; -import org.junit.Assume; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import java.net.URI; import java.util.UUID; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import edu.umd.cs.findbugs.annotation.SuppressFBWarnings; /** * File context create mkdir test cases on obs file system. @@ -38,9 +39,9 @@ public class TestOBSFileContextCreateMkdir extends FileContextCreateMkdirBaseTest { - @BeforeClass + @BeforeAll public static void skipTestCheck() { - Assume.assumeTrue(OBSContract.isContractTestEnabled()); + assumeTrue(OBSContract.isContractTestEnabled()); } diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextMainOperations.java b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextMainOperations.java index ef6d31215f7a8..12892db37f637 100644 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextMainOperations.java +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextMainOperations.java @@ -18,14 +18,15 @@ package org.apache.hadoop.fs.obs; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.DelegateToFileSystem; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.FileContextMainOperationsBaseTest; import org.apache.hadoop.fs.FileSystem; -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.net.URI; @@ -35,9 +36,9 @@ public class TestOBSFileContextMainOperations extends FileContextMainOperationsBaseTest { - @BeforeClass + @BeforeAll public static void skipTestCheck() { - Assume.assumeTrue(OBSContract.isContractTestEnabled()); + assumeTrue(OBSContract.isContractTestEnabled()); } @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( @@ -67,11 +68,11 @@ protected boolean listCorruptedBlocksSupported() { @Override @Test public void testSetVerifyChecksum() { - Assume.assumeTrue("unsupport.", false); + assumeTrue(false, "unsupport."); } @Override public void testMkdirsFailsForSubdirectoryOfExistingFile() { - Assume.assumeTrue("unsupport.", false); + assumeTrue(false, "unsupport."); } } diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java index b3f523092a924..a8fdace7ee398 100644 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java @@ -18,13 +18,14 @@ package org.apache.hadoop.fs.obs; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.DelegateToFileSystem; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.FileContextURIBase; import org.apache.hadoop.fs.FileSystem; -import org.junit.Assume; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import java.net.URI; @@ -49,9 +50,9 @@ */ public class TestOBSFileContextURI extends FileContextURIBase { - @BeforeClass + @BeforeAll public static void skipTestCheck() { - Assume.assumeTrue(OBSContract.isContractTestEnabled()); + assumeTrue(OBSContract.isContractTestEnabled()); } @Override @@ -77,12 +78,12 @@ public void setUp() throws Exception { @Override public void testMkdirsFailsForSubdirectoryOfExistingFile() { - Assume.assumeTrue("unsupport.", false); + assumeTrue(false, "unsupport."); } @Override public void testFileStatus() { - Assume.assumeTrue("unsupport.", false); + assumeTrue( false, "unsupport."); } } diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextUtil.java b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextUtil.java index 1404e06a45227..c428a17aff3a2 100644 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextUtil.java +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextUtil.java @@ -18,13 +18,14 @@ package org.apache.hadoop.fs.obs; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.DelegateToFileSystem; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.FileContextUtilBase; import org.apache.hadoop.fs.FileSystem; -import org.junit.Assume; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import java.net.URI; @@ -44,9 +45,9 @@ */ public class TestOBSFileContextUtil extends FileContextUtilBase { - @BeforeClass + @BeforeAll public static void skipTestCheck() { - Assume.assumeTrue(OBSContract.isContractTestEnabled()); + assumeTrue(OBSContract.isContractTestEnabled()); } @Override diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileSystemContract.java b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileSystemContract.java index defd3ba40f2aa..00f5d59dbc2ca 100644 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileSystemContract.java +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileSystemContract.java @@ -18,10 +18,11 @@ package org.apache.hadoop.fs.obs; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystemContractBaseTest; -import org.junit.Assume; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; /** @@ -35,7 +36,7 @@ **/ public class TestOBSFileSystemContract extends FileSystemContractBaseTest { - @Before + @BeforeEach public void setUp() throws Exception { skipTestCheck(); Configuration conf = new Configuration(); @@ -45,15 +46,15 @@ public void setUp() throws Exception { @Override public void testMkdirsWithUmask() { - Assume.assumeTrue("unspport.", false); + assumeTrue(false, "unspport."); } @Override public void testRenameRootDirForbidden() { - Assume.assumeTrue("unspport.", false); + assumeTrue(false, "unspport."); } public void skipTestCheck() { - Assume.assumeTrue(OBSContract.isContractTestEnabled()); + assumeTrue(OBSContract.isContractTestEnabled()); } } From c2d2a6c6f27ec7c85de2ea873e1cba8d6dc5d7ec Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Mon, 21 Apr 2025 20:27:24 +0800 Subject: [PATCH 2/2] HADOOP-19412. Fix CheckStyle. --- .../java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java index a8fdace7ee398..32ecde8b92c8a 100644 --- a/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java +++ b/hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSFileContextURI.java @@ -83,7 +83,7 @@ public void testMkdirsFailsForSubdirectoryOfExistingFile() { @Override public void testFileStatus() { - assumeTrue( false, "unsupport."); + assumeTrue(false, "unsupport."); } }