You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2017/04/23 14:18:13 UTC
commons-io git commit: FileUtilsTestCase: test directory is delete in
tear down method, so remove clean up in individual tests
Repository: commons-io
Updated Branches:
refs/heads/master 46fc59ff1 -> f5c46b9fc
FileUtilsTestCase: test directory is delete in tear down method, so remove clean up in individual tests
Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/f5c46b9f
Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/f5c46b9f
Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/f5c46b9f
Branch: refs/heads/master
Commit: f5c46b9fc80754c601205e6ef13c5b7e9a5003e2
Parents: 46fc59f
Author: pascalschumacher <pa...@gmx.net>
Authored: Sun Apr 23 16:16:35 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Sun Apr 23 16:16:35 2017 +0200
----------------------------------------------------------------------
.../apache/commons/io/FileUtilsTestCase.java | 34 ++++++++------------
1 file changed, 13 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-io/blob/f5c46b9f/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
index 949e87b..8f29835 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
@@ -763,23 +763,19 @@ public class FileUtilsTestCase extends FileBasedTestCase {
// Tests with existing directory
assertTrue(getTestDirectory().exists());
final File testParentDir = new File(getTestDirectory(), "testForceMkdirParent");
- try {
- testParentDir.delete();
- assertFalse(testParentDir.exists());
- final File testFile = new File(testParentDir, "test.txt");
- assertFalse(testParentDir.exists());
- assertFalse(testFile.exists());
- // Create
- FileUtils.forceMkdirParent(testFile);
- assertTrue(testParentDir.exists());
- assertFalse(testFile.exists());
- // Again
- FileUtils.forceMkdirParent(testFile);
- assertTrue(testParentDir.exists());
- assertFalse(testFile.exists());
- } finally {
- testParentDir.delete();
- }
+ testParentDir.delete();
+ assertFalse(testParentDir.exists());
+ final File testFile = new File(testParentDir, "test.txt");
+ assertFalse(testParentDir.exists());
+ assertFalse(testFile.exists());
+ // Create
+ FileUtils.forceMkdirParent(testFile);
+ assertTrue(testParentDir.exists());
+ assertFalse(testFile.exists());
+ // Again
+ FileUtils.forceMkdirParent(testFile);
+ assertTrue(testParentDir.exists());
+ assertFalse(testFile.exists());
}
// sizeOfDirectory
@@ -797,7 +793,6 @@ public class FileUtilsTestCase extends FileBasedTestCase {
// Creates file
file.createNewFile();
- file.deleteOnExit();
// Existing file
try {
@@ -2512,7 +2507,6 @@ public class FileUtilsTestCase extends FileBasedTestCase {
assertTrue("Original deleted", !src.exists());
}
-
@Test
public void testMoveFile_CopyDelete_Failed() throws Exception {
final File destination = new File(getTestDirectory(), "move3.txt");
@@ -2599,7 +2593,6 @@ public class FileUtilsTestCase extends FileBasedTestCase {
} catch (final FileExistsException e) {
// expected
}
-
}
@Test
@@ -2792,7 +2785,6 @@ public class FileUtilsTestCase extends FileBasedTestCase {
} catch (final FileExistsException e) {
// expected
}
-
}
@Test