Author: jvanzyl
Date: Tue May 19 23:39:45 2009
New Revision: 776500
URL: http://svn.apache.org/viewvc?rev=776500&view=rev
Log:
o we can use the test metadata source that will be injected.
Modified:
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Modified:
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=776500&r1=776499&r2=776500&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Tue May 19 23:39:45 2009
@@ -63,10 +63,12 @@
}
@Override
- protected void tearDown() throws Exception {
- artifactFactory = null;
- projectArtifact = null;
- super.tearDown();
+ protected void tearDown()
+ throws Exception
+ {
+ artifactFactory = null;
+ projectArtifact = null;
+ super.tearDown();
}
@Override
@@ -109,59 +111,7 @@
Artifact h = createLocalArtifact( "h", "1.0" );
- ArtifactMetadataSource mds = new ArtifactMetadataSource()
- {
- public ResolutionGroup retrieve( Artifact artifact,
ArtifactRepository localRepository,
- List<ArtifactRepository>
remoteRepositories )
- throws ArtifactMetadataRetrievalException
- {
- Set dependencies = new HashSet();
-
- if ( "g".equals( artifact.getArtifactId() ) )
- {
- Artifact a = null;
- try
- {
- a = createArtifact( "org.apache.maven", "h", "1.0",
"jar" );
- dependencies.add( a );
- }
- catch ( Exception e )
- {
- throw new ArtifactMetadataRetrievalException( "Error
retrieving metadata", e, a );
- }
- }
-
- return new ResolutionGroup( artifact, dependencies,
remoteRepositories );
- }
-
- public List<ArtifactVersion> retrieveAvailableVersions( Artifact
artifact,
-
ArtifactRepository localRepository,
-
List<ArtifactRepository> remoteRepositories )
- throws ArtifactMetadataRetrievalException
- {
- throw new UnsupportedOperationException( "Cannot get available
versions in this test case" );
- }
-
- public List<ArtifactVersion>
retrieveAvailableVersionsFromDeploymentRepository(
-
Artifact artifact,
-
ArtifactRepository localRepository,
-
ArtifactRepository remoteRepository )
- throws ArtifactMetadataRetrievalException
- {
- throw new UnsupportedOperationException( "Cannot get available
versions in this test case" );
- }
-
- public Artifact retrieveRelocatedArtifact( Artifact artifact,
- ArtifactRepository
localRepository,
-
List<ArtifactRepository> remoteRepositories )
- throws ArtifactMetadataRetrievalException
- {
- return artifact;
- }
- };
-
- ArtifactResolutionResult result =
- artifactResolver.resolveTransitively( Collections.singleton( g ),
projectArtifact, remoteRepositories(), localRepository(), mds );
+ ArtifactResolutionResult result =
artifactResolver.resolveTransitively( Collections.singleton( g ),
projectArtifact, remoteRepositories(), localRepository(), null );
assertEquals( 3, result.getArtifacts().size() );
@@ -183,60 +133,7 @@
Artifact j = createRemoteArtifact( "j", "1.0-SNAPSHOT" );
deleteLocalArtifact( j );
- ArtifactMetadataSource mds = new ArtifactMetadataSource()
- {
- public ResolutionGroup retrieve( Artifact artifact,
ArtifactRepository localRepository,
- List<ArtifactRepository>
remoteRepositories )
- throws ArtifactMetadataRetrievalException
- {
- Set dependencies = new HashSet();
-
- if ( "i".equals( artifact.getArtifactId() ) )
- {
- Artifact a = null;
- try
- {
- a = createArtifact( "org.apache.maven", "j",
"1.0-SNAPSHOT", "jar" );
- dependencies.add( a );
- }
- catch ( Exception e )
- {
- throw new ArtifactMetadataRetrievalException( "Error
retrieving metadata", e, a );
- }
- }
-
- return new ResolutionGroup( artifact, dependencies,
remoteRepositories );
- }
-
- public List<ArtifactVersion> retrieveAvailableVersions( Artifact
artifact,
-
ArtifactRepository localRepository,
-
List<ArtifactRepository> remoteRepositories )
- throws ArtifactMetadataRetrievalException
- {
- throw new UnsupportedOperationException( "Cannot get available
versions in this test case" );
- }
-
- public List<ArtifactVersion>
retrieveAvailableVersionsFromDeploymentRepository(
-
Artifact artifact,
-
ArtifactRepository localRepository,
-
ArtifactRepository remoteRepository )
- throws ArtifactMetadataRetrievalException
- {
- throw new UnsupportedOperationException( "Cannot get available
versions in this test case" );
- }
-
- public Artifact retrieveRelocatedArtifact( Artifact artifact,
- ArtifactRepository
localRepository,
-
List<ArtifactRepository> remoteRepositories )
- throws ArtifactMetadataRetrievalException
- {
- return artifact;
- }
- };
-
- ArtifactResolutionResult result =
- artifactResolver.resolveTransitively( Collections.singleton( i ),
projectArtifact, remoteRepositories(),
- localRepository(), mds );
+ ArtifactResolutionResult result =
artifactResolver.resolveTransitively( Collections.singleton( i ),
projectArtifact, remoteRepositories(), localRepository(), null );
assertEquals( 3, result.getArtifacts().size() );
