HADOOP-19415. Fix Junit Test Error & CheckStyle Issue.

Author: slfan1989

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

@@ -1005,13 +1005,13 @@ private void doTestRenameDirectoryAsNonExistentDirectory(Rename... options)
     fSys.mkdirs(dst.getParent());
 
     rename(src, dst, true, false, true, options);
-    assertFalse(exists(fSys, getTestRootPath(fSys, 
+    assertFalse(exists(fSys, getTestRootPath(fSys,
         "test/hadoop/dir/file1")), "Nested file1 exists");
-    assertFalse(exists(fSys, getTestRootPath(fSys, "test/hadoop/dir/subdir/file2")), 
+    assertFalse(exists(fSys, getTestRootPath(fSys, "test/hadoop/dir/subdir/file2")),
         "Nested file2 exists");
-    assertTrue(exists(fSys, getTestRootPath(fSys, "test/new/newdir/file1")), 
+    assertTrue(exists(fSys, getTestRootPath(fSys, "test/new/newdir/file1")),
         "Renamed nested file1 exists");
-    assertTrue(exists(fSys, getTestRootPath(fSys, "test/new/newdir/subdir/file2")), 
+    assertTrue(exists(fSys, getTestRootPath(fSys, "test/new/newdir/subdir/file2")),
         "Renamed nested exists");
   }
 

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

@@ -357,6 +357,7 @@ public void testListStatus() throws Exception {
         paths));
     assertTrue(containsPath(getTestRootPath(fc, "test/hadoop/c"),
         paths));
+
     paths = fc.util().listStatus(getTestRootPath(fc, "test/hadoop/a"));
     assertEquals(0, paths.length);
 
@@ -1189,13 +1190,13 @@ private void testRenameDirectoryAsNonExistentDirectory(Rename... options) throws
     fc.mkdir(dst.getParent(), FileContext.DEFAULT_PERM, true);
 
     rename(src, dst, false, true, options);
-    assertFalse(exists(fc, getTestRootPath(fc, 
+    assertFalse(exists(fc, getTestRootPath(fc,
         "test/hadoop/dir/file1")), "Nested file1 exists");
-    assertFalse(exists(fc, getTestRootPath(fc, 
+    assertFalse(exists(fc, getTestRootPath(fc,
         "test/hadoop/dir/subdir/file2")), "Nested file2 exists");
-    assertTrue(exists(fc, getTestRootPath(fc, 
+    assertTrue(exists(fc, getTestRootPath(fc,
         "test/new/newdir/file1")), "Renamed nested file1 exists");
-    assertTrue(exists(fc, getTestRootPath(fc, 
+    assertTrue(exists(fc, getTestRootPath(fc,
         "test/new/newdir/subdir/file2")), "Renamed nested exists");
   }
 
@@ -1546,7 +1547,7 @@ public void testOpenFileApplyRead() throws Throwable {
     CompletableFuture<Long> readAllBytes = fc.openFile(path)
         .build()
         .thenApply(ContractTestUtils::readStream);
-    assertEquals(data.length, (long) readAllBytes.get(), 
+    assertEquals(data.length, (long) readAllBytes.get(),
         "Wrong number of bytes read from stream");
   }
 

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

@@ -1436,8 +1436,8 @@ public void testSetTimesSymlinkToFile() throws IOException {
     long at = wrapper.getFileLinkStatus(link).getAccessTime();
     // the local file system may not support millisecond timestamps
     wrapper.setTimes(link, 2000L, 3000L);
-    assertTrue(
-       wrapper.getFileLinkStatus(link).getAccessTime() >= at, "The atime of symlink should not be lesser after setTimes()");
+    assertTrue(wrapper.getFileLinkStatus(link).getAccessTime() >= at, 
+        "The atime of symlink should not be lesser after setTimes()");
     assertEquals(2000, wrapper.getFileStatus(file).getModificationTime());
     assertEquals(3000, wrapper.getFileStatus(file).getAccessTime());
   }
@@ -1453,8 +1453,8 @@ public void testSetTimesSymlinkToDir() throws IOException {
     long at = wrapper.getFileLinkStatus(link).getAccessTime();
     // the local file system may not support millisecond timestamps
     wrapper.setTimes(link, 2000L, 3000L);
-    assertTrue(
-       wrapper.getFileLinkStatus(link).getAccessTime() >= at, "The atime of symlink should not be lesser after setTimes()");
+    assertTrue(wrapper.getFileLinkStatus(link).getAccessTime() >= at, 
+        "The atime of symlink should not be lesser after setTimes()");
     assertEquals(2000, wrapper.getFileStatus(dir).getModificationTime());
     assertEquals(3000, wrapper.getFileStatus(dir).getAccessTime());
   }
@@ -1473,7 +1473,7 @@ public void testSetTimesDanglingLink() throws IOException {
     } catch (IOException e) {
       // Expected
     }
-    assertTrue(
-       wrapper.getFileLinkStatus(link).getAccessTime() >= at, "The atime of symlink should not be lesser after setTimes()");
+    assertTrue(wrapper.getFileLinkStatus(link).getAccessTime() >= at, 
+        "The atime of symlink should not be lesser after setTimes()");
   }
 }

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

@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.fs.viewfs;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URI;
 
@@ -25,7 +26,6 @@
 import org.apache.hadoop.fs.Path;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -63,16 +63,15 @@ public void tearDown() throws Exception {
   @Override
   @Test
   public void testBasicPaths() {
-      Assertions.assertEquals(schemeWithAuthority,
-          fcView.getDefaultFileSystem().getUri());
-      Assertions.assertEquals(fcView.makeQualified(
-          new Path("/user/" + System.getProperty("user.name"))),
-          fcView.getWorkingDirectory());
-      Assertions.assertEquals(fcView.makeQualified(
-          new Path("/user/" + System.getProperty("user.name"))),
-          fcView.getHomeDirectory());
-      Assertions.assertEquals(
-          new Path("/foo/bar").makeQualified(schemeWithAuthority, null),
-          fcView.makeQualified(new Path("/foo/bar")));
+    assertEquals(schemeWithAuthority, fcView.getDefaultFileSystem().getUri());
+    assertEquals(fcView.makeQualified(
+      new Path("/user/" + System.getProperty("user.name"))),
+      fcView.getWorkingDirectory());
+    assertEquals(fcView.makeQualified(
+      new Path("/user/" + System.getProperty("user.name"))),
+      fcView.getHomeDirectory());
+    assertEquals(
+      new Path("/foo/bar").makeQualified(schemeWithAuthority, null),
+      fcView.makeQualified(new Path("/foo/bar")));
   }
 }