Author: olamy
Date: Thu Oct 25 09:43:27 2012
New Revision: 1402054
URL: http://svn.apache.org/viewvc?rev=1402054&view=rev
Log:
fix unit test
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java?rev=1402054&r1=1402053&r2=1402054&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy-common/src/main/java/org/apache/archiva/proxy/common/WagonFactoryRequest.java
Thu Oct 25 09:43:27 2012
@@ -99,4 +99,38 @@ public class WagonFactoryRequest
this.userAgent = userAgent;
return this;
}
+
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( this == o )
+ {
+ return true;
+ }
+ if ( !( o instanceof WagonFactoryRequest ) )
+ {
+ return false;
+ }
+
+ WagonFactoryRequest that = (WagonFactoryRequest) o;
+
+ if ( protocol != null ? !protocol.equals( that.protocol ) :
that.protocol != null )
+ {
+ return false;
+ }
+ if ( userAgent != null ? !userAgent.equals( that.userAgent ) :
that.userAgent != null )
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = protocol != null ? protocol.hashCode() : 0;
+ result = 31 * result + ( userAgent != null ? userAgent.hashCode() : 0
);
+ return result;
+ }
}
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java?rev=1402054&r1=1402053&r2=1402054&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
Thu Oct 25 09:43:27 2012
@@ -242,8 +242,11 @@ public class RepositoryModelResolver
new WagonFactoryRequest( "wagon#" + protocol + "-ntlm",
remoteRepository.getExtraHeaders() ) )
: wagonFactory.getWagon(
new WagonFactoryRequest( "wagon#" + protocol,
remoteRepository.getExtraHeaders() ) );
- wagon = wagonFactory.getWagon(
- new WagonFactoryRequest( "wagon#" + protocol,
remoteRepository.getExtraHeaders() ) );
+ if ( wagon == null )
+ {
+ wagon = wagonFactory.getWagon(
+ new WagonFactoryRequest( "wagon#" + protocol,
remoteRepository.getExtraHeaders() ) );
+ }
if ( wagon == null )
{
throw new RuntimeException( "Unsupported remote repository
protocol: " + protocol );
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java?rev=1402054&r1=1402053&r2=1402054&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverMRM1411Test.java
Thu Oct 25 09:43:27 2012
@@ -51,6 +51,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import static org.mockito.Mockito.mock;
@@ -135,7 +136,8 @@ public class Maven2RepositoryMetadataRes
storage.setWagonFactory( wagonFactory );
Wagon wagon = new MockWagon();
- when( wagonFactory.getWagon( new WagonFactoryRequest().protocol(
"wagon#http" ) ) ).thenReturn( wagon );
+ when( wagonFactory.getWagon(
+ new WagonFactoryRequest( "wagon#http", new HashMap<String,
String>() ) ) ).thenReturn( wagon );
}
// Tests for MRM-1411 - START
@@ -244,9 +246,13 @@ public class Maven2RepositoryMetadataRes
public void testGetProjectVersionMetadataWithParentSnapshotVersion()
throws Exception
{
+
copyTestArtifactWithParent(
"target/test-classes/com/example/test/test-snapshot-artifact-module-a",
"target/test-repository/com/example/test/test-snapshot-artifact-module-a" );
+ //copyTestArtifactWithParent(
"target/test-classes/com/example/test/test-snapshot-artifact-root",
+ //
"target/test-repository/com/example/test/test-snapshot-artifact-root" );
+
ProjectVersionMetadata metadata = storage.readProjectVersionMetadata(
new ReadMetadataRequest( TEST_REPO_ID, "com.example.test",
"test-snapshot-artifact-module-a",
"1.1-SNAPSHOT" ) );
