Fixing #IO-82, in JDK 1.6 the gc call does not seem to be giving us the garbage collection, so Stephen came up with this to force that to happen. Speed seems good in JDK 1.4->1.6 and happily this isn't an issue with the underlying source, just the test.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@463310 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

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

@@ -79,9 +79,8 @@ public void testFileCleanerFile() throws Exception {
         r.close();
         testFile = null;
         r = null;
-        while (FileCleaner.getTrackCount() != 0) {
-            System.gc();
-        }
+
+        waitUntilTrackCount();
 
         assertEquals(0, FileCleaner.getTrackCount());
         assertEquals(false, new File(path).exists());
@@ -98,10 +97,9 @@ public void testFileCleanerDirectory() throws Exception {
         assertEquals(1, FileCleaner.getTrackCount());
 
         obj = null;
-        while (FileCleaner.getTrackCount() != 0) {
-            System.gc();
-        }
-        
+
+        waitUntilTrackCount();
+
         assertEquals(0, FileCleaner.getTrackCount());
         assertEquals(true, testFile.exists());  // not deleted, as dir not empty
         assertEquals(true, testFile.getParentFile().exists());  // not deleted, as dir not empty
@@ -118,9 +116,8 @@ public void testFileCleanerDirectory_NullStrategy() throws Exception {
         assertEquals(1, FileCleaner.getTrackCount());
 
         obj = null;
-        while (FileCleaner.getTrackCount() != 0) {
-            System.gc();
-        }
+
+        waitUntilTrackCount();
 
         assertEquals(0, FileCleaner.getTrackCount());
         assertEquals(true, testFile.exists());  // not deleted, as dir not empty
@@ -138,9 +135,8 @@ public void testFileCleanerDirectory_ForceStrategy() throws Exception {
         assertEquals(1, FileCleaner.getTrackCount());
 
         obj = null;
-        while (FileCleaner.getTrackCount() != 0) {
-            System.gc();
-        }
+
+        waitUntilTrackCount();
 
         assertEquals(0, FileCleaner.getTrackCount());
         assertEquals(false, testFile.exists());
@@ -174,4 +170,15 @@ public void testFileCleanerNull() throws Exception {
         }
     }
 
+    private void waitUntilTrackCount() {
+        while (FileCleaner.getTrackCount() != 0) {
+            int total = 0;
+            while (FileCleaner.getTrackCount() != 0) {
+                byte[] b = new byte[1024 * 1024];
+                b[0] = (byte) System.currentTimeMillis();
+                total = total + b[0];
+                System.gc();
+            }
+        }
+    }
 }