svn commit: r1204908 - in /archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository: AbstractRepositoryPurgeTest.java CleanupReleasedSnapshotsRepositoryPurgeTest.java

[olamy]

Author: olamy
Date: Tue Nov 22 10:43:47 2011
New Revision: 1204908

URL: http://svn.apache.org/viewvc?rev=1204908&view=rev
Log:
an other try to prevent windauze file leak

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java?rev=1204908&r1=1204907&r2=1204908&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
 Tue Nov 22 10:43:47 2011
@@ -102,7 +102,6 @@ public abstract class AbstractRepository
     @Inject
     protected PlexusSisuBridge plexusSisuBridge;
 
-    ArchivaConfiguration previousArchivaConfiguration;
 
     @Before
     public void setUp()
@@ -110,6 +109,8 @@ public abstract class AbstractRepository
     {
         super.setUp();
 
+        removeMavenIndexes();
+
         listenerControl = MockControl.createControl( RepositoryListener.class 
);
 
         listener = (RepositoryListener) listenerControl.getMock();
@@ -118,10 +119,8 @@ public abstract class AbstractRepository
         metadataRepository = mock( MetadataRepository.class );
         when( repositorySession.getRepository() ).thenReturn( 
metadataRepository );
 
-        previousArchivaConfiguration = ( (DefaultManagedRepositoryAdmin) 
applicationContext.getBean(
-            ManagedRepositoryAdmin.class ) ).getArchivaConfiguration();
 
-        removeMavenIndexes();
+
     }
 
     @After

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java?rev=1204908&r1=1204907&r2=1204908&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java
 Tue Nov 22 10:43:47 2011
@@ -85,6 +85,7 @@ public class CleanupReleasedSnapshotsRep
 
         ( (DefaultManagedRepositoryAdmin) applicationContext.getBean(
             ManagedRepositoryAdmin.class ) ).setArchivaConfiguration( 
archivaConfiguration );
+        removeMavenIndexes();
     }
 
     @Test