svn commit: r589582 - /maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java

[br...@apache.org]

Author: brett
Date: Mon Oct 29 04:14:47 2007
New Revision: 589582

URL: http://svn.apache.org/viewvc?rev=589582&view=rev
Log:
force timestamp to make test more robust, rather than depending on the clock granularity of the system

Modified:
    maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java

Modified: maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java?rev=589582&r1=589581&r2=589582&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java (original)
+++ maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java Mon Oct 29 04:14:47 2007
@@ -32,6 +32,7 @@
 import java.io.File;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -184,6 +185,8 @@
             throws Exception
     {
         File jarFile = new File( "target/test/dummy.jar" );
+        jarFile.delete();
+        assertFalse( jarFile.exists() );
         JarArchiver jarArchiver = new JarArchiver();
         jarArchiver.setDestFile( jarFile );
 
@@ -219,20 +222,23 @@
         config.setForced( false );
         
         FileUtils.deleteDirectory( "target/maven-archiver" );
-        long timeStamp0 = System.currentTimeMillis();
-        Thread.sleep( 1 ); // Make sure, that System.currentTimeMillis() is different from timeStamp
         archiver.createArchive( project, config );
-        long timeStamp1 = jarFile.lastModified();
-        assertTrue( timeStamp1 > timeStamp0 );
+        assertTrue( jarFile.exists() );
+        jarFile.setLastModified( System.currentTimeMillis() - 60000L );
+        long time = jarFile.lastModified();
+
+        List files = FileUtils.getFiles( new File( "target/maven-archiver" ), "**/**", null, true );
+        for ( Iterator i = files.iterator(); i.hasNext(); )
+	{
+	    File f = (File) i.next();
+	    f.setLastModified( time );
+        }
 
-        Thread.sleep( 1 ); // Make sure, that System.currentTimeMillis() is different from timeStamp
         archiver.createArchive( project,config );
-        long timeStamp2 = jarFile.lastModified();
-        assertEquals( timeStamp2, timeStamp1 );
+        assertEquals( jarFile.lastModified(), time );
 
-        Thread.sleep( 10 ); // Make sure, that System.currentTimeMillis() is different from timeStamp
         config.setForced( true );
         archiver.createArchive( project, config );
-        assertTrue( jarFile.lastModified() > timeStamp2 );
+        assertTrue( jarFile.lastModified() > time );
     }
 }