You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/12/28 20:53:23 UTC
svn commit: r1776327 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugins/dependency/
main/java/org/apache/maven/plugins/dependency/utils/markers/
test/java/org/apache/maven/plugins/dependency/fromConfiguration/ tes...
Author: schulte
Date: Wed Dec 28 20:53:22 2016
New Revision: 1776327
URL: http://svn.apache.org/viewvc?rev=1776327&view=rev
Log:
o Updated to stop ignoring the boolean result of method 'File.setLastModified'.
o Updated to use 'File.deleteOnExit' whenever the 'File.delete' method returned false.
This commit does not change any behaviour. I am committing this to find out why
some of those tests are failing sporadically on the CI system. The
'File.setLastModified' method is known to not guarantee that any filesystem
meta-data is written out immediately. There are workarounds to this using
e.g. 'Thread.sleep' but they will not solve those issues once and for all
with Java 6.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/DefaultFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/SourcesFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/DependencyTestUtils.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java Wed Dec 28 20:53:22 2016
@@ -560,7 +560,8 @@ public class PurgeLocalRepositoryMojo
{
if ( !deleteTarget.delete() )
{
- getLog().warn( "Unable to purge local repository location: " + deleteTarget );
+ deleteTarget.deleteOnExit();
+ getLog().warn( "Unable to purge local repository location immediately: " + deleteTarget );
}
}
artifact.setResolved( false );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/DefaultFileMarkerHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/DefaultFileMarkerHandler.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/DefaultFileMarkerHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/DefaultFileMarkerHandler.java Wed Dec 28 20:53:22 2016
@@ -116,7 +116,7 @@ public class DefaultFileMarkerHandler
{
throw new MojoExecutionException( "Unable to create Marker: " + marker.getAbsolutePath(), e );
}
-
+
// update marker file timestamp
try
{
@@ -129,7 +129,12 @@ public class DefaultFileMarkerHandler
{
ts = System.currentTimeMillis();
}
- marker.setLastModified( ts );
+ if ( !marker.setLastModified( ts ) )
+ {
+ throw new MojoExecutionException( "Unable to update last modified timestamp on marker file "
+ + marker.getAbsolutePath() );
+
+ }
}
catch ( Exception e )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/SourcesFileMarkerHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/SourcesFileMarkerHandler.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/SourcesFileMarkerHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/markers/SourcesFileMarkerHandler.java Wed Dec 28 20:53:22 2016
@@ -151,7 +151,10 @@ public class SourcesFileMarkerHandler
// clear the other file if it exists.
if ( clearMarker.exists() )
{
- clearMarker.delete();
+ if ( !clearMarker.delete() )
+ {
+ clearMarker.deleteOnExit();
+ }
}
}
catch ( IOException e )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java Wed Dec 28 20:53:22 2016
@@ -570,7 +570,7 @@ public class TestCopyMojo
{
stubFactory.setCreateFiles( true );
Artifact release = stubFactory.getReleaseArtifact();
- release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( release.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( release );
@@ -601,7 +601,7 @@ public class TestCopyMojo
{
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
- artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( artifact );
@@ -619,7 +619,7 @@ public class TestCopyMojo
// round up to the next second
long time = System.currentTimeMillis() + 1000;
time = time - ( time % 1000 );
- copiedFile.setLastModified( time );
+ assertTrue( copiedFile.setLastModified( time ) );
Thread.sleep( 100 );
mojo.execute();
@@ -632,7 +632,7 @@ public class TestCopyMojo
{
stubFactory.setCreateFiles( true );
Artifact release = stubFactory.getReleaseArtifact();
- release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( release.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( release );
@@ -648,7 +648,7 @@ public class TestCopyMojo
// round up to the next second
long time = System.currentTimeMillis() - 2000;
- copiedFile.setLastModified( time );
+ assertTrue( copiedFile.setLastModified( time ) );
mojo.execute();
@@ -660,7 +660,7 @@ public class TestCopyMojo
{
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
- artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( artifact );
@@ -677,7 +677,7 @@ public class TestCopyMojo
// round up to the next second
long time = System.currentTimeMillis() - 2000;
- copiedFile.setLastModified( time );
+ assertTrue( copiedFile.setLastModified( time ) );
mojo.execute();
@@ -689,7 +689,7 @@ public class TestCopyMojo
{
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
- artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( artifact );
@@ -704,10 +704,10 @@ public class TestCopyMojo
// set dest to be old
long time = System.currentTimeMillis() - 10000;
time = time - ( time % 1000 );
- copiedFile.setLastModified( time );
+ assertTrue( copiedFile.setLastModified( time ) );
// set source to be newer
- artifact.getFile().setLastModified( time + 4000 );
+ assertTrue( artifact.getFile().setLastModified( time + 4000 ) );
mojo.execute();
assertTrue( time < copiedFile.lastModified() );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java Wed Dec 28 20:53:22 2016
@@ -307,8 +307,8 @@ public class TestIncludeExcludeUnpackMoj
new File( mojo.getOutputDirectory().getAbsolutePath(), UNPACKED_FILE_PREFIX + 3 + UNPACKED_FILE_SUFFIX );
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
- destFile2.setLastModified( time );
- destFile3.setLastModified( time );
+ assertTrue( destFile2.setLastModified( time ) );
+ assertTrue( destFile3.setLastModified( time ) );
assertEquals( time, destFile2.lastModified() );
assertEquals( time, destFile3.lastModified() );
Thread.sleep( 100 );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java Wed Dec 28 20:53:22 2016
@@ -413,7 +413,7 @@ public class TestUnpackMojo
{
stubFactory.setCreateFiles( true );
Artifact release = stubFactory.getReleaseArtifact();
- release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( release.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( createArtifact( release ) );
@@ -433,7 +433,7 @@ public class TestUnpackMojo
{
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
- artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( createArtifact( artifact ) );
@@ -453,7 +453,7 @@ public class TestUnpackMojo
{
stubFactory.setCreateFiles( true );
Artifact release = stubFactory.getReleaseArtifact();
- release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( release.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( createArtifact( release ) );
@@ -473,7 +473,7 @@ public class TestUnpackMojo
{
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
- artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( artifact.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
ArtifactItem item = new ArtifactItem( createArtifact( artifact ) );
@@ -551,7 +551,7 @@ public class TestUnpackMojo
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
- unpackedFile.setLastModified( time );
+ assertTrue( unpackedFile.setLastModified( time ) );
assertEquals( time, unpackedFile.lastModified() );
mojo.execute();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java Wed Dec 28 20:53:22 2016
@@ -527,7 +527,7 @@ public class TestCopyDependenciesMojo
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact release = stubFactory.getReleaseArtifact();
- release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( release.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( release );
@@ -544,7 +544,7 @@ public class TestCopyDependenciesMojo
// round up to the next second
long time = System.currentTimeMillis() + 1000;
time = time - ( time % 1000 );
- copiedFile.setLastModified( time );
+ assertTrue( copiedFile.setLastModified( time ) );
Thread.sleep( 100 );
mojo.execute();
@@ -558,7 +558,7 @@ public class TestCopyDependenciesMojo
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact release = stubFactory.getReleaseArtifact();
- release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( release.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( release );
@@ -576,7 +576,7 @@ public class TestCopyDependenciesMojo
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
- copiedFile.setLastModified( time );
+ assertTrue( copiedFile.setLastModified( time ) );
// wait at least a second for filesystems that only record to the
// nearest second.
Thread.sleep( 1000 );
@@ -593,7 +593,7 @@ public class TestCopyDependenciesMojo
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
- snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( snap.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( snap );
@@ -612,7 +612,7 @@ public class TestCopyDependenciesMojo
// round up to the next second
long time = System.currentTimeMillis() + 1000;
time = time - ( time % 1000 );
- copiedFile.setLastModified( time );
+ assertTrue( copiedFile.setLastModified( time ) );
Thread.sleep( 100 );
mojo.execute();
@@ -626,7 +626,7 @@ public class TestCopyDependenciesMojo
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
- snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( snap.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( snap );
@@ -645,7 +645,7 @@ public class TestCopyDependenciesMojo
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
- copiedFile.setLastModified( time );
+ assertTrue( copiedFile.setLastModified( time ) );
// wait at least a second for filesystems that only record to the
// nearest second.
Thread.sleep( 1000 );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java Wed Dec 28 20:53:22 2016
@@ -34,7 +34,6 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugins.dependency.testUtils.DependencyTestUtils;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
@@ -606,7 +605,7 @@ public class TestUnpackDependenciesMojo
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
- unpackedFile.setLastModified( time );
+ assertTrue( unpackedFile.setLastModified( time ) );
// wait at least a second for filesystems that only record to the
// nearest second.
Thread.sleep( 1000 );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo2.java Wed Dec 28 20:53:22 2016
@@ -102,7 +102,7 @@ public class TestUnpackDependenciesMojo2
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact release = stubFactory.getReleaseArtifact();
- release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( release.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( release );
@@ -122,7 +122,7 @@ public class TestUnpackDependenciesMojo2
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact release = stubFactory.getReleaseArtifact();
- release.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( release.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( release );
@@ -143,7 +143,7 @@ public class TestUnpackDependenciesMojo2
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
- snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( snap.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( snap );
@@ -165,7 +165,7 @@ public class TestUnpackDependenciesMojo2
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
- snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( snap.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( snap );
@@ -188,7 +188,7 @@ public class TestUnpackDependenciesMojo2
Set<Artifact> artifacts = new HashSet<Artifact>();
Artifact snap = stubFactory.getSnapshotArtifact();
- snap.getFile().setLastModified( System.currentTimeMillis() - 2000 );
+ assertTrue( snap.getFile().setLastModified( System.currentTimeMillis() - 2000 ) );
artifacts.add( snap );
@@ -207,8 +207,8 @@ public class TestUnpackDependenciesMojo2
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
// set source to be newer and dest to be a known value.
- snap.getFile().setLastModified( time + 3000 );
- unpackedFile.setLastModified( time );
+ assertTrue( snap.getFile().setLastModified( time + 3000 ) );
+ assertTrue( unpackedFile.setLastModified( time ) );
// wait at least a second for filesystems that only record to the
// nearest second.
Thread.sleep( 1000 );
@@ -237,7 +237,7 @@ public class TestUnpackDependenciesMojo2
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
- unpackedFile.setLastModified( time );
+ assertTrue( unpackedFile.setLastModified( time ) );
// wait at least a second for filesystems that only record to the
// nearest second.
Thread.sleep( 1000 );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/DependencyTestUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/DependencyTestUtils.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/DependencyTestUtils.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/testUtils/DependencyTestUtils.java Wed Dec 28 20:53:22 2016
@@ -34,18 +34,20 @@ import org.apache.maven.plugin.testing.S
import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.maven.shared.model.fileset.util.FileSetManager;
import org.codehaus.plexus.util.ReflectionUtils;
+import static junit.framework.Assert.assertTrue;
public class DependencyTestUtils
{
/**
* Deletes a directory and its contents.
- *
+ *
* @param dir
- * The base directory of the included and excluded files.
+ * The base directory of the included and excluded files.
+ *
* @throws IOException
* @throws MojoExecutionException
- * When a directory failed to get deleted.
+ * When a directory failed to get deleted.
*/
public static void removeDirectory( File dir )
throws IOException
@@ -79,10 +81,11 @@ public class DependencyTestUtils
/**
* convience method to set values to variables in objects that don't have
* setters
- *
+ *
* @param object
* @param variable
* @param value
+ *
* @throws IllegalAccessException
*/
public static void setVariableValueToObject( Object object, String variable, Object value )
@@ -102,7 +105,9 @@ public class DependencyTestUtils
// round down to the last second
long time = System.currentTimeMillis();
time = time - ( time % 1000 );
- file.setLastModified( time );
+ assertTrue( "Updating last modification time of marker file " + file.getAbsolutePath()
+ + " failed unexpectedly.", file.setLastModified( time ) );
+
// wait at least a second for filesystems that only record to the
// nearest second.
Thread.sleep( 1000 );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestDestFileFilter.java Wed Dec 28 20:53:22 2016
@@ -192,7 +192,7 @@ public class TestDestFileFilter
fact.setCreateFiles( true );
Artifact artifact = fact.getSnapshotArtifact();
File artifactFile = artifact.getFile();
- artifactFile.setLastModified( artifactFile.lastModified() );
+ assertTrue( artifactFile.setLastModified( artifactFile.lastModified() ) );
filter.setOverWriteIfNewer( true );
// should pass because the file doesn't exist yet.
@@ -202,11 +202,11 @@ public class TestDestFileFilter
File destFile = createFile( artifact, false, false, false );
// set the last modified timestamp to be older than the source
- destFile.setLastModified( artifactFile.lastModified() - 1000 );
+ assertTrue( destFile.setLastModified( artifactFile.lastModified() - 1000 ) );
assertTrue( filter.isArtifactIncluded( artifact ) );
// now set the last modified timestamp to be newer than the source
- destFile.setLastModified( artifactFile.lastModified() + 1000 );
+ assertTrue( destFile.setLastModified( artifactFile.lastModified() + 1000 ) );
assertFalse( filter.isArtifactIncluded( artifact ) );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/filters/TestMarkerFileFilter.java Wed Dec 28 20:53:22 2016
@@ -133,7 +133,7 @@ public class TestMarkerFileFilter
tempArtifacts.add( release );
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( snap, outputFolder );
handler.setMarker();
- snap.getFile().setLastModified( snap.getFile().lastModified() + 1500 );
+ assertTrue( snap.getFile().setLastModified( snap.getFile().lastModified() + 1500 ) );
MarkerFileFilter filter = new MarkerFileFilter( false, false, true, new DefaultFileMarkerHandler( outputFolder ) );
Set<Artifact> result = filter.filter( tempArtifacts );
assertEquals( 2, result.size() );
@@ -144,7 +144,7 @@ public class TestMarkerFileFilter
assertEquals( 1, result.size() );
// filter won't include snapshot because it is older than marker
- snap.getFile().setLastModified( snap.getFile().lastModified() - 10000 );
+ assertTrue( snap.getFile().setLastModified( snap.getFile().lastModified() - 10000 ) );
result = filter.filter( tempArtifacts );
assertEquals( 1, result.size() );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestDefaultMarkerFileHandler.java Wed Dec 28 20:53:22 2016
@@ -139,7 +139,7 @@ public class TestDefaultMarkerFileHandle
handler.setMarker();
assertFalse( handler.isMarkerOlder( theArtifact ) );
- theFile.setLastModified( theFile.lastModified() + 60000 );
+ assertTrue( theFile.setLastModified( theFile.lastModified() + 60000 ) );
assertTrue( handler.isMarkerOlder( theArtifact ) );
theFile.delete();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestSourcesMarkerFileHandler.java Wed Dec 28 20:53:22 2016
@@ -238,7 +238,7 @@ public class TestSourcesMarkerFileHandle
assertFalse( resolvedHandler.isMarkerOlder( theArtifact ) );
assertFalse( unResolvedHandler.isMarkerOlder( theArtifact ) );
- theFile.setLastModified( theFile.lastModified() + 60000 );
+ assertTrue( theFile.setLastModified( theFile.lastModified() + 60000 ) );
assertTrue( resolvedHandler.isMarkerOlder( theArtifact ) );
assertTrue( unResolvedHandler.isMarkerOlder( theArtifact ) );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java?rev=1776327&r1=1776326&r2=1776327&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/markers/TestUnpackMarkerFileHandler.java Wed Dec 28 20:53:22 2016
@@ -156,7 +156,7 @@ public class TestUnpackMarkerFileHandler
handler.setMarker();
assertFalse( handler.isMarkerOlder( theArtifact ) );
- theFile.setLastModified( theFile.lastModified() + 60000 );
+ assertTrue( theFile.setLastModified( theFile.lastModified() + 60000 ) );
assertTrue( handler.isMarkerOlder( theArtifact ) );
theFile.delete();