From c6db5dad33e4e93a5eb48cdc0c6ef47f1b625266 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 22 Nov 2011 09:06:06 +0000 Subject: [PATCH] an other try to prevent windauze file leak git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1204866 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/archiva/proxy/AbstractProxyTestCase.java | 11 ++++++++++- .../apache/archiva/proxy/MetadataTransferTest.java | 7 ------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java index bd51f350d..14ed55352 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java @@ -164,7 +164,9 @@ public abstract class AbstractProxyTestCase 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 ); @@ -218,6 +220,13 @@ public abstract class AbstractProxyTestCase @After public void shutdown() throws Exception + { + removeMavenIndexes(); + } + + + protected void removeMavenIndexes() + throws Exception { NexusIndexer nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class ); diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java index dc2fbf449..928b669e1 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java @@ -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() -- 2.39.5