Author: brett
Date: Tue Jun 21 19:05:55 2005
New Revision: 191750
URL: http://svn.apache.org/viewcvs?rev=191750&view=rev
Log:
add artifact scope tests
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=191750&r1=191749&r2=191750&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 Jun 21 19:05:55 2005
@@ -109,6 +109,57 @@
res.getArtifacts() );
}
+ public void testResolveCompileScopeOverTestScope()
+ throws ArtifactResolutionException
+ {
+ ArtifactSpec a = createArtifact( "a", "1.0" );
+ ArtifactSpec b = a.addDependency( "b", "1.0" );
+ ArtifactSpec c = a.addDependency( "c", "3.0", Artifact.SCOPE_TEST );
+
+ b.addDependency( "c", "2.0", Artifact.SCOPE_COMPILE );
+
+ Artifact modifiedC = createArtifact( "c", "3.0",
Artifact.SCOPE_COMPILE ).artifact;
+
+ ArtifactResolutionResult res = collect( a );
+ assertEquals( "Check artifact list",
+ new HashSet( Arrays.asList( new Object[]{a.artifact,
b.artifact, modifiedC} ) ),
+ res.getArtifacts() );
+ }
+
+ public void testResolveRuntimeScopeOverTestScope()
+ throws ArtifactResolutionException
+ {
+ ArtifactSpec a = createArtifact( "a", "1.0" );
+ ArtifactSpec b = a.addDependency( "b", "1.0" );
+ ArtifactSpec c = a.addDependency( "c", "3.0", Artifact.SCOPE_TEST );
+
+ b.addDependency( "c", "2.0", Artifact.SCOPE_RUNTIME );
+
+ Artifact modifiedC = createArtifact( "c", "3.0",
Artifact.SCOPE_RUNTIME ).artifact;
+
+ ArtifactResolutionResult res = collect( a );
+ assertEquals( "Check artifact list",
+ new HashSet( Arrays.asList( new Object[]{a.artifact,
b.artifact, modifiedC} ) ),
+ res.getArtifacts() );
+ }
+
+ public void testResolveCompileScopeOverRuntimeScope()
+ throws ArtifactResolutionException
+ {
+ ArtifactSpec a = createArtifact( "a", "1.0" );
+ ArtifactSpec b = a.addDependency( "b", "1.0" );
+ ArtifactSpec c = a.addDependency( "c", "3.0", Artifact.SCOPE_RUNTIME );
+
+ b.addDependency( "c", "2.0", Artifact.SCOPE_COMPILE );
+
+ Artifact modifiedC = createArtifact( "c", "3.0",
Artifact.SCOPE_COMPILE ).artifact;
+
+ ArtifactResolutionResult res = collect( a );
+ assertEquals( "Check artifact list",
+ new HashSet( Arrays.asList( new Object[]{a.artifact,
b.artifact, modifiedC} ) ),
+ res.getArtifacts() );
+ }
+
private ArtifactResolutionResult collect( ArtifactSpec a )
throws ArtifactResolutionException
{
@@ -118,8 +169,13 @@
private ArtifactSpec createArtifact( String id, String version )
{
+ return createArtifact( id, version, null );
+ }
+
+ private ArtifactSpec createArtifact( String id, String version, String
scope )
+ {
ArtifactSpec spec = new ArtifactSpec();
- spec.artifact = artifactFactory.createArtifact( "test", id, version,
null, "jar" );
+ spec.artifact = artifactFactory.createArtifact( "test", id, version,
scope, "jar" );
source.artifacts.put( spec.artifact.getId(), spec );
return spec;
}
@@ -132,7 +188,12 @@
public ArtifactSpec addDependency( String id, String version )
{
- ArtifactSpec dep = createArtifact( id, version );
+ return addDependency( id, version, null );
+ }
+
+ public ArtifactSpec addDependency( String id, String version, String
scope )
+ {
+ ArtifactSpec dep = createArtifact( id, version, scope );
dependencies.add( dep.artifact );
return dep;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
