From 67af3bcb6a88f68c511c327ea534b5dcbd8cfdd0 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 28 May 2011 22:14:57 +0000 Subject: [PATCH] cleanup configuration before test git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128783 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/archiva/proxy/MetadataTransferTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java index 5450774e3..09a6de673 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java @@ -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( ) ); + 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( ) ); // Configure Connector (usually done within archiva.xml configuration) saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED1, ChecksumPolicy.FIX, ReleasesPolicy.ALWAYS, SnapshotsPolicy.ALWAYS, CachedFailuresPolicy.NO, false ); -- 2.39.5