svn commit: r219834 - /maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java

[brett]

Author: brett
Date: Tue Jul 19 19:30:52 2005
New Revision: 219834

URL: http://svn.apache.org/viewcvs?rev=219834&view=rev
Log:
PR: MNG-505
prepare for version ranges in the artifact collector

Modified:
    
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java

Modified: 
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=219834&r1=219833&r2=219834&view=diff
==============================================================================
--- 
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
 (original)
+++ 
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
 Tue Jul 19 19:30:52 2005
@@ -24,6 +24,8 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
+import 
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.VersionRange;
 import org.codehaus.plexus.PlexusTestCase;
 
 import java.util.Arrays;
@@ -313,9 +315,9 @@
 
     private class ArtifactSpec
     {
-        Artifact artifact;
+        private Artifact artifact;
 
-        Set dependencies = new HashSet();
+        private Set dependencies = new HashSet();
 
         public ArtifactSpec addDependency( String id, String version )
         {
@@ -338,18 +340,27 @@
     private class Source
         implements ArtifactMetadataSource
     {
-        Map artifacts = new HashMap();
+        private Map artifacts = new HashMap();
 
-        public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository 
localRepository, List remoteRepositories )
+        public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository 
localRepository,
+                                         List remoteRepositories )
             throws ArtifactMetadataRetrievalException
         {
             ArtifactSpec a = (ArtifactSpec) artifacts.get( artifact.getId() );
-            return new ResolutionGroup( createArtifacts( artifactFactory, 
a.dependencies, artifact.getScope(),
-                                    artifact.getDependencyFilter() ), 
Collections.EMPTY_LIST );
+            try
+            {
+                return new ResolutionGroup( createArtifacts( artifactFactory, 
a.dependencies, artifact.getScope(),
+                                                             
artifact.getDependencyFilter() ), Collections.EMPTY_LIST );
+            }
+            catch ( InvalidVersionSpecificationException e )
+            {
+                throw new ArtifactMetadataRetrievalException( e );
+            }
         }
 
         private Set createArtifacts( ArtifactFactory artifactFactory, Set 
dependencies, String inheritedScope,
                                      ArtifactFilter dependencyFilter )
+            throws InvalidVersionSpecificationException
         {
             Set projectArtifacts = new HashSet();
 
@@ -357,8 +368,10 @@
             {
                 Artifact d = (Artifact) i.next();
 
-                Artifact artifact = artifactFactory.createArtifact( 
d.getGroupId(), d.getArtifactId(), d.getVersion(),
-                                                                    
d.getScope(), d.getType(), inheritedScope );
+                VersionRange versionRange = 
VersionRange.createFromVersionSpec( d.getVersion() );
+                Artifact artifact = artifactFactory.createDependencyArtifact( 
d.getGroupId(), d.getArtifactId(),
+                                                                              
versionRange, d.getType(), d.getScope(),
+                                                                              
inheritedScope );
 
                 if ( artifact != null && ( dependencyFilter == null || 
dependencyFilter.include( artifact ) ) )
                 {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]