Author: rfscholte Date: Mon Aug 8 21:28:42 2011 New Revision: 1155111 URL: http://svn.apache.org/viewvc?rev=1155111&view=rev Log: Small adjustments trying to fix unstable results: - use only one System.currentTimeInMillis() - compare lastModified() of both files instead on the intended times. According to API it depends on the OS how this value will be set.
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java?rev=1155111&r1=1155110&r2=1155111&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java Mon Aug 8 21:28:42 2011 @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.apache.commons.lang.time.DateFormatUtils; @@ -496,22 +497,23 @@ public class TestUnpackMojo public void testUnpackOverWriteIfNewer() throws IOException, MojoExecutionException, InterruptedException { + final long now = System.currentTimeMillis(); + mojo.silent = false; stubFactory.setCreateFiles( true ); Artifact artifact = stubFactory.getSnapshotArtifact(); - assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 20000 ) ); + assertTrue( artifact.getFile().setLastModified( now - 20000 ) ); ArtifactItem item = new ArtifactItem( artifact ); - List<ArtifactItem> list = new ArrayList<ArtifactItem>( 1 ); - list.add( item ); + List<ArtifactItem> list = Collections.singletonList( item ); mojo.setArtifactItems( list ); mojo.setOverWriteIfNewer( true ); mojo.execute(); File unpackedFile = getUnpackedFile( item ); // round down to the last second - long time = System.currentTimeMillis(); + long time = now; time = time - ( time % 1000 ); // go back 10 more seconds for linux time -= 10000; @@ -532,11 +534,10 @@ public class TestUnpackMojo displayFile( "unpackedFile", unpackedFile ); displayFile( "artifact ", artifact.getFile() ); displayFile( "marker ", marker ); - System.out.println( "marker.lastModified() = " + time ); - long unpackedFileTime = unpackedFile.lastModified(); - System.out.println( "unpackedFile.lastModified() = " + unpackedFileTime ); - assertTrue( "unpackedFile '" + unpackedFile + "' lastModified() == " + time + ": should be different", - time != unpackedFile.lastModified() ); + System.out.println( "marker.lastModified() = " + marker.lastModified() ); + System.out.println( "unpackedFile.lastModified() = " + unpackedFile.lastModified() ); + assertTrue( "unpackedFile '" + unpackedFile + "' lastModified() == " + marker.lastModified() + ": should be different", + marker.lastModified() != unpackedFile.lastModified() ); } private void displayFile( String description, File file )