Core Consummers module: add @Override for unit test + attempt to fix CleanupReleaseSnapshotRepositoryPurgeTest

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1369920 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 15 insertions, 0 deletions

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java
index 6dc39f37c..1774d982b 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/AbstractArtifactConsumerTest.java
@@ -60,6 +60,7 @@ public abstract class AbstractArtifactConsumerTest
 
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -74,6 +75,7 @@ public abstract class AbstractArtifactConsumerTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
index 60f008903..d29be80e8 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumerTest.java
@@ -36,6 +36,7 @@ public class ArtifactMissingChecksumsConsumerTest
     private ManagedRepository repoConfig;
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/MetadataUpdateConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/MetadataUpdateConsumerTest.java
index 1ff915a5d..e7efcc2b9 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/MetadataUpdateConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/MetadataUpdateConsumerTest.java
@@ -26,6 +26,7 @@ public class MetadataUpdateConsumerTest
     extends AbstractArtifactConsumerTest
 {
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
index 7d6d8d16d..b55179c5c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
@@ -100,6 +100,7 @@ public abstract class AbstractRepositoryPurgeTest
 
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -120,6 +121,7 @@ public abstract class AbstractRepositoryPurgeTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
index 5c7184687..2ccdec47c 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
@@ -62,6 +62,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
     MetadataTools metadataTools;
 
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -222,6 +223,9 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
         assertExists( releasesProjectRoot + "/1.0/released-artifact-in-diff-repo-1.0.pom" );
         assertExists( releasesProjectRoot + "/1.0/released-artifact-in-diff-repo-1.0.pom.md5" );
         assertExists( releasesProjectRoot + "/1.0/released-artifact-in-diff-repo-1.0.pom.sha1" );
+        
+        // remove RELEASES_TEST_REPO_ID so this test will be more independant
+        applicationContext.getBean( ManagedRepositoryAdmin.class ).deleteManagedRepository( RELEASES_TEST_REPO_ID, null, false );
     }
 
     @Test
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
index 1e248c319..d9dad66af 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
@@ -49,6 +49,7 @@ public class DaysOldRepositoryPurgeTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
index 9d1e33863..1d4c2bad9 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
@@ -46,6 +46,7 @@ public class RepositoryPurgeConsumerTest
     extends AbstractRepositoryPurgeTest
 {
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -56,6 +57,7 @@ public class RepositoryPurgeConsumerTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
index b161a1bc5..a9cd53f78 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
@@ -35,6 +35,7 @@ public class RetentionCountRepositoryPurgeTest
     extends AbstractRepositoryPurgeTest
 {
     @Before
+    @Override
     public void setUp()
         throws Exception
     {
@@ -47,6 +48,7 @@ public class RetentionCountRepositoryPurgeTest
     }
 
     @After
+    @Override
     public void tearDown()
         throws Exception
     {