You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/01/21 06:22:13 UTC
svn commit: r736220 - in /maven/mercury/trunk:
mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
Author: ogusakov
Date: Tue Jan 20 21:22:11 2009
New Revision: 736220
URL: http://svn.apache.org/viewvc?rev=736220&view=rev
Log:
[MERCURY-72] - added another no metadata test to ITs
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=736220&r1=736219&r2=736220&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Tue Jan 20 21:22:11 2009
@@ -202,6 +202,23 @@
assertTrue( pomBytes.length > 10 );
}
//-------------------------------------------------------------------------------------
+ public void testReadNonExistent()
+ {
+ ArtifactMetadata bmd = new ArtifactMetadata( "does.not:exist:1.0" );
+
+ Collection<Artifact> res = null;
+ try
+ {
+ res = pm.read( repos, bmd );
+ }
+ catch ( RepositoryException e )
+ {
+ fail( "reading non-existent artifact should not raise an exception, got "+e.getMessage() );
+ }
+
+ assertNull( res );
+ }
+ //-------------------------------------------------------------------------------------
public void testResolve()
throws Exception
{
Modified: maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=736220&r1=736219&r2=736220&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java Tue Jan 20 21:22:11 2009
@@ -47,7 +47,6 @@
import org.apache.maven.mercury.metadata.DependencyBuilder;
import org.apache.maven.mercury.metadata.DependencyBuilderFactory;
import org.apache.maven.mercury.metadata.MetadataTreeException;
-import org.apache.maven.mercury.metadata.MetadataTreeNode;
import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
import org.apache.maven.mercury.repository.api.ArtifactResults;
import org.apache.maven.mercury.repository.api.Repository;
@@ -223,12 +222,13 @@
VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
ArtifactResults ar = vr.readArtifacts( artifacts );
- if( ar == null || ar.hasExceptions() )
- throw new RepositoryException( ar == null ? "null result" : ar.getExceptions().toString() );
- if( !ar.hasResults() )
+ if( ar == null || !ar.hasResults() )
return null;
-
+
+ if( ar.hasExceptions() )
+ throw new RepositoryException( ar.getExceptions().toString() );
+
Map<ArtifactBasicMetadata, List<Artifact>> am = ar.getResults();
List<Artifact> al = new ArrayList<Artifact>();
@@ -238,6 +238,7 @@
return al;
}
+
public List<Artifact> read( List<Repository> repo, ArtifactMetadata... artifacts )
throws RepositoryException
{
@@ -275,7 +276,6 @@
throws RepositoryException
{
return resolve( repos, scope, new ArtifactQueryList( metadata ), null, null );
-
}
//---------------------------------------------------------------