[MRM-1421] Archiva repository purge incorrectly purges based on file timestamps even...

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@1049392 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
index 252abcad88deaa74a35fd323e6d95928cab3287f..be986057340cc610e05c631e58c95722eed2b756 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
@@ -33,6 +33,8 @@ import java.util.List;
 public class DaysOldRepositoryPurgeTest
     extends AbstractRepositoryPurgeTest
 {
+    private static final int OLD_TIMESTAMP = 1179382029;
+
     private void setLastModified( String dirPath, long lastModified )
     {
         File dir = new File( dirPath );
@@ -56,7 +58,7 @@ public class DaysOldRepositoryPurgeTest
 
         String projectRoot = repoRoot + "/org/apache/maven/plugins/maven-install-plugin";
 
-        setLastModified( projectRoot + "/2.2-SNAPSHOT/", 1179382029 );
+        setLastModified( projectRoot + "/2.2-SNAPSHOT/", OLD_TIMESTAMP );
 
         // test listeners for the correct artifacts
         listener.deleteArtifact( getRepository(), createArtifact( "org.apache.maven.plugins", "maven-install-plugin",
@@ -115,7 +117,7 @@ public class DaysOldRepositoryPurgeTest
 
         String projectRoot = repoRoot + "/org/apache/maven/plugins/maven-assembly-plugin";
 
-        setLastModified( projectRoot + "/1.1.2-SNAPSHOT/", 1179382029 );
+        setLastModified( projectRoot + "/1.1.2-SNAPSHOT/", OLD_TIMESTAMP );
 
         // test listeners for the correct artifacts
         listener.deleteArtifact( getRepository(), createArtifact( "org.apache.maven.plugins", "maven-assembly-plugin",
@@ -171,8 +173,17 @@ public class DaysOldRepositoryPurgeTest
 
         for ( int i = 5; i <= 7; i++ )
         {
-            new File( versionRoot, "/plexus-utils-1.4.3-" + timestamp + "-" + i + ".jar" ).createNewFile();
-            new File( versionRoot, "/plexus-utils-1.4.3-" + timestamp + "-" + i + ".pom" ).createNewFile();
+            File jarFile = new File( versionRoot, "/plexus-utils-1.4.3-" + timestamp + "-" + i + ".jar" );
+            jarFile.createNewFile();
+            File pomFile = new File( versionRoot, "/plexus-utils-1.4.3-" + timestamp + "-" + i + ".pom" );
+            pomFile.createNewFile();
+
+            // set timestamp to older than 100 days for the first build, but ensure the filename timestamp is honoured instead
+            if ( i == 5 )
+            {
+                jarFile.setLastModified( OLD_TIMESTAMP );
+                pomFile.setLastModified( OLD_TIMESTAMP );
+            }
         }
 
         List<String> versions = new ArrayList<String>();