You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/29 00:14:57 UTC
svn commit: r1128783 -
/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
Author: olamy
Date: Sat May 28 22:14:57 2011
New Revision: 1128783
URL: http://svn.apache.org/viewvc?rev=1128783&view=rev
Log:
cleanup configuration before test
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java?rev=1128783&r1=1128782&r2=1128783&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MetadataTransferTest.java Sat May 28 22:14:57 2011
@@ -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 );