Browse Source

HADOOP-19412. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-huaweicloud. (#7639)

* HADOOP-19412. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-huaweicloud.

Co-authored-by: He Xiaoqiao <hexiaoqiao@apache.org>
Reviewed-by: He Xiaoqiao <hexiaoqiao@apache.org>
Signed-off-by: Shilun Fan <slfan1989@apache.org>
slfan1989 1 week ago
parent
commit
751468d6fa

+ 11 - 10
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;
 
 /**
  * <p>
@@ -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 class TestOBSFSMainOperations extends
 
   @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 class TestOBSFSMainOperations extends
 
   @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 class TestOBSFSMainOperations extends
   }
 
   public void skipTestCheck() {
-    Assume.assumeTrue(OBSContract.isContractTestEnabled());
+    assumeTrue(OBSContract.isContractTestEnabled());
   }
 }

+ 6 - 5
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 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 public class TestOBSFileContextCreateMkdir extends
     FileContextCreateMkdirBaseTest {
 
-  @BeforeClass
+  @BeforeAll
   public static void skipTestCheck() {
-    Assume.assumeTrue(OBSContract.isContractTestEnabled());
+    assumeTrue(OBSContract.isContractTestEnabled());
   }
 
 

+ 8 - 7
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 @@ import java.net.URI;
 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 @@ public class TestOBSFileContextMainOperations extends
   @Override
   @Test
   public void testSetVerifyChecksum() {
-    Assume.assumeTrue("unsupport.", false);
+    assumeTrue(false, "unsupport.");
   }
 
   @Override
   public void testMkdirsFailsForSubdirectoryOfExistingFile() {
-    Assume.assumeTrue("unsupport.", false);
+    assumeTrue(false, "unsupport.");
   }
 }

+ 7 - 6
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 @@ import java.net.URI;
  */
 public class TestOBSFileContextURI extends FileContextURIBase {
 
-  @BeforeClass
+  @BeforeAll
   public static void skipTestCheck() {
-    Assume.assumeTrue(OBSContract.isContractTestEnabled());
+    assumeTrue(OBSContract.isContractTestEnabled());
   }
 
   @Override
@@ -77,12 +78,12 @@ public class TestOBSFileContextURI extends FileContextURIBase {
 
   @Override
   public void testMkdirsFailsForSubdirectoryOfExistingFile() {
-    Assume.assumeTrue("unsupport.", false);
+    assumeTrue(false, "unsupport.");
   }
 
   @Override
   public void testFileStatus() {
-    Assume.assumeTrue("unsupport.", false);
+    assumeTrue(false, "unsupport.");
   }
 
 }

+ 5 - 4
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 @@ import java.net.URI;
  */
 public class TestOBSFileContextUtil extends FileContextUtilBase {
 
-  @BeforeClass
+  @BeforeAll
   public static void skipTestCheck() {
-    Assume.assumeTrue(OBSContract.isContractTestEnabled());
+    assumeTrue(OBSContract.isContractTestEnabled());
   }
 
   @Override

+ 7 - 6
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 @@ import org.junit.Before;
  **/
 public class TestOBSFileSystemContract extends FileSystemContractBaseTest {
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     skipTestCheck();
     Configuration conf = new Configuration();
@@ -45,15 +46,15 @@ public class TestOBSFileSystemContract extends FileSystemContractBaseTest {
 
   @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());
   }
 }