Author: jdcasey
Date: Thu Oct 12 11:03:46 2006
New Revision: 463352
URL: http://svn.apache.org/viewvc?view=rev&rev=463352
Log:
Adding ability to create an ArtifactQuery from a Dependency, and changing the
exception thrown on createArtifact(..) to
InvalidArtifactspecificationException, to handle more error cases.
Modified:
maven/sandbox/maven-artifact-tools/pom.xml
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQuery.java
maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionTool.java
maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQueryTest.java
maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionToolTest.java
Modified: maven/sandbox/maven-artifact-tools/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/pom.xml?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
--- maven/sandbox/maven-artifact-tools/pom.xml (original)
+++ maven/sandbox/maven-artifact-tools/pom.xml Thu Oct 12 11:03:46 2006
@@ -1,6 +1,13 @@
<?xml version="1.0"?>
<project>
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-components</artifactId>
+ <version>3</version>
+ </parent>
+
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-tools</artifactId>
<name>Maven Artifact-Access Tools</name>
Modified:
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
Thu Oct 12 11:03:46 2006
@@ -1,10 +1,7 @@
package org.apache.maven.shared.artifact.tools.test.assembly.resolve;
-import java.util.Collections;
-
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.shared.artifact.tools.InvalidConfigurationException;
import
org.apache.maven.shared.artifact.tools.components.ComponentAccessException;
@@ -14,13 +11,16 @@
import org.apache.maven.shared.artifact.tools.resolve.ArtifactQuery;
import org.apache.maven.shared.artifact.tools.resolve.ArtifactResolutionResult;
import org.apache.maven.shared.artifact.tools.resolve.ArtifactResolutionTool;
+import
org.apache.maven.shared.artifact.tools.resolve.InvalidArtifactSpecificationException;
+
+import java.util.Collections;
public class Resolve
{
public ArtifactResolutionResult resolveJunitArtifact()
throws ComponentAccessException, InvalidConfigurationException,
ArtifactResolutionException,
- ArtifactNotFoundException, InvalidVersionSpecificationException,
ProjectBuildingException
+ ArtifactNotFoundException, InvalidArtifactSpecificationException,
ProjectBuildingException
{
MavenComponentAccess mca =
MavenComponentAccess.createSelfContainedInstance();
@@ -37,7 +37,7 @@
public ArtifactResolutionResult resolveJunitPom()
throws ComponentAccessException, InvalidConfigurationException,
ArtifactResolutionException,
- ArtifactNotFoundException, InvalidVersionSpecificationException,
ProjectBuildingException
+ ArtifactNotFoundException, InvalidArtifactSpecificationException,
ProjectBuildingException
{
MavenComponentAccess mca =
MavenComponentAccess.createSelfContainedInstance();
Modified:
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
Thu Oct 12 11:03:46 2006
@@ -2,10 +2,10 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.shared.artifact.tools.InvalidConfigurationException;
import
org.apache.maven.shared.artifact.tools.components.ComponentAccessException;
+import
org.apache.maven.shared.artifact.tools.resolve.InvalidArtifactSpecificationException;
import junit.framework.TestCase;
@@ -15,14 +15,14 @@
public void testResolveArtifact()
throws ArtifactResolutionException, ArtifactNotFoundException,
ComponentAccessException,
- InvalidConfigurationException, InvalidVersionSpecificationException,
ProjectBuildingException
+ InvalidConfigurationException, InvalidArtifactSpecificationException,
ProjectBuildingException
{
new Resolve().resolveJunitArtifact();
}
public void testResolvePom()
throws ArtifactResolutionException, ArtifactNotFoundException,
ComponentAccessException,
- InvalidConfigurationException, InvalidVersionSpecificationException,
ProjectBuildingException
+ InvalidConfigurationException, InvalidArtifactSpecificationException,
ProjectBuildingException
{
new Resolve().resolveJunitPom();
}
Modified:
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
Thu Oct 12 11:03:46 2006
@@ -1,10 +1,7 @@
package org.apache.maven.shared.artifact.tools.test.assembly.resolve;
-import java.util.Collections;
-
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.shared.artifact.tools.InvalidConfigurationException;
import
org.apache.maven.shared.artifact.tools.components.ComponentAccessException;
@@ -14,13 +11,16 @@
import org.apache.maven.shared.artifact.tools.resolve.ArtifactQuery;
import org.apache.maven.shared.artifact.tools.resolve.ArtifactResolutionResult;
import org.apache.maven.shared.artifact.tools.resolve.ArtifactResolutionTool;
+import
org.apache.maven.shared.artifact.tools.resolve.InvalidArtifactSpecificationException;
+
+import java.util.Collections;
public class Resolve
{
public ArtifactResolutionResult resolveJunitArtifact()
throws ComponentAccessException, InvalidConfigurationException,
ArtifactResolutionException,
- ArtifactNotFoundException, InvalidVersionSpecificationException,
ProjectBuildingException
+ ArtifactNotFoundException, InvalidArtifactSpecificationException,
ProjectBuildingException
{
MavenComponentAccess mca =
MavenComponentAccess.createSelfContainedInstance();
@@ -37,7 +37,7 @@
public ArtifactResolutionResult resolveJunitPom()
throws ComponentAccessException, InvalidConfigurationException,
ArtifactResolutionException,
- ArtifactNotFoundException, InvalidVersionSpecificationException,
ProjectBuildingException
+ ArtifactNotFoundException, InvalidArtifactSpecificationException,
ProjectBuildingException
{
MavenComponentAccess mca =
MavenComponentAccess.createSelfContainedInstance();
Modified:
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
Thu Oct 12 11:03:46 2006
@@ -2,10 +2,10 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.shared.artifact.tools.InvalidConfigurationException;
import
org.apache.maven.shared.artifact.tools.components.ComponentAccessException;
+import
org.apache.maven.shared.artifact.tools.resolve.InvalidArtifactSpecificationException;
import junit.framework.TestCase;
@@ -15,14 +15,14 @@
public void testResolveArtifact()
throws ArtifactResolutionException, ArtifactNotFoundException,
ComponentAccessException,
- InvalidConfigurationException, InvalidVersionSpecificationException,
ProjectBuildingException
+ InvalidConfigurationException, InvalidArtifactSpecificationException,
ProjectBuildingException
{
new Resolve().resolveJunitArtifact();
}
public void testResolvePom()
throws ArtifactResolutionException, ArtifactNotFoundException,
ComponentAccessException,
- InvalidConfigurationException, InvalidVersionSpecificationException,
ProjectBuildingException
+ InvalidConfigurationException, InvalidArtifactSpecificationException,
ProjectBuildingException
{
new Resolve().resolveJunitPom();
}
Modified:
maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQuery.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQuery.java?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQuery.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQuery.java
Thu Oct 12 11:03:46 2006
@@ -6,6 +6,9 @@
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.model.Dependency;
+
+import java.io.File;
public class ArtifactQuery
{
@@ -26,12 +29,40 @@
private boolean isOptional = false;
+ private File file;
+
public ArtifactQuery( String groupId, String artifactId )
{
this.groupId = groupId;
this.artifactId = artifactId;
}
+ public ArtifactQuery( Dependency dependency )
+ {
+ this.groupId = dependency.getGroupId();
+ this.artifactId = dependency.getArtifactId();
+ this.scope = dependency.getScope();
+ this.classifier = dependency.getClassifier();
+ this.isOptional = dependency.isOptional();
+ this.type = dependency.getType();
+
+ String version = dependency.getVersion();
+
+ if ( version.startsWith( "[" ) || version.startsWith( "(" ) )
+ {
+ this.versionRangeSpec = version;
+ }
+ else
+ {
+ this.version = version;
+ }
+
+ if ( Artifact.SCOPE_SYSTEM.equals( this.scope ) )
+ {
+ this.file = new File( dependency.getSystemPath() );
+ }
+ }
+
public ArtifactQuery copy()
{
ArtifactQuery query = new ArtifactQuery( groupId, artifactId );
@@ -42,6 +73,7 @@
query.versionRangeSpec = versionRangeSpec;
query.scope = scope;
query.isOptional = isOptional;
+ query.file = file;
return query;
}
@@ -87,7 +119,7 @@
}
public Artifact createArtifact( ArtifactHandlerManager
artifactHandlerManager )
- throws InvalidVersionSpecificationException
+ throws InvalidArtifactSpecificationException
{
ArtifactHandler artifactHandler =
artifactHandlerManager.getArtifactHandler( type );
@@ -95,7 +127,14 @@
if ( versionRangeSpec != null )
{
- versionRange = VersionRange.createFromVersionSpec(
versionRangeSpec );
+ try
+ {
+ versionRange = VersionRange.createFromVersionSpec(
versionRangeSpec );
+ }
+ catch ( InvalidVersionSpecificationException e )
+ {
+ throw new InvalidArtifactSpecificationException( "Artifact
query specifies invalid version range: " + versionRangeSpec, e );
+ }
}
else if ( version != null )
{
@@ -103,12 +142,24 @@
}
else
{
- throw new IllegalArgumentException(
- "Cannot create Artifact
instance from incomplete ArtifactQuery; please supply version or
versionRangeSpec." );
+ throw new InvalidArtifactSpecificationException( "Artifact query
is incomplete. Please supply version or versionRangeSpec." );
}
Artifact artifact = new DefaultArtifact( groupId, artifactId,
versionRange, scope, type, classifier,
artifactHandler, isOptional );
+
+ if ( Artifact.SCOPE_SYSTEM.equals( scope ) && file != null )
+ {
+ if ( file.exists() )
+ {
+ artifact.setFile( file );
+ artifact.setResolved( true );
+ }
+ else
+ {
+ throw new InvalidArtifactSpecificationException( "Artifact
query specifies system scope and path, but path does not exist." );
+ }
+ }
return artifact;
}
Modified:
maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionTool.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionTool.java?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionTool.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/main/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionTool.java
Thu Oct 12 11:03:46 2006
@@ -1,15 +1,11 @@
package org.apache.maven.shared.artifact.tools.resolve;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
@@ -17,6 +13,9 @@
import org.apache.maven.shared.artifact.tools.components.MavenComponentAccess;
import
org.apache.maven.shared.artifact.tools.repository.ArtifactRepositorySource;
+import java.util.Collections;
+import java.util.List;
+
/**
* Convenience API for resolving Artifacts and their associated POM metadata.
*/
@@ -36,7 +35,7 @@
}
public ArtifactResolutionResult resolve( ArtifactQuery query,
ArtifactRepositorySource repositorySource )
- throws InvalidVersionSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
+ throws InvalidArtifactSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
InvalidConfigurationException, ProjectBuildingException
{
Artifact artifact = query.createArtifact( artifactHandlerManager );
@@ -56,7 +55,7 @@
}
public ArtifactResolutionResult resolveProjectMetadata( ArtifactQuery
query, ArtifactRepositorySource repositorySource )
- throws InvalidVersionSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
+ throws InvalidArtifactSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
InvalidConfigurationException, ProjectBuildingException
{
ArtifactQuery pomQuery = query.copy();
Modified:
maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQueryTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQueryTest.java?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQueryTest.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactQueryTest.java
Thu Oct 12 11:03:46 2006
@@ -1,23 +1,111 @@
package org.apache.maven.shared.artifact.tools.resolve;
-import java.util.List;
-
-import junit.framework.TestCase;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.Restriction;
+import org.apache.maven.model.Dependency;
import org.apache.maven.shared.tools.easymock.MockManager;
import org.easymock.MockControl;
+import java.util.List;
+
+import junit.framework.TestCase;
+
public class ArtifactQueryTest
extends TestCase
{
+ public void testCreateQueryFromDependencyWithVersion()
+ throws InvalidArtifactSpecificationException
+ {
+ Dependency dep = new Dependency();
+
+ dep.setGroupId( "group" );
+ dep.setArtifactId( "artifact" );
+ dep.setVersion( "1.0" );
+
+ ArtifactQuery query = new ArtifactQuery( dep );
+
+ MockManager mm = new MockManager();
+
+ MockControl ctl = MockControl.createControl(
ArtifactHandlerManager.class );
+
+ mm.add( ctl );
+
+ ArtifactHandlerManager mgr = (ArtifactHandlerManager) ctl.getMock();
+
+ mgr.getArtifactHandler( "jar" );
+
+ MockControl handlerCtl = MockControl.createControl(
ArtifactHandler.class );
+
+ mm.add( handlerCtl );
+
+ ArtifactHandler handler = (ArtifactHandler) handlerCtl.getMock();
+
+ handler.getClassifier();
+ handlerCtl.setReturnValue( null );
+
+ ctl.setReturnValue( handler );
+
+ mm.replayAll();
+
+ Artifact artifact = query.createArtifact( mgr );
+
+ assertEquals( dep.getGroupId(), artifact.getGroupId() );
+ assertEquals( dep.getArtifactId(), artifact.getArtifactId() );
+ assertEquals( dep.getType(), artifact.getType() );
+ assertEquals( dep.getVersion(), artifact.getVersion() );
+
+ mm.verifyAll();
+ }
+
+ public void testCreateQueryFromDependencyWithVersionRange()
+ throws InvalidArtifactSpecificationException
+ {
+ Dependency dep = new Dependency();
+
+ dep.setGroupId( "group" );
+ dep.setArtifactId( "artifact" );
+ dep.setVersion( "[1.0,2.0)" );
+
+ ArtifactQuery query = new ArtifactQuery( dep );
+
+ MockManager mm = new MockManager();
+
+ MockControl ctl = MockControl.createControl(
ArtifactHandlerManager.class );
+
+ mm.add( ctl );
+
+ ArtifactHandlerManager mgr = (ArtifactHandlerManager) ctl.getMock();
+
+ mgr.getArtifactHandler( "jar" );
+
+ MockControl handlerCtl = MockControl.createControl(
ArtifactHandler.class );
+
+ mm.add( handlerCtl );
+
+ ArtifactHandler handler = (ArtifactHandler) handlerCtl.getMock();
+
+ handler.getClassifier();
+ handlerCtl.setReturnValue( null );
+
+ ctl.setReturnValue( handler );
+
+ mm.replayAll();
+
+ Artifact artifact = query.createArtifact( mgr );
+
+ assertEquals( dep.getGroupId(), artifact.getGroupId() );
+ assertEquals( dep.getArtifactId(), artifact.getArtifactId() );
+ assertEquals( dep.getType(), artifact.getType() );
+ assertEquals( dep.getVersion(), String.valueOf(
artifact.getVersionRange() ) );
+
+ mm.verifyAll();
+ }
+
public void testCreateArtifactWithVersionRange()
- throws InvalidVersionSpecificationException
+ throws InvalidArtifactSpecificationException
{
ArtifactQuery query = new ArtifactQuery( "group", "artifact" );
query.setVersionRangeSpec( "[2.0,2.1)" );
@@ -60,7 +148,7 @@
}
public void testCreateArtifactWithVersion()
- throws InvalidVersionSpecificationException
+ throws InvalidArtifactSpecificationException
{
ArtifactQuery query = new ArtifactQuery( "group", "artifact" );
query.setVersion( "2.0" );
@@ -96,7 +184,7 @@
}
public void testCopyWithVersionRange()
- throws InvalidVersionSpecificationException
+ throws InvalidArtifactSpecificationException
{
ArtifactQuery query = new ArtifactQuery( "group", "artifact" );
query.setVersionRangeSpec( "[2.0,2.1)" );
@@ -138,7 +226,7 @@
}
public void testCopyWithVersion()
- throws InvalidVersionSpecificationException
+ throws InvalidArtifactSpecificationException
{
ArtifactQuery query = new ArtifactQuery( "group", "artifact" );
query.setVersion( "2.0" );
Modified:
maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionToolTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionToolTest.java?view=diff&rev=463352&r1=463351&r2=463352
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionToolTest.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/test/java/org/apache/maven/shared/artifact/tools/resolve/ArtifactResolutionToolTest.java
Thu Oct 12 11:03:46 2006
@@ -1,15 +1,9 @@
package org.apache.maven.shared.artifact.tools.resolve;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
@@ -19,27 +13,32 @@
import org.apache.maven.shared.tools.easymock.MockManager;
import org.easymock.MockControl;
+import java.util.Collections;
+import java.util.List;
+
+import junit.framework.TestCase;
+
public class ArtifactResolutionToolTest
extends TestCase
{
public void testResolveArtifact()
- throws InvalidVersionSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
+ throws InvalidArtifactSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
InvalidConfigurationException, ProjectBuildingException
{
resolve( false );
}
public void testResolveProjectMetadata()
- throws InvalidVersionSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
+ throws InvalidArtifactSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
InvalidConfigurationException, ProjectBuildingException
{
resolve( true );
}
private void resolve( boolean resolveProjectOnly )
- throws InvalidVersionSpecificationException,
ArtifactResolutionException, ArtifactNotFoundException,
- InvalidConfigurationException, ProjectBuildingException
+ throws ArtifactResolutionException, ArtifactNotFoundException,
+ InvalidConfigurationException, ProjectBuildingException,
InvalidArtifactSpecificationException
{
String type = resolveProjectOnly ? "pom" : "jar";
