Fix tests to handle last modified date behaviour on Win2k

bug 38130, from Niall Pemberton

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

Author: Stephen Colebourne

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003,2004 The Apache Software Foundation.
+ * Copyright 2003-2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,11 +67,11 @@ public void testIsFileNewer() {
             throw new IllegalStateException("The m_testFile1 should exist");
 
         long fileLastModified = m_testFile1.lastModified();
-        final long ONE_SECOND = 1000;
+        final long TWO_SECOND = 2000;
 
-        testIsFileNewer("one second earlier is not newer" , m_testFile1, fileLastModified + ONE_SECOND, false);
+        testIsFileNewer("two second earlier is not newer" , m_testFile1, fileLastModified + TWO_SECOND, false);
         testIsFileNewer("same time is not newer" , m_testFile1, fileLastModified, false);
-        testIsFileNewer("one second later is newer" , m_testFile1, fileLastModified - ONE_SECOND, true);
+        testIsFileNewer("two second later is newer" , m_testFile1, fileLastModified - TWO_SECOND, true);
     }
 
     /**
@@ -86,7 +86,7 @@ public void testIsFileNewerImaginaryFile() {
         if (imaginaryFile.exists())
             throw new IllegalStateException("The imaginary File exists");
 
-        testIsFileNewer("imaginary file can be newer" , imaginaryFile, 0, false);
+        testIsFileNewer("imaginary file can be newer" , imaginaryFile, m_testFile2.lastModified(), false);
     }
 
     /**
@@ -118,8 +118,7 @@ protected void testIsFileNewer(String description, File file, long time, boolean
         File temporaryFile = m_testFile2;
 
         temporaryFile.setLastModified(time);
-        if (temporaryFile.lastModified() != time)
-            throw new IllegalStateException("The temporary file hasn't the right last modification date");
+        assertEquals("The temporary file hasn't the right last modification date", time, temporaryFile.lastModified());
         assertEquals(description + " - file", wantedResult, FileUtils.isFileNewer(file, temporaryFile));
     }
 

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

@@ -461,7 +461,7 @@ public void testMakeSVNAware() throws Exception {
     public void testAgeFilter() throws Exception {
         File oldFile = new File(getTestDirectory(), "old.txt");
         createFile(oldFile, 0);
-        spin();
+        spin(oldFile.lastModified());
         long now = System.currentTimeMillis();
         IOFileFilter filter1 = FileFilterUtils.ageFileFilter(now);
         IOFileFilter filter2 = FileFilterUtils.ageFileFilter(now, true);
@@ -475,7 +475,7 @@ public void testAgeFilter() throws Exception {
         IOFileFilter filter7 = FileFilterUtils.ageFileFilter(reference);
         IOFileFilter filter8 = FileFilterUtils.ageFileFilter(reference, true);
         IOFileFilter filter9 = FileFilterUtils.ageFileFilter(reference, false);
-        spin();
+        spin(reference.lastModified());
         File newFile = new File(getTestDirectory(), "new.txt");
         createFile(newFile, 0);
 
@@ -523,8 +523,7 @@ public void testSizeFilter() throws Exception {
         }
     }
 
-    private void spin() {
-        long now = System.currentTimeMillis();
+    private void spin(long now) {
         while (System.currentTimeMillis() <= now);
     }