]> source.dussan.org Git - archiva.git/commitdiff
cleanup configuration before test
authorOlivier Lamy <olamy@apache.org>
Sat, 28 May 2011 22:14:57 +0000 (22:14 +0000)
committerOlivier Lamy <olamy@apache.org>
Sat, 28 May 2011 22:14:57 +0000 (22:14 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128783 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java

index 5450774e3dfc4482432fb34726e4fa2cfb009396..09a6de6736c3111b330c9e65eda385db422613f8 100644 (file)
@@ -21,6 +21,7 @@ package org.apache.maven.archiva.proxy;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.common.utils.VersionUtil;
+import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
 import org.apache.maven.archiva.model.Plugin;
 import org.apache.maven.archiva.model.ProjectReference;
@@ -42,6 +43,7 @@ import org.junit.Test;
 
 import java.io.File;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.Arrays;
 
 /**
@@ -198,10 +200,13 @@ public class MetadataTransferTest
     public void testGetProjectMetadataNotProxiedOnLocal()
         throws Exception
     {
+
         // Project metadata that exists and has multiple versions
         String requestedResource = "org/apache/maven/test/get-project-metadata/maven-metadata.xml";
         setupTestableManagedRepository( requestedResource );
 
+        config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
+
         assertResourceExists( requestedResource );
 
         // No proxy setup, nothing fetched from remote, but local exists.
@@ -321,10 +326,13 @@ public class MetadataTransferTest
     public void testGetProjectMetadataProxiedOnLocalNotRemote()
         throws Exception
     {
+
         // Project metadata that exist locally, and does not exist in remote repos.
         String requestedResource = "org/apache/maven/test/get-not-on-remotes/maven-metadata.xml";
         setupTestableManagedRepository( requestedResource );
 
+
+        config.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( ) );
         // Configure Connector (usually done within archiva.xml configuration)
         saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED1, ChecksumPolicy.FIX, ReleasesPolicy.ALWAYS,
                        SnapshotsPolicy.ALWAYS, CachedFailuresPolicy.NO, false );