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

Author: slfan1989

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

@@ -429,15 +429,15 @@ private void validateAndSetWritablePermissions(
     grantPermissions(xSubSubDir);
 
     assertFalse(ret, "The return value should have been false.");
-    assertTrue(new File(del, FILE_1_NAME).exists(), 
+    assertTrue(new File(del, FILE_1_NAME).exists(),
         "The file file1 should not have been deleted.");
-    assertEquals(expectedRevokedPermissionDirsExist, xSubDir.exists(), 
+    assertEquals(expectedRevokedPermissionDirsExist, xSubDir.exists(),
         "The directory xSubDir *should* not have been deleted.");
-    assertEquals(expectedRevokedPermissionDirsExist, file2.exists(), 
+    assertEquals(expectedRevokedPermissionDirsExist, file2.exists(),
         "The file file2 *should* not have been deleted.");
-    assertEquals(expectedRevokedPermissionDirsExist, xSubSubDir.exists(), 
+    assertEquals(expectedRevokedPermissionDirsExist, xSubSubDir.exists(),
         "The directory xSubSubDir *should* not have been deleted.");
-    assertEquals(expectedRevokedPermissionDirsExist, file22.exists(), 
+    assertEquals(expectedRevokedPermissionDirsExist, file22.exists(),
         "The file file22 *should* not have been deleted.");
     assertFalse(ySubDir.exists(), "The directory ySubDir should have been deleted.");
     assertFalse(zlink.exists(), "The link zlink should have been deleted.");
@@ -1317,7 +1317,7 @@ public void testCreateJarWithClassPath() throws Exception {
       new File(tmp, "wildcard2.jar"), new File(tmp, "wildcard3.JAR"),
       new File(tmp, "wildcard4.JAR"));
     for (File wildcardMatch: wildcardMatches) {
-      assertTrue(wildcardMatch.createNewFile(), 
+      assertTrue(wildcardMatch.createNewFile(),
           "failure creating file: " + wildcardMatch);
     }
 
@@ -1333,11 +1333,11 @@ public void testCreateJarWithClassPath() throws Exception {
     List<String> classPaths = Arrays.asList("", "cp1.jar", "cp2.jar", wildcardPath,
       "cp3.jar", nonExistentSubdir);
     String inputClassPath = StringUtils.join(File.pathSeparator, classPaths);
-    String[] jarCp = FileUtil.createJarWithClassPath(inputClassPath + 
+    String[] jarCp = FileUtil.createJarWithClassPath(inputClassPath +
         File.pathSeparator + "unexpandedwildcard/*",
         new Path(tmp.getCanonicalPath()), System.getenv());
     String classPathJar = jarCp[0];
-    assertNotEquals(jarCp[1].indexOf("unexpanded"), -1, 
+    assertNotEquals(jarCp[1].indexOf("unexpanded"), -1,
         "Unexpanded wildcard was not placed in extra classpath");
 
     // verify classpath by reading manifest from jar file
@@ -1399,7 +1399,7 @@ public void testCreateJarWithClassPath() throws Exception {
   @Test
   public void testGetJarsInDirectory() throws Exception {
     List<Path> jars = FileUtil.getJarsInDirectory("/foo/bar/bogus/");
-    assertTrue(jars.isEmpty(), 
+    assertTrue(jars.isEmpty(),
         "no jars should be returned for a bogus path");
 
 
@@ -1423,7 +1423,7 @@ public void testGetJarsInDirectory() throws Exception {
     for (Path jar: jars) {
       URL url = jar.toUri().toURL();
       assertTrue(url.equals(jar1.getCanonicalFile().toURI().toURL()) ||
-          url.equals(jar2.getCanonicalFile().toURI().toURL()), 
+          url.equals(jar2.getCanonicalFile().toURI().toURL()),
           "the jar should match either of the jars");
     }
   }
@@ -1549,25 +1549,25 @@ public void testCreateArbitrarySymlinkUsingJava() throws IOException {
         File rootDir = new File("tmp");
         try (TarArchiveOutputStream tos = new TarArchiveOutputStream(os)) {
           tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
-    
+
           // Create arbitrary dir
           File arbitraryDir = new File(rootDir, "arbitrary-dir/");
           Verify.mkdirs(arbitraryDir);
-    
+
           // We will tar from the tar-root lineage
           File tarRoot = new File(rootDir, "tar-root/");
           File symlinkRoot = new File(tarRoot, "dir1/");
           Verify.mkdirs(symlinkRoot);
-    
+
           // Create Symbolic Link to an arbitrary dir
           java.nio.file.Path symLink = Paths.get(symlinkRoot.getPath(), "sl");
           Files.createSymbolicLink(symLink, arbitraryDir.toPath().toAbsolutePath());
-    
+
           // Put entries in tar file
           putEntriesInTar(tos, tarRoot);
           putEntriesInTar(tos, new File(symLink.toFile(), "dir-outside-tar-root/"));
           tos.close();
-    
+
           // Untar using Java
           File untarFile = new File(rootDir, "extracted");
           FileUtil.unTarUsingJava(simpleTar, untarFile, false);

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

@@ -185,7 +185,7 @@ public static void writeDataset(FileSystem fs,
   public static void writeDataset(FileSystem fs, Path path, byte[] src,
       int len, int buffersize, boolean overwrite, boolean useBuilder)
       throws IOException {
-    assertTrue(src.length >= len, 
+    assertTrue(src.length >= len,
         "Not enough data in source array to write " + len + " bytes");
     FSDataOutputStream out;
     if (useBuilder) {
@@ -340,7 +340,7 @@ public static void verifyRead(FSDataInputStream stm, byte[] fileContents,
   public static void compareByteArrays(byte[] original,
                                        byte[] received,
                                        int len) {
-    assertEquals(len, received.length, 
+    assertEquals(len, received.length,
         "Number of bytes read != number written");
     int errors = 0;
     int firstErrorByte = -1;
@@ -485,7 +485,7 @@ public static boolean rm(FileSystem fileSystem,
   public static void rename(FileSystem fileSystem, Path src, Path dst)
       throws IOException {
     rejectRootOperation(src, false);
-    assertTrue(fileSystem.rename(src, dst), 
+    assertTrue(fileSystem.rename(src, dst),
         "rename(" + src + ", " + dst + ") failed");
     assertPathDoesNotExist(fileSystem, "renamed source dir", src);
   }
@@ -613,7 +613,7 @@ public static Object fail(String text, Throwable thrown) {
   public static void assertFileHasLength(FileSystem fs, Path path,
                                          int expected) throws IOException {
     FileStatus status = fs.getFileStatus(path);
-    assertEquals(expected, status.getLen(), 
+    assertEquals(expected, status.getLen(),
         "Wrong file length of file " + path + " status: " + status);
   }
 
@@ -635,7 +635,7 @@ public static void assertIsDirectory(FileSystem fs,
    * @param fileStatus stats to check
    */
   public static void assertIsDirectory(FileStatus fileStatus) {
-    assertTrue(fileStatus.isDirectory(), 
+    assertTrue(fileStatus.isDirectory(),
         "Should be a directory -but isn't: " + fileStatus);
   }
 
@@ -662,7 +662,7 @@ public static void assertErasureCoded(final FileSystem fs, final Path path)
   public static void assertNotErasureCoded(final FileSystem fs,
       final Path path) throws IOException {
     FileStatus fileStatus = fs.getFileStatus(path);
-    assertFalse(fileStatus.isErasureCoded(), 
+    assertFalse(fileStatus.isErasureCoded(),
         path + " should not be erasure coded!");
   }
 
@@ -962,9 +962,9 @@ public static void assertIsFile(FileContext fileContext, Path filename)
    */
   public static void assertIsFile(Path filename, FileStatus status) {
     String fileInfo = filename + "  " + status;
-    assertFalse(status.isDirectory(), 
+    assertFalse(status.isDirectory(),
         "File claims to be a directory " + fileInfo);
-    assertFalse(status.isSymlink(), 
+    assertFalse(status.isSymlink(),
         "File claims to be a symlink " + fileInfo);
   }
 
@@ -1130,7 +1130,7 @@ public static void assertListStatusFinds(FileSystem fs,
         found = true;
       }
     }
-    assertTrue(found, 
+    assertTrue(found,
         "Path " + subdir + " not found in directory " + dir + ":" + builder);
   }
 
@@ -1174,7 +1174,7 @@ public static void validateFileContent(byte[] concat, byte[][] bytes) {
         break;
       }
     }
-    assertFalse(mismatch, 
+    assertFalse(mismatch,
         "File content of file is not as expected at offset " + idx);
   }
 
@@ -1710,21 +1710,21 @@ public static List<LocatedFileStatus> toListThroughNextCallsAlone(
   public static void assertCapabilities(
       Object stream, String[] shouldHaveCapabilities,
       String[] shouldNotHaveCapabilities) {
-    assertTrue(stream instanceof StreamCapabilities, 
+    assertTrue(stream instanceof StreamCapabilities,
         "Stream should be instanceof StreamCapabilities");
 
     StreamCapabilities source = (StreamCapabilities) stream;
     if (shouldHaveCapabilities != null) {
       for (String shouldHaveCapability : shouldHaveCapabilities) {
-        assertTrue(source.hasCapability(shouldHaveCapability), 
+        assertTrue(source.hasCapability(shouldHaveCapability),
             "Should have capability: " + shouldHaveCapability
             + " in " + source);
       }
     }
 
     if (shouldNotHaveCapabilities != null) {
       for (String shouldNotHaveCapability : shouldNotHaveCapabilities) {
-        assertFalse(source.hasCapability(shouldNotHaveCapability), 
+        assertFalse(source.hasCapability(shouldNotHaveCapability),
             "Should not have capability: " + shouldNotHaveCapability
             + " in " + source);
       }
@@ -1772,7 +1772,7 @@ public static void assertHasPathCapabilities(
       final String...capabilities) throws IOException {
 
     for (String shouldHaveCapability: capabilities) {
-      assertTrue(source.hasPathCapability(path, shouldHaveCapability), 
+      assertTrue(source.hasPathCapability(path, shouldHaveCapability),
           "Should have capability: " + shouldHaveCapability
           + " under " + path
           + " in " + source);
@@ -1793,7 +1793,7 @@ public static void assertLacksPathCapabilities(
       final String...capabilities) throws IOException {
 
     for (String shouldHaveCapability: capabilities) {
-      assertFalse(source.hasPathCapability(path, shouldHaveCapability), 
+      assertFalse(source.hasPathCapability(path, shouldHaveCapability),
           "Path  must not support capability: " + shouldHaveCapability
           + " under " + path);
     }
@@ -2019,11 +2019,11 @@ public int hashCode() {
      */
     public void assertSizeEquals(String text, long f, long d, long o) {
       String self = dump();
-      assertEquals(f, getFileCount(), 
+      assertEquals(f, getFileCount(),
           text + ": file count in " + self);
-      assertEquals(d, getDirCount(), 
+      assertEquals(d, getDirCount(),
           text + ": directory count in " + self);
-      assertEquals(o, getOtherCount(), 
+      assertEquals(o, getOtherCount(),
           text + ": 'other' count in " + self);
     }
 

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

@@ -65,7 +65,7 @@ public class TestTextCommand {
 
   private static final String SEQUENCE_FILE_EXPECTED_OUTPUT =
       "Key1\tValue1" + SEPARATOR + "Key2\tValue2" + SEPARATOR;
-  
+
   /**
    * Tests whether binary Avro data files are displayed correctly.
    */

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

@@ -321,13 +321,13 @@ public void testWorkingDirectory() throws Exception {
 
   @Test
   public void testResolvePath() throws IOException {
-    assertEquals(chrootedTo, fSys.resolvePath(new Path("/"))); 
+    assertEquals(chrootedTo, fSys.resolvePath(new Path("/")));
     fileSystemTestHelper.createFile(fSys, "/foo");
     assertEquals(new Path(chrootedTo, "foo"),
         fSys.resolvePath(new Path("/foo"))); 
   }
 
-  @Test 
+  @Test
   public void testResolvePathNonExisting() throws IOException {
     assertThrows(FileNotFoundException.class, () -> {
       fSys.resolvePath(new Path("/nonExisting"));

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

@@ -122,7 +122,7 @@ public void testNflyInvalidMinReplication() throws Exception {
       FileSystem.get(URI.create("viewfs://mt/"), conf);
       fail("Expected bad minReplication exception.");
     } catch (IOException ioe) {
-      assertTrue(ioe.getMessage().contains("Minimum replication"), 
+      assertTrue(ioe.getMessage().contains("Minimum replication"),
           "No minReplication message");
     }
   }