You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/08/13 13:33:48 UTC
[commons-io] branch master updated (cb208538 -> 663ea741)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
from cb208538 Bump actions/cache from 3.0.6 to 3.0.7
new d9fb0917 Use try-with-resources
new 905d07ca Comments & Javadoc
new 663ea741 Use try-with-resources
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/commons/io/FileUtilsTest.java | 211 ++++++---------------
1 file changed, 63 insertions(+), 148 deletions(-)
[commons-io] 02/03: Comments & Javadoc
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 905d07ca7bcf8f2399b161f47a09371e617a5ae9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 13 08:31:59 2022 -0400
Comments & Javadoc
---
src/test/java/org/apache/commons/io/FileUtilsTest.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index a96b468f..9dd1a6bf 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -857,7 +857,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
// assertEquals(0, urls.length);
// }
- /* Test for IO-141 */
+ /** Tests IO-141 */
@Test
public void testCopyDirectoryToChild() throws Exception {
final File grandParentDir = new File(tempDirFile, "grandparent");
@@ -959,7 +959,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
assertTrue(new File(destDir, "sub/A.txt").exists());
}
- /* Test for IO-141 */
+ /** Test IO-141 */
@Test
public void testCopyDirectoryToGrandChild() throws Exception {
final File grandParentDir = new File(tempDirFile, "grandparent");
@@ -975,7 +975,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
assertTrue(expectedSize > 0, "Size > 0");
}
- /* Test for IO-217 FileUtils.copyDirectoryToDirectory makes infinite loops */
+ /** Tests IO-217 FileUtils.copyDirectoryToDirectory makes infinite loops */
@Test
public void testCopyDirectoryToItself() throws Exception {
final File dir = new File(tempDirFile, "itself");
@@ -1353,8 +1353,6 @@ public class FileUtilsTest extends AbstractTempDirTest {
assertThrows(IllegalArgumentException.class, () -> FileUtils.deleteDirectory(testFile1));
}
- // copyToDirectory
-
@Test
public void testDeleteQuietlyDir() throws IOException {
final File testDirectory = new File(tempDirFile, "testDeleteQuietlyDir");
@@ -1411,8 +1409,8 @@ public class FileUtilsTest extends AbstractTempDirTest {
FileUtils.deleteQuietly(testFile);
}
- /*
- * Test the FileUtils implementation.
+ /**
+ * Tests the FileUtils implementation.
*/
@Test
public void testFileUtils() throws Exception {
@@ -1632,7 +1630,6 @@ public class FileUtilsTest extends AbstractTempDirTest {
Assertions.assertFalse(FileUtils.isEmptyDirectory(PathUtilsIsEmptyTest.DIR_SIZE_1.toFile()));
}
- // isFileNewer / isFileOlder
@Test
public void testIsFileNewerOlder() throws Exception {
final File reference = new File(tempDirFile, "FileUtils-reference.txt");
[commons-io] 01/03: Use try-with-resources
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit d9fb09170f381a80a400d93d8c7c729590f59d5e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 13 08:29:04 2022 -0400
Use try-with-resources
---
.../java/org/apache/commons/io/FileUtilsTest.java | 36 +++++-----------------
1 file changed, 8 insertions(+), 28 deletions(-)
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index afda381b..a96b468f 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -1645,26 +1645,17 @@ public class FileUtilsTest extends AbstractTempDirTest {
throw new IOException("Cannot create file " + oldFile
+ " as the parent directory does not exist");
}
- final OutputStream output1 =
- new BufferedOutputStream(Files.newOutputStream(oldFile.toPath()));
- try {
+ try (final OutputStream output1 = new BufferedOutputStream(Files.newOutputStream(oldFile.toPath()))) {
TestUtils.generateTestData(output1, 0);
- } finally {
- IOUtils.closeQuietly(output1);
}
do {
TestUtils.sleepQuietly(1000);
if (!reference.getParentFile().exists()) {
- throw new IOException("Cannot create file " + reference
- + " as the parent directory does not exist");
+ throw new IOException("Cannot create file " + reference + " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(reference.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(reference.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
} while (getLastModifiedMillis(oldFile) == getLastModifiedMillis(reference));
@@ -1689,12 +1680,8 @@ public class FileUtilsTest extends AbstractTempDirTest {
throw new IOException("Cannot create file " + newFile
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(newFile.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(newFile.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
} while (getLastModifiedMillis(reference) == getLastModifiedMillis(newFile));
@@ -2353,22 +2340,15 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile1 = new File(tempDirFile, "testMoveFileFile1");
final File testFile2 = new File(tempDirFile, "testMoveFileFile2");
if (!testFile1.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile1
- + " as the parent directory does not exist");
+ throw new IOException("Cannot create file " + testFile1 + " as the parent directory does not exist");
}
- final BufferedOutputStream output1 =
- new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()));
- try {
+ try (final BufferedOutputStream output1 = new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()))) {
TestUtils.generateTestData(output1, 0);
- } finally {
- IOUtils.closeQuietly(output1);
}
if (!testFile2.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile2
- + " as the parent directory does not exist");
+ throw new IOException("Cannot create file " + testFile2 + " as the parent directory does not exist");
}
- final BufferedOutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()));
+ final BufferedOutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()));
try {
TestUtils.generateTestData(output, 0);
} finally {
[commons-io] 03/03: Use try-with-resources
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 663ea741e498b94e9e5a3e4a282e56d283f15826
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 13 09:33:43 2022 -0400
Use try-with-resources
- Remove unused local variable
- Use JUnit fail() instead of throwing an exception
---
.../java/org/apache/commons/io/FileUtilsTest.java | 166 +++++++--------------
1 file changed, 52 insertions(+), 114 deletions(-)
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index 9dd1a6bf..03a93704 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -25,6 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
@@ -319,7 +320,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
testFile1Size = testFile1.length();
testFile2Size = testFile2.length();
if (!testFile1.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile1
+ fail("Cannot create file " + testFile1
+ " as the parent directory does not exist");
}
try (BufferedOutputStream output3 =
@@ -327,7 +328,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
TestUtils.generateTestData(output3, testFile1Size);
}
if (!testFile2.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile2
+ fail("Cannot create file " + testFile2
+ " as the parent directory does not exist");
}
try (BufferedOutputStream output2 =
@@ -337,7 +338,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
FileUtils.deleteDirectory(tempDirFile);
tempDirFile.mkdirs();
if (!testFile1.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile1
+ fail("Cannot create file " + testFile1
+ " as the parent directory does not exist");
}
try (BufferedOutputStream output1 =
@@ -345,7 +346,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
TestUtils.generateTestData(output1, testFile1Size);
}
if (!testFile2.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile2
+ fail("Cannot create file " + testFile2
+ " as the parent directory does not exist");
}
try (BufferedOutputStream output =
@@ -590,7 +591,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
}
@Test
- public void testChecksumOnDirectory() throws Exception {
+ public void testChecksumOnDirectory() {
assertThrows(IllegalArgumentException.class, () -> FileUtils.checksum(FileUtils.current(), new CRC32()));
}
@@ -604,7 +605,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
}
@Test
- public void testChecksumOnNullFile() throws Exception {
+ public void testChecksumOnNullFile() {
assertThrows(NullPointerException.class, () -> FileUtils.checksum(null, new CRC32()));
}
@@ -877,26 +878,18 @@ public class FileUtilsTest extends AbstractTempDirTest {
@Test
public void testCopyDirectoryToDirectory_NonExistingDest() throws Exception {
if (!testFile1.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile1
+ fail("Cannot create file " + testFile1
+ " as the parent directory does not exist");
}
- final OutputStream output1 =
- new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()));
- try {
+ try (final OutputStream output1 = new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()))) {
TestUtils.generateTestData(output1, 1234);
- } finally {
- IOUtils.closeQuietly(output1);
}
if (!testFile2.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile2
+ fail("Cannot create file " + testFile2
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()))) {
TestUtils.generateTestData(output, 4321);
- } finally {
- IOUtils.closeQuietly(output);
}
final File srcDir = tempDirFile;
final File subDir = new File(srcDir, "sub");
@@ -921,26 +914,18 @@ public class FileUtilsTest extends AbstractTempDirTest {
@Test
public void testCopyDirectoryToExistingDest() throws Exception {
if (!testFile1.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile1
+ fail("Cannot create file " + testFile1
+ " as the parent directory does not exist");
}
- final OutputStream output1 =
- new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()));
- try {
+ try (final OutputStream output1 = new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()))) {
TestUtils.generateTestData(output1, 1234);
- } finally {
- IOUtils.closeQuietly(output1);
}
if (!testFile2.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile2
+ fail("Cannot create file " + testFile2
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()))) {
TestUtils.generateTestData(output, 4321);
- } finally {
- IOUtils.closeQuietly(output);
}
final File srcDir = tempDirFile;
final File subDir = new File(srcDir, "sub");
@@ -987,26 +972,18 @@ public class FileUtilsTest extends AbstractTempDirTest {
@Test
public void testCopyDirectoryToNonExistingDest() throws Exception {
if (!testFile1.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile1
+ fail("Cannot create file " + testFile1
+ " as the parent directory does not exist");
}
- final OutputStream output1 =
- new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()));
- try {
+ try (final OutputStream output1 = new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()))) {
TestUtils.generateTestData(output1, 1234);
- } finally {
- IOUtils.closeQuietly(output1);
}
if (!testFile2.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile2
+ fail("Cannot create file " + testFile2
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()));) {
TestUtils.generateTestData(output, 4321);
- } finally {
- IOUtils.closeQuietly(output);
}
final File srcDir = tempDirFile;
final File subDir = new File(srcDir, "sub");
@@ -1117,15 +1094,11 @@ public class FileUtilsTest extends AbstractTempDirTest {
System.out.println("START: " + new java.util.Date());
if (!largeFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + largeFile
+ fail("Cannot create file " + largeFile
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(largeFile.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(largeFile.toPath()))) {
TestUtils.generateTestData(output, FileUtils.ONE_GB);
- } finally {
- IOUtils.closeQuietly(output);
}
System.out.println("CREATED: " + new java.util.Date());
FileUtils.copyFile(largeFile, destination);
@@ -1271,10 +1244,10 @@ public class FileUtilsTest extends AbstractTempDirTest {
final String resourceName = "/java/lang/Object.class";
FileUtils.copyURLToFile(getClass().getResource(resourceName), file, 500, 500);
- // Tests that resuorce was copied correctly
- try (InputStream fis = Files.newInputStream(file.toPath())) {
- assertTrue(IOUtils.contentEquals(getClass().getResourceAsStream(resourceName), fis),
- "Content is not equal.");
+ // Tests that resource was copied correctly
+ try (InputStream fis = Files.newInputStream(file.toPath());
+ InputStream resStream = getClass().getResourceAsStream(resourceName);) {
+ assertTrue(IOUtils.contentEquals(resStream, fis), "Content is not equal.");
}
//TODO Maybe test copy to itself like for copyFile()
}
@@ -1349,7 +1322,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
}
@Test
- public void testDeleteDirectoryWithNonDirectory() throws Exception {
+ public void testDeleteDirectoryWithNonDirectory() {
assertThrows(IllegalArgumentException.class, () -> FileUtils.deleteDirectory(testFile1));
}
@@ -1359,15 +1332,11 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile = new File(testDirectory, "testDeleteQuietlyFile");
testDirectory.mkdirs();
if (!testFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile
+ fail("Cannot create file " + testFile
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
assertTrue(testDirectory.exists());
@@ -1381,15 +1350,11 @@ public class FileUtilsTest extends AbstractTempDirTest {
public void testDeleteQuietlyFile() throws IOException {
final File testFile = new File(tempDirFile, "testDeleteQuietlyFile");
if (!testFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile
+ fail("Cannot create file " + testFile
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
assertTrue(testFile.exists());
@@ -1458,7 +1423,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
}
@Test
- public void testForceDeleteAFile3() throws Exception {
+ public void testForceDeleteAFile3() {
final File destination = new File(tempDirFile, "no_such_file");
assertFalse(destination.exists(), "Check No Exist");
assertThrows(IOException.class, () -> FileUtils.forceDelete(destination));
@@ -1924,13 +1889,10 @@ public class FileUtilsTest extends AbstractTempDirTest {
for (int i = 0; i < expectedFileNames.length; ++i) {
final File theFile = new File(subDir, expectedFileNames[i]);
if (!theFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + theFile + " as the parent directory does not exist");
+ fail("Cannot create file " + theFile + " as the parent directory does not exist");
}
- final BufferedOutputStream output = new BufferedOutputStream(Files.newOutputStream(theFile.toPath()));
- try {
+ try (final BufferedOutputStream output = new BufferedOutputStream(Files.newOutputStream(theFile.toPath()))) {
TestUtils.generateTestData(output, fileSizes[i]);
- } finally {
- IOUtils.closeQuietly(output);
}
}
@@ -1982,13 +1944,10 @@ public class FileUtilsTest extends AbstractTempDirTest {
try {
final File someFile = new File(subDir2, "a.txt");
if (!someFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + someFile + " as the parent directory does not exist");
+ fail("Cannot create file " + someFile + " as the parent directory does not exist");
}
- final BufferedOutputStream output = new BufferedOutputStream(Files.newOutputStream(someFile.toPath()));
- try {
+ try (final BufferedOutputStream output = new BufferedOutputStream(Files.newOutputStream(someFile.toPath()))) {
TestUtils.generateTestData(output, 100);
- } finally {
- IOUtils.closeQuietly(output);
}
final File subDir3 = new File(subDir2, "subdir3");
@@ -2024,15 +1983,11 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile = new File(testDir, "bar");
testDir.mkdirs();
if (!testFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile
+ fail("Cannot create file " + testFile
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
final File destination = new File(dir, "testMoveDirectory1Dest");
FileUtils.deleteDirectory(destination);
@@ -2057,13 +2012,10 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile = new File(tempDirFile, "testMoveDirectoryFile");
if (!testFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile + " as the parent directory does not exist");
+ fail("Cannot create file " + testFile + " as the parent directory does not exist");
}
- final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
assertThrows(IllegalArgumentException.class, () -> FileUtils.moveDirectory(testFile, new File("foo")));
final File testSrcFile = new File(tempDirFile, "testMoveDirectorySource");
@@ -2083,15 +2035,11 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile = new File(testDir, "bar");
testDir.mkdirs();
if (!testFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile
+ fail("Cannot create file " + testFile
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
final File destination = new File(dir, "testMoveDirectory1Dest");
FileUtils.deleteDirectory(destination);
@@ -2116,15 +2064,11 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile = new File(testChildDir, "bar");
testChildDir.mkdirs();
if (!testFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile
+ fail("Cannot create file " + testFile
+ " as the parent directory does not exist");
}
- final OutputStream output =
- new BufferedOutputStream(Files.newOutputStream(testFile.toPath()));
- try {
+ try (final OutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
final File destDir = new File(dir, "testMoveDirectory1Dest");
FileUtils.deleteDirectory(destDir);
@@ -2151,22 +2095,16 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile1 = new File(tempDirFile, "testMoveFileFile1");
final File testFile2 = new File(tempDirFile, "testMoveFileFile2");
if (!testFile1.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile1 + " as the parent directory does not exist");
+ fail("Cannot create file " + testFile1 + " as the parent directory does not exist");
}
- final BufferedOutputStream output1 = new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()));
- try {
+ try (final BufferedOutputStream output1 = new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()))) {
TestUtils.generateTestData(output1, 0);
- } finally {
- IOUtils.closeQuietly(output1);
}
if (!testFile2.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile2 + " as the parent directory does not exist");
+ fail("Cannot create file " + testFile2 + " as the parent directory does not exist");
}
- final BufferedOutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()));
- try {
+ try (final BufferedOutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()))) {
TestUtils.generateTestData(output, 0);
- } finally {
- IOUtils.closeQuietly(output);
}
assertThrows(IOException.class, () -> FileUtils.moveDirectoryToDirectory(testFile1, testFile2, true));
@@ -2193,7 +2131,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
}
@Test
- public void testMoveFile_CopyDelete_Failed() throws Exception {
+ public void testMoveFile_CopyDelete_Failed() {
final File destination = new File(tempDirFile, "move3.txt");
final File src = new File(testFile1.getAbsolutePath()) {
private static final long serialVersionUID = 1L;
@@ -2290,7 +2228,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testSourceFile = new File(tempDirFile, "testMoveFileSource");
final File testDestFile = new File(tempDirFile, "testMoveFileSource");
if (!testSourceFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testSourceFile + " as the parent directory does not exist");
+ fail("Cannot create file " + testSourceFile + " as the parent directory does not exist");
}
final BufferedOutputStream output1 = new BufferedOutputStream(Files.newOutputStream(testSourceFile.toPath()));
try {
@@ -2337,13 +2275,13 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile1 = new File(tempDirFile, "testMoveFileFile1");
final File testFile2 = new File(tempDirFile, "testMoveFileFile2");
if (!testFile1.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile1 + " as the parent directory does not exist");
+ fail("Cannot create file " + testFile1 + " as the parent directory does not exist");
}
try (final BufferedOutputStream output1 = new BufferedOutputStream(Files.newOutputStream(testFile1.toPath()))) {
TestUtils.generateTestData(output1, 0);
}
if (!testFile2.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile2 + " as the parent directory does not exist");
+ fail("Cannot create file " + testFile2 + " as the parent directory does not exist");
}
final BufferedOutputStream output = new BufferedOutputStream(Files.newOutputStream(testFile2.toPath()));
try {
@@ -2364,7 +2302,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
final File testFile = new File(tempDirFile, "testMoveToDirectoryTestFile");
testDir.mkdirs();
if (!testFile.getParentFile().exists()) {
- throw new IOException("Cannot create file " + testFile
+ fail("Cannot create file " + testFile
+ " as the parent directory does not exist");
}
final BufferedOutputStream output =