svn commit: r1204866 - in /archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy: AbstractProxyTestCase.java MetadataTransferTest.java

[olamy]

Author: olamy
Date: Tue Nov 22 09:06:06 2011
New Revision: 1204866

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

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java?rev=1204866&r1=1204865&r2=1204866&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
 Tue Nov 22 09:06:06 2011
@@ -164,7 +164,9 @@ public abstract class AbstractProxyTestC
             ManagedRepositoryAdmin.class ) ).setArchivaConfiguration( config );
 
         applicationContext.getBean( ManagedRepositoryAdmin.class 
).addManagedRepository( repoConfig, false, null );
-        //config.getConfiguration().addManagedRepository( repoConfig );
+
+        // to prevent windauze file leaking
+        removeMavenIndexes();
 
         // Setup source repository (using legacy layout)
         repoLocation = new File( REPOPATH_LEGACY_MANAGED_TARGET );
@@ -219,6 +221,13 @@ public abstract class AbstractProxyTestC
     public void shutdown()
         throws Exception
     {
+       removeMavenIndexes();
+    }
+
+
+    protected void removeMavenIndexes()
+        throws Exception
+    {
         NexusIndexer nexusIndexer = plexusSisuBridge.lookup( 
NexusIndexer.class );
 
         for ( IndexingContext indexingContext : 
nexusIndexer.getIndexingContexts().values() )

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java?rev=1204866&r1=1204865&r2=1204866&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
 Tue Nov 22 09:06:06 2011
@@ -103,13 +103,6 @@ public class MetadataTransferTest
     @Named(value = "metadataTools#mocked")
     private MetadataTools metadataTools;
 
-    @Before
-    public void init()
-        throws Exception
-    {
-        super.setUp();
-        //metadataTools = applicationContext.getBean( MetadataTools.class );
-    }
 
     @Test
     public void testGetProjectMetadataProxiedNotLocalOnRemoteConnectoDisabled()