You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/03/06 04:49:28 UTC

svn commit: r634145 - /maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java

Author: brett
Date: Wed Mar  5 19:49:27 2008
New Revision: 634145

URL: http://svn.apache.org/viewvc?rev=634145&view=rev
Log:
[MNG-1914] use the correct repository definition in errors if you use mirrors

Modified:
    maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java

Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=634145&r1=634144&r2=634145&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java Wed Mar  5 19:49:27 2008
@@ -21,6 +21,7 @@
 
 import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.metadata.ResolutionGroup;
@@ -214,7 +215,32 @@
         }
         catch ( ArtifactNotFoundException expected )
         {
-            assertTrue( true );
+            List repos = expected.getRemoteRepositories();
+            assertEquals( 1, repos.size() );
+            assertEquals( "test", ( (ArtifactRepository) repos.get( 0 ) ).getId() );
+        }
+    }
+
+    public void testResolutionFailureWhenArtifactNotPresentInRemoteRepositoryWithMirrors()
+        throws Exception
+    {
+        ArtifactRepository repository = remoteRepository();
+
+        WagonManager wagonManager = (WagonManager) lookup( WagonManager.ROLE );
+        wagonManager.addMirror( "mirror", "test", repository.getUrl() );
+
+        Artifact k = createArtifact( "k", "1.0" );
+
+        try
+        {
+            artifactResolver.resolve( k, Collections.singletonList( repository ), localRepository() );
+            fail( "Resolution succeeded when it should have failed" );
+        }
+        catch ( ArtifactNotFoundException expected )
+        {
+            List repos = expected.getRemoteRepositories();
+            assertEquals( 1, repos.size() );
+            assertEquals( "mirror", ( (ArtifactRepository) repos.get( 0 ) ).getId() );
         }
     }