Merge branch 'apache:trunk' into HADOOP-19415-PART7

Author: slfan1989

hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSContractAppend.java

@@ -21,7 +21,8 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.contract.AbstractContractAppendTest;
 import org.apache.hadoop.fs.contract.AbstractFSContract;
-import org.junit.Assume;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * Append test cases on obs file system.
@@ -35,6 +36,6 @@ protected AbstractFSContract createContract(final Configuration conf) {
 
   @Override
   public void testRenameFileBeingAppended() {
-    Assume.assumeTrue("unsupport.", false);
+    assumeTrue(false, "unsupport.");
   }
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFSCopyFromLocal.java

@@ -20,7 +20,7 @@
 
 import java.io.File;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.contract.AbstractContractCopyFromLocalTest;

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java

@@ -22,7 +22,8 @@
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,6 +42,7 @@ public abstract class AbstractContractAppendTest extends AbstractFSContractTestB
   private Path testPath;
   private Path target;
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractBulkDeleteTest.java

@@ -25,7 +25,8 @@
 import java.util.Map;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,6 +75,7 @@ public abstract class AbstractContractBulkDeleteTest extends AbstractFSContractT
    */
   private DynamicWrappedIO dynamicWrappedIO;
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractConcatTest.java

@@ -20,7 +20,8 @@
 
 import org.apache.hadoop.fs.Path;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,6 +45,7 @@ public abstract class AbstractContractConcatTest extends AbstractFSContractTestB
   private Path zeroByteFile;
   private Path target;
 
+  @BeforeEach
   @Override
   public void setup() throws Exception {
     super.setup();

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractContentSummaryTest.java

@@ -23,7 +23,7 @@
 import org.apache.hadoop.fs.Path;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.FileNotFoundException;
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCopyFromLocalTest.java

@@ -25,7 +25,8 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -43,6 +44,7 @@ public abstract class AbstractContractCopyFromLocalTest extends
   private static final Charset ASCII = StandardCharsets.US_ASCII;
   private File file;
 
+  @AfterEach
   @Override
   public void teardown() throws Exception {
     super.teardown();
@@ -65,12 +67,12 @@ public void testCopyFile() throws Throwable {
     Path dest = copyFromLocal(file, true);
 
     assertPathExists("uploaded file not found", dest);
-    assertTrue("source file deleted", Files.exists(file.toPath()));
+    assertTrue(Files.exists(file.toPath()), "source file deleted");
 
     FileSystem fs = getFileSystem();
     FileStatus status = fs.getFileStatus(dest);
-    assertEquals("File length not equal " + status,
-        message.getBytes(ASCII).length, status.getLen());
+    assertEquals(message.getBytes(ASCII).length, status.getLen(),
+        "File length not equal " + status);
     assertFileTextEquals(dest, message);
   }
 
@@ -109,7 +111,7 @@ public void testSourceIsFileAndDelSrcTrue() throws Throwable {
     file = createTempFile("test");
     copyFromLocal(file, false, true);
 
-    assertFalse("Source file not deleted", Files.exists(file.toPath()));
+    assertFalse(Files.exists(file.toPath()), "Source file not deleted");
   }
 
   @Test
@@ -215,7 +217,7 @@ public void testSrcIsDirWithDelSrcOptions() throws Throwable {
     copyFromLocal(source, false, true);
     Path dest = fileToPath(child, source.getParentFile());
 
-    assertFalse("Directory not deleted", Files.exists(source.toPath()));
+    assertFalse(Files.exists(source.toPath()), "Directory not deleted");
     assertFileTextEquals(dest, contents);
   }
 
@@ -258,8 +260,8 @@ public void testCopyDirectoryWithDelete() throws Throwable {
     Path dst = path(srcDir.getFileName().toString());
     getFileSystem().copyFromLocalFile(true, true, src, dst);
 
-    assertFalse("Source directory was not deleted",
-        Files.exists(srcDir));
+    assertFalse(Files.exists(srcDir),
+        "Source directory was not deleted");
   }
 
   @Test
@@ -330,7 +332,7 @@ protected File createTempDirectory(File parent, String name)
 
   private void assertFileTextEquals(Path path, String expected)
       throws IOException {
-    assertEquals("Wrong data in " + path,
-        expected, IOUtils.toString(getFileSystem().open(path), ASCII));
+    assertEquals(expected, IOUtils.toString(getFileSystem().open(path), ASCII),
+        "Wrong data in " + path);
   }
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractCreateTest.java

@@ -27,7 +27,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.StreamCapabilities;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.AssumptionViolatedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -278,8 +278,8 @@ public void testFileStatusBlocksizeNonEmptyFile() throws Throwable {
     FileSystem fs = getFileSystem();
 
     long rootPath = fs.getDefaultBlockSize(path("/"));
-    assertTrue("Root block size is invalid " + rootPath,
-        rootPath > 0);
+    assertTrue(rootPath > 0,
+        "Root block size is invalid " + rootPath);
 
     Path path = path("testFileStatusBlocksizeNonEmptyFile");
     byte[] data = dataset(256, 'a', 'z');
@@ -303,13 +303,13 @@ private void validateBlockSize(FileSystem fs, Path path, int minValue)
     FileStatus status =
         getFileStatusEventually(fs, path, CREATE_TIMEOUT);
     String statusDetails = status.toString();
-    assertTrue("File status block size too low:  " + statusDetails
-            + " min value: " + minValue,
-        status.getBlockSize() >= minValue);
+    assertTrue(status.getBlockSize() >= minValue,
+        "File status block size too low:  " + statusDetails
+        + " min value: " + minValue);
     long defaultBlockSize = fs.getDefaultBlockSize(path);
-    assertTrue("fs.getDefaultBlockSize(" + path + ") size " +
-            defaultBlockSize + " is below the minimum of " + minValue,
-        defaultBlockSize >= minValue);
+    assertTrue(defaultBlockSize >= minValue,
+        "fs.getDefaultBlockSize(" + path + ") size " +
+        defaultBlockSize + " is below the minimum of " + minValue);
   }
 
   @Test
@@ -320,14 +320,14 @@ public void testCreateMakesParentDirs() throws Throwable {
     Path parent = new Path(grandparent, "parent");
     Path child = new Path(parent, "child");
     touch(fs, child);
-    assertEquals("List status of parent should include the 1 child file",
-        1, fs.listStatus(parent).length);
-    assertTrue("Parent directory does not appear to be a directory",
-        fs.getFileStatus(parent).isDirectory());
-    assertEquals("List status of grandparent should include the 1 parent dir",
-        1, fs.listStatus(grandparent).length);
-    assertTrue("Grandparent directory does not appear to be a directory",
-        fs.getFileStatus(grandparent).isDirectory());
+    assertEquals(1, fs.listStatus(parent).length,
+        "List status of parent should include the 1 child file");
+    assertTrue(fs.getFileStatus(parent).isDirectory(),
+        "Parent directory does not appear to be a directory");
+    assertEquals(1, fs.listStatus(grandparent).length,
+        "List status of grandparent should include the 1 parent dir");
+    assertTrue(fs.getFileStatus(grandparent).isDirectory(),
+        "Grandparent directory does not appear to be a directory");
   }
 
   @Test
@@ -531,8 +531,8 @@ protected void validateSyncableSemantics(final FileSystem fs,
         final FileStatus st = fs.getFileStatus(path);
         if (metadataUpdatedOnHSync) {
           // not all stores reliably update it, HDFS/webHDFS in particular
-          assertEquals("Metadata not updated during write " + st,
-              2, st.getLen());
+          assertEquals(2, st.getLen(),
+              "Metadata not updated during write " + st);
         }
 
         // there's no way to verify durability, but we can

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractDeleteTest.java

@@ -20,7 +20,7 @@
 
 import org.apache.hadoop.fs.Path;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
@@ -49,19 +49,19 @@ public void testDeleteNonexistentPathRecursive() throws Throwable {
     Path path = path("testDeleteNonexistentPathRecursive");
     assertPathDoesNotExist("leftover", path);
     ContractTestUtils.rejectRootOperation(path);
-    assertFalse("Returned true attempting to recursively delete"
-                + " a nonexistent path " + path,
-                getFileSystem().delete(path, true));
+    assertFalse(getFileSystem().delete(path, true),
+        "Returned true attempting to recursively delete"
+        + " a nonexistent path " + path);
   }
 
   @Test
   public void testDeleteNonexistentPathNonRecursive() throws Throwable {
     Path path = path("testDeleteNonexistentPathNonRecursive");
     assertPathDoesNotExist("leftover", path);
     ContractTestUtils.rejectRootOperation(path);
-    assertFalse("Returned true attempting to non recursively delete"
-                + " a nonexistent path " + path,
-                getFileSystem().delete(path, false));
+    assertFalse(getFileSystem().delete(path, false),
+        "Returned true attempting to non recursively delete"
+        + " a nonexistent path " + path);
   }
 
   @Test

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractEtagTest.java

@@ -22,7 +22,7 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;