an other try to prevent windauze file leak

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1204908 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/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 f65cc917689c3c13dfaa70d34ad7586f3a1a1034..6cacc59be1c8f99379f4e654504eab83dffc028c 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
@@ -102,7 +102,6 @@ public abstract class AbstractRepositoryPurgeTest
     @Inject
     protected PlexusSisuBridge plexusSisuBridge;
 
-    ArchivaConfiguration previousArchivaConfiguration;
 
     @Before
     public void setUp()
@@ -110,6 +109,8 @@ public abstract class AbstractRepositoryPurgeTest
     {
         super.setUp();
 
+        removeMavenIndexes();
+
         listenerControl = MockControl.createControl( RepositoryListener.class );
 
         listener = (RepositoryListener) listenerControl.getMock();
@@ -118,10 +119,8 @@ public abstract class AbstractRepositoryPurgeTest
         metadataRepository = mock( MetadataRepository.class );
         when( repositorySession.getRepository() ).thenReturn( metadataRepository );
 
-        previousArchivaConfiguration = ( (DefaultManagedRepositoryAdmin) applicationContext.getBean(
-            ManagedRepositoryAdmin.class ) ).getArchivaConfiguration();
 
-        removeMavenIndexes();
+
     }
 
     @After

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 514c381cbdbd6b65c5dacb058fa94f7670901160..5c71846879a79f55c13da9025115704b2a6069f5 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
@@ -85,6 +85,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest
 
         ( (DefaultManagedRepositoryAdmin) applicationContext.getBean(
             ManagedRepositoryAdmin.class ) ).setArchivaConfiguration( archivaConfiguration );
+        removeMavenIndexes();
     }
 
     @Test