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

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

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 6dc39f37ce3907b45a6d8da040580071e067d3a7..1774d982b70b26514039a26e7f88c479f516aeea 100644 (file)
--- 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 60f008903b8a3e8b6a25cd5787c0a0d75f00336a..d29be80e83e4ecb204d1132ab2715e7a2824cdfa 100644 (file)
--- 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 1ff915a5d902de8702670aa7b31af478f466016b..e7efcc2b9866cfd34384b7bc78169d9447e4bdb6 100644 (file)
--- 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 7d6d8d16d5660b0b1d438cea4902e9b057af4c2c..b55179c5ca04c230cec947ef5b194c98da83bb66 100644 (file)
--- 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 5c71846879a79f55c13da9025115704b2a6069f5..2ccdec47c897d3c3f9ccb6cc78ff645e584145a4 100644 (file)
--- 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 1e248c3195b7c024c64f6312f73f1a6bbea23edd..d9dad66af2b3cf66ceed6b5ec47d729c9e2fdf99 100644 (file)
--- 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 9d1e33863a761f52eaf1bb6829b1b9e374f2ce7e..1d4c2bad9bc06379269d9a0873f27d8dc4217921 100644 (file)
--- 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 b161a1bc52bd36dfbf7077c139a652edb5802cc8..a9cd53f78073e31905d8410045aa3884837c6724 100644 (file)
--- 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
     {