From 913039e58f6a0724fb77b8db8f0bb362c44c4b1b Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Fri, 25 Jan 2008 06:07:36 +0000 Subject: [PATCH] [MRM-622] - added test for the order of deletion in RetentionCountRepositoryPurge git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@615120 13f79535-47bb-0310-9956-ffa450edef68 --- .../AbstractRepositoryPurgeTest.java | 12 +++++++ .../DaysOldRepositoryPurgeTest.java | 13 +------ .../RetentionCountRepositoryPurgeTest.java | 35 +++++++++++++++++++ 3 files changed, 48 insertions(+), 12 deletions(-) diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java index be209cc02..623853824 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java @@ -33,6 +33,7 @@ import org.jpox.SchemaTool; import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Properties; @@ -229,4 +230,15 @@ public abstract class AbstractRepositoryPurgeTest return testDir.getAbsolutePath(); } + + protected void populateDbForTestOrderOfDeletion() + throws Exception + { + List versions = new ArrayList(); + versions.add( "1.1.2-20070427.065136-1" ); + versions.add( "1.1.2-20070506.163513-2" ); + versions.add( "1.1.2-20070615.105019-3" ); + + populateDb( "org.apache.maven.plugins", "maven-assembly-plugin", versions ); + } } diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java index 282b69edf..9ed788f9f 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java @@ -270,16 +270,5 @@ public class DaysOldRepositoryPurgeTest versions.add( "2.2-SNAPSHOT" ); populateDb( "org.apache.maven.plugins", "maven-install-plugin", versions ); - } - - private void populateDbForTestOrderOfDeletion() - throws Exception - { - List versions = new ArrayList(); - versions.add( "1.1.2-20070427.065136-1" ); - versions.add( "1.1.2-20070506.163513-2" ); - versions.add( "1.1.2-20070615.105019-3" ); - - populateDb( "org.apache.maven.plugins", "maven-assembly-plugin", versions ); - } + } } diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java index b9af53359..3cc7dd0ca 100644 --- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java +++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java @@ -143,6 +143,41 @@ public class RetentionCountRepositoryPurgeTest assertExists( versionRoot + "/castor-anttasks-1.1.2-20070506.163513-2-sources.jar.sha1" ); } + public void testOrderOfDeletion() + throws Exception + { + populateDbForTestOrderOfDeletion(); + + String repoRoot = prepareTestRepo(); + + repoPurge.process( PATH_TO_TEST_ORDER_OF_DELETION ); + + String versionRoot = repoRoot + + "/org/apache/maven/plugins/maven-assembly-plugin/1.1.2-SNAPSHOT"; + + assertDeleted( versionRoot + "/maven-assembly-plugin-1.1.2-20070427.065136-1.jar" ); + assertDeleted( versionRoot + "/maven-assembly-plugin-1.1.2-20070427.065136-1.jar.sha1" ); + assertDeleted( versionRoot + "/maven-assembly-plugin-1.1.2-20070427.065136-1.jar.md5" ); + assertDeleted( versionRoot + "/maven-assembly-plugin-1.1.2-20070427.065136-1.pom" ); + assertDeleted( versionRoot + "/maven-assembly-plugin-1.1.2-20070427.065136-1.pom.sha1" ); + assertDeleted( versionRoot + "/maven-assembly-plugin-1.1.2-20070427.065136-1.pom.md5" ); + + // the following should not have been deleted + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070506.163513-2.jar" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070506.163513-2.jar.sha1" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070506.163513-2.jar.md5" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070506.163513-2.pom" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070506.163513-2.pom.sha1" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070506.163513-2.pom.md5" ); + + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070615.105019-3.jar" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070615.105019-3.jar.sha1" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070615.105019-3.jar.md5" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070615.105019-3.pom" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070615.105019-3.pom.sha1" ); + assertExists( versionRoot + "/maven-assembly-plugin-1.1.2-20070615.105019-3.pom.md5" ); + } + public void populateIfJarWasFoundDb() throws Exception { -- 2.39.5