FileUtilsTestCase: usage of IOUtils#closeQuietly with try-with-resources statements

Author: PascalSchumacher

src/test/java/org/apache/commons/io/FileUtilsTestCase.java

@@ -94,47 +94,35 @@ public void setUp() throws Exception {
             throw new IOException("Cannot create file " + testFile1
                     + " as the parent directory does not exist");
         }
-        final BufferedOutputStream output3 =
-                new BufferedOutputStream(new FileOutputStream(testFile1));
-        try {
+        try (final BufferedOutputStream output3 =
+                new BufferedOutputStream(new FileOutputStream(testFile1))) {
             TestUtils.generateTestData(output3, (long) testFile1Size);
-        } finally {
-            IOUtils.closeQuietly(output3);
         }
         if (!testFile2.getParentFile().exists()) {
             throw new IOException("Cannot create file " + testFile2
                     + " as the parent directory does not exist");
         }
-        final BufferedOutputStream output2 =
-                new BufferedOutputStream(new FileOutputStream(testFile2));
-        try {
+        try (final BufferedOutputStream output2 =
+                new BufferedOutputStream(new FileOutputStream(testFile2))) {
             TestUtils.generateTestData(output2, (long) testFile2Size);
-        } finally {
-            IOUtils.closeQuietly(output2);
         }
         FileUtils.deleteDirectory(getTestDirectory());
         getTestDirectory().mkdirs();
         if (!testFile1.getParentFile().exists()) {
             throw new IOException("Cannot create file " + testFile1
                     + " as the parent directory does not exist");
         }
-        final BufferedOutputStream output1 =
-                new BufferedOutputStream(new FileOutputStream(testFile1));
-        try {
+        try (final BufferedOutputStream output1 =
+                new BufferedOutputStream(new FileOutputStream(testFile1))) {
             TestUtils.generateTestData(output1, (long) testFile1Size);
-        } finally {
-            IOUtils.closeQuietly(output1);
         }
         if (!testFile2.getParentFile().exists()) {
             throw new IOException("Cannot create file " + testFile2
                     + " as the parent directory does not exist");
         }
-        final BufferedOutputStream output =
-                new BufferedOutputStream(new FileOutputStream(testFile2));
-        try {
+        try (final BufferedOutputStream output =
+                new BufferedOutputStream(new FileOutputStream(testFile2))) {
             TestUtils.generateTestData(output, (long) testFile2Size);
-        } finally {
-            IOUtils.closeQuietly(output);
         }
     }
 
@@ -216,41 +204,29 @@ public void testGetUserDirectory() {
     public void test_openInputStream_exists() throws Exception {
         final File file = new File(getTestDirectory(), "test.txt");
         TestUtils.createLineBasedFile(file, new String[]{"Hello"});
-        FileInputStream in = null;
-        try {
-            in = FileUtils.openInputStream(file);
+        try (FileInputStream in = FileUtils.openInputStream(file)) {
             assertEquals('H', in.read());
-        } finally {
-            IOUtils.closeQuietly(in);
         }
     }
 
     @Test
     public void test_openInputStream_existsButIsDirectory() throws Exception {
         final File directory = new File(getTestDirectory(), "subdir");
         directory.mkdirs();
-        FileInputStream in = null;
-        try {
-            in = FileUtils.openInputStream(directory);
+        try (FileInputStream in = FileUtils.openInputStream(directory)) {
             fail();
         } catch (final IOException ioe) {
             // expected
-        } finally {
-            IOUtils.closeQuietly(in);
         }
     }
 
     @Test
     public void test_openInputStream_notExists() throws Exception {
         final File directory = new File(getTestDirectory(), "test.txt");
-        FileInputStream in = null;
-        try {
-            in = FileUtils.openInputStream(directory);
+        try (FileInputStream in = FileUtils.openInputStream(directory)) {
             fail();
         } catch (final IOException ioe) {
             // expected
-        } finally {
-            IOUtils.closeQuietly(in);
         }
     }
 
@@ -262,12 +238,8 @@ void openOutputStream_noParent(final boolean createFile) throws Exception {
             if (createFile) {
                 TestUtils.createLineBasedFile(file, new String[]{"Hello"});
             }
-            FileOutputStream out = null;
-            try {
-                out = FileUtils.openOutputStream(file);
+            try (FileOutputStream out = FileUtils.openOutputStream(file)) {
                 out.write(0);
-            } finally {
-                IOUtils.closeQuietly(out);
             }
             assertTrue(file.exists());
         } finally {
@@ -287,17 +259,12 @@ public void test_openOutputStream_noParentNoFile() throws Exception {
         openOutputStream_noParent(false);
     }
 
-
     @Test
     public void test_openOutputStream_exists() throws Exception {
         final File file = new File(getTestDirectory(), "test.txt");
         TestUtils.createLineBasedFile(file, new String[]{"Hello"});
-        FileOutputStream out = null;
-        try {
-            out = FileUtils.openOutputStream(file);
+        try (FileOutputStream out = FileUtils.openOutputStream(file)) {
             out.write(0);
-        } finally {
-            IOUtils.closeQuietly(out);
         }
         assertTrue(file.exists());
     }
@@ -306,26 +273,18 @@ public void test_openOutputStream_exists() throws Exception {
     public void test_openOutputStream_existsButIsDirectory() throws Exception {
         final File directory = new File(getTestDirectory(), "subdir");
         directory.mkdirs();
-        FileOutputStream out = null;
-        try {
-            out = FileUtils.openOutputStream(directory);
+        try (FileOutputStream out = FileUtils.openOutputStream(directory)) {
             fail();
         } catch (final IOException ioe) {
             // expected
-        } finally {
-            IOUtils.closeQuietly(out);
         }
     }
 
     @Test
     public void test_openOutputStream_notExists() throws Exception {
         final File file = new File(getTestDirectory(), "a/test.txt");
-        FileOutputStream out = null;
-        try {
-            out = FileUtils.openOutputStream(file);
+        try (FileOutputStream out = FileUtils.openOutputStream(file)) {
             out.write(0);
-        } finally {
-            IOUtils.closeQuietly(out);
         }
         assertTrue(file.exists());
     }
@@ -341,14 +300,10 @@ public void test_openOutputStream_notExistsCannotCreate() throws Exception {
                         "abcdevwxyzabcdevwxyzabcdevwxyzabcdevwxyzabcdevwxyz" +
                         "abcdevwxyzabcdevwxyzabcdevwxyzabcdevwxyzabcdevwxyz";  // 300 chars
         final File file = new File(getTestDirectory(), "a/" + longStr + "/test.txt");
-        FileOutputStream out = null;
-        try {
-            out = FileUtils.openOutputStream(file);
+        try (FileOutputStream out = FileUtils.openOutputStream(file)) {
             fail();
         } catch (final IOException ioe) {
             // expected
-        } finally {
-            IOUtils.closeQuietly(out);
         }
     }