Fixing the failed tests on the vmbuild machine. Rather than trying to pause for a second and hoping that means the file's will have different timestamps - the new code just sits and creates the new file repeatedly until it has a different timestamp. A pause of a second means that repeatedly should usually be a very small number of times - such as one. Also changed the code so the long millisecond variable is the date's getTime method and not a different time all together. The previous one irritated my sense of aesthetics :)

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

Author: hen

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

@@ -363,12 +363,27 @@ public void testIsFileNewerOlder() throws Exception {
 
         // Create Files
         createFile(oldFile, 0);
-        spin(oldFile.lastModified());
-        long now = System.currentTimeMillis();
+
+        do {
+            try {
+                Thread.sleep(1000);
+            } catch(InterruptedException ie) {
+                // ignore
+            }
+            createFile(reference, 0);
+        } while( oldFile.lastModified() == reference.lastModified() );
+
         Date date = new Date();
-        createFile(reference, 0);
-        spin(reference.lastModified());
-        createFile(newFile, 0);
+        long now = date.getTime();
+
+        do {
+            try {
+                Thread.sleep(1000);
+            } catch(InterruptedException ie) {
+                // ignore
+            }
+            createFile(newFile, 0);
+        } while( reference.lastModified() == newFile.lastModified() );
 
         // Test isFileNewer()
         assertFalse("Old File - Newer - File", FileUtils.isFileNewer(oldFile, reference));
@@ -930,11 +945,4 @@ public void testWriteLines_3arg_nullSeparator() throws Exception {
         assertEquals(expected, actual);
     }
 
-    private void spin(long now) throws InterruptedException {
-        final long end = now + 1000;
-        while (System.currentTimeMillis() <= end) {
-            Thread.sleep(Math.max(1, end - System.currentTimeMillis()));
-        }
-    }
-
 }

src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java

@@ -581,24 +581,41 @@ public void testMakeSVNAware() throws Exception {
 
     public void testAgeFilter() throws Exception {
         File oldFile = new File(getTestDirectory(), "old.txt");
+        File reference = new File(getTestDirectory(), "reference.txt");
+        File newFile = new File(getTestDirectory(), "new.txt");
+
         createFile(oldFile, 0);
-        spin(oldFile.lastModified());
-        long now = System.currentTimeMillis();
+
+        do {
+            try { 
+                Thread.sleep(1000);
+            } catch(InterruptedException ie) {
+                // ignore
+            }
+            createFile(reference, 0);
+        } while( oldFile.lastModified() == reference.lastModified() );
+
+        Date date = new Date();
+        long now = date.getTime();
+
+        do {
+            try { 
+                Thread.sleep(1000);
+            } catch(InterruptedException ie) {
+                // ignore
+            }
+            createFile(newFile, 0);
+        } while( reference.lastModified() == newFile.lastModified() );
+
         IOFileFilter filter1 = FileFilterUtils.ageFileFilter(now);
         IOFileFilter filter2 = FileFilterUtils.ageFileFilter(now, true);
         IOFileFilter filter3 = FileFilterUtils.ageFileFilter(now, false);
-        Date date = new Date();
         IOFileFilter filter4 = FileFilterUtils.ageFileFilter(date);
         IOFileFilter filter5 = FileFilterUtils.ageFileFilter(date, true);
         IOFileFilter filter6 = FileFilterUtils.ageFileFilter(date, false);
-        File reference = new File(getTestDirectory(), "reference.txt");
-        createFile(reference, 0);
         IOFileFilter filter7 = FileFilterUtils.ageFileFilter(reference);
         IOFileFilter filter8 = FileFilterUtils.ageFileFilter(reference, true);
         IOFileFilter filter9 = FileFilterUtils.ageFileFilter(reference, false);
-        spin(reference.lastModified());
-        File newFile = new File(getTestDirectory(), "new.txt");
-        createFile(newFile, 0);
 
         assertFiltering(filter1, oldFile, true);
         assertFiltering(filter2, oldFile, true);
@@ -718,12 +735,5 @@ public void testEmpty() throws Exception {
         FileUtils.forceDelete(emptyDir);
     }
 
-    private void spin(long now) throws InterruptedException {
-        final long end = now + 1000;
-        while (System.currentTimeMillis() <= end) {
-            Thread.sleep(Math.max(1, end - System.currentTimeMillis()));
-        }
-    }
-
 }