IO-511: After a few unit tests, a few newly created directories not cleaned completely. Thanks to Ahmet Celik. This also closes #13 from GitHub.

britter · britter · commit 5e3359388b07 · 2016-06-26T14:26:35.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1750250 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <!-- The release date is the date RC is cut -->
     <release version="2.6" date="2016-MM-DD" description="New features and bug fixes.">
+      <action issue="IO-511" dev="britter" type="fix" due-to="Ahmet Celik">
+        After a few unit tests, a few newly created directories not cleaned completely.
+      </action>
       <action issue="IO-502" dev="ggregory" type="fix" due-to="Christian Schulte">
         Exceptions are suppressed incorrectly when copying files.
       </action>
diff --git a/src/test/java/org/apache/commons/io/FileDeleteStrategyTestCase.java b/src/test/java/org/apache/commons/io/FileDeleteStrategyTestCase.java
@@ -18,6 +18,7 @@
 
 import org.apache.commons.io.testtools.FileBasedTestCase;
 import org.apache.commons.io.testtools.TestUtils;
+import org.junit.After;
 import org.junit.Test;
 
 import java.io.BufferedOutputStream;
@@ -162,4 +163,9 @@ public void testToString() {
         assertEquals("FileDeleteStrategy[Force]", FileDeleteStrategy.FORCE.toString());
     }
 
+    @After
+    public void tearDown() throws Exception {
+        FileUtils.deleteDirectory(getTestDirectory());
+    }
+
 }
diff --git a/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java
@@ -57,6 +57,7 @@ public void setUp() throws Exception {
     public void tearDown() throws Exception {
         chmod(top, 775, true);
         FileUtils.deleteDirectory(top);
+        FileUtils.deleteDirectory(getTestDirectory());
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java
@@ -81,6 +81,7 @@ public void setUp() throws Exception {
     public void tearDown() throws Exception {
         m_testFile1.delete();
         m_testFile2.delete();
+        FileUtils.deleteDirectory(getTestDirectory());
     }
 
     /**
diff --git a/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java
@@ -88,6 +88,7 @@ public void setUp() throws Exception {
     public void tearDown() throws Exception {
         final File dir = getLocalTestDirectory();
         FileUtils.deleteDirectory(dir);
+        FileUtils.deleteDirectory(getTestDirectory());
     }
 
     private Collection<String> filesToFilenames(final Collection<File> files) {
diff --git a/src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java b/src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java
@@ -22,6 +22,7 @@
 import java.nio.charset.UnsupportedCharsetException;
 
 import org.apache.commons.io.Charsets;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.testtools.FileBasedTestCase;
 import org.junit.After;
@@ -56,10 +57,11 @@ public void setUp() {
     }
 
     @After
-    public void tearDown() {
+    public void tearDown() throws IOException {
         file.delete();
         lockFile.delete();
         altLockFile.delete();
+        FileUtils.deleteDirectory(altLockDir);
     }
 
     //-----------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`import org.apache.commons.io.testtools.FileBasedTestCase;`
`20`	`20`	`import org.apache.commons.io.testtools.TestUtils;`
	`21`	`+import org.junit.After;`
`21`	`22`	`import org.junit.Test;`
`22`	`23`
`23`	`24`	`import java.io.BufferedOutputStream;`
`@@ -162,4 +163,9 @@ public void testToString() {`
`162`	`163`	`assertEquals("FileDeleteStrategy[Force]", FileDeleteStrategy.FORCE.toString());`
`163`	`164`	`}`
`164`	`165`
	`166`	`+ @After`
	`167`	`+ public void tearDown() throws Exception {`
	`168`	`+ FileUtils.deleteDirectory(getTestDirectory());`
	`169`	`+ }`
	`170`	`+`
`165`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public void setUp() throws Exception {`
`57`	`57`	`public void tearDown() throws Exception {`
`58`	`58`	`chmod(top, 775, true);`
`59`	`59`	`FileUtils.deleteDirectory(top);`
	`60`	`+ FileUtils.deleteDirectory(getTestDirectory());`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`//-----------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ public void setUp() throws Exception {`
`81`	`81`	`public void tearDown() throws Exception {`
`82`	`82`	`m_testFile1.delete();`
`83`	`83`	`m_testFile2.delete();`
	`84`	`+ FileUtils.deleteDirectory(getTestDirectory());`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ public void setUp() throws Exception {`
`88`	`88`	`public void tearDown() throws Exception {`
`89`	`89`	`final File dir = getLocalTestDirectory();`
`90`	`90`	`FileUtils.deleteDirectory(dir);`
	`91`	`+ FileUtils.deleteDirectory(getTestDirectory());`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`private Collection<String> filesToFilenames(final Collection<File> files) {`