You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2007/07/13 17:54:39 UTC
svn commit: r556047 -
/maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyTreeBuilderTest.java
Author: markh
Date: Fri Jul 13 08:54:39 2007
New Revision: 556047
URL: http://svn.apache.org/viewvc?view=rev&rev=556047
Log:
o Changed commented-out testProjectWithConflictDependencyScope to the behaviour Maven appears to exhibit - real expected outcome is still preserved in comments
o Added commented-out testProjectWithConflictDependencyScopeReversedOrder to fix corrected NPE - cannot uncomment since Maven's internal resolution tree is contradictory to the events it fires
Modified:
maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyTreeBuilderTest.java
Modified: maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyTreeBuilderTest.java?view=diff&rev=556047&r1=556046&r2=556047
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyTreeBuilderTest.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyTreeBuilderTest.java Fri Jul 13 08:54:39 2007
@@ -227,15 +227,57 @@
MavenProject project = createProject( projectArtifact, new Artifact[] { childArtifact } );
+ // TODO: i would have expected this..
+// DependencyNode expectedRootNode = createNode( "g:p:t:1" );
+// DependencyNode childArtifactNode = createNode( "g:a:t:1" );
+// expectedRootNode.addChild( childArtifactNode );
+// DependencyNode nearestArtifactNode = createNode( "g:c:t:1:compile" );
+// nearestArtifactNode.setOriginalScope( "test" );
+// childArtifactNode.addChild( nearestArtifactNode );
+// DependencyNode grandchildArtifactNode = createNode( "g:b:t:1" );
+// childArtifactNode.addChild( grandchildArtifactNode );
+// grandchildArtifactNode.addChild( createNode( "g:c:t:1:compile", DependencyNode.OMITTED_FOR_DUPLICATE, nearestArtifactNode.getArtifact() ) );
+
DependencyNode expectedRootNode = createNode( "g:p:t:1" );
DependencyNode childArtifactNode = createNode( "g:a:t:1" );
expectedRootNode.addChild( childArtifactNode );
- DependencyNode nearestArtifactNode = createNode( "g:c:t:1:compile" );
+ DependencyNode farthestArtifactNode = createNode( "g:c:t:1:compile" );
+ DependencyNode nearestArtifactNode = createNode( "g:c:t:1:compile", DependencyNode.OMITTED_FOR_DUPLICATE, farthestArtifactNode.getArtifact() );
nearestArtifactNode.setOriginalScope( "test" );
childArtifactNode.addChild( nearestArtifactNode );
DependencyNode grandchildArtifactNode = createNode( "g:b:t:1" );
childArtifactNode.addChild( grandchildArtifactNode );
- grandchildArtifactNode.addChild( createNode( "g:c:t:1:compile", DependencyNode.OMITTED_FOR_DUPLICATE, nearestArtifactNode.getArtifact() ) );
+ grandchildArtifactNode.addChild( farthestArtifactNode );
+
+ assertDependencyTree( expectedRootNode, project );
+ }
+ */
+
+ // TODO: fix when discussion resolved: http://www.mail-archive.com/dev@maven.apache.org/msg68011.html
+ /*
+ public void testProjectWithConflictDependencyScopeReversedOrder() throws DependencyTreeBuilderException, ArtifactResolutionException
+ {
+ Artifact projectArtifact = createArtifact( "g:p:t:1" );
+ Artifact childArtifact = createArtifact( "g:a:t:1" );
+ Artifact nearestArtifact = createArtifact( "g:c:t:1:test" );
+ Artifact grandchildArtifact = createArtifact( "g:b:t:1" );
+ Artifact farthestArtifact = createArtifact( "g:c:t:1:compile" );
+ addArtifactMetadata( childArtifact, new Artifact[] { grandchildArtifact, nearestArtifact } );
+ addArtifactMetadata( grandchildArtifact, farthestArtifact );
+
+ MavenProject project = createProject( projectArtifact, new Artifact[] { childArtifact } );
+
+ // TODO: add expected results as per above test method
+ DependencyNode expectedRootNode = createNode( "g:p:t:1" );
+ DependencyNode childArtifactNode = createNode( "g:a:t:1" );
+ expectedRootNode.addChild( childArtifactNode );
+ DependencyNode grandchildArtifactNode = createNode( "g:b:t:1" );
+ childArtifactNode.addChild( grandchildArtifactNode );
+ DependencyNode farthestArtifactNode = createNode( "g:c:t:1:compile" );
+ grandchildArtifactNode.addChild( farthestArtifactNode );
+ DependencyNode nearestArtifactNode = createNode( "g:c:t:1:compile", DependencyNode.OMITTED_FOR_DUPLICATE, farthestArtifactNode.getArtifact() );
+ nearestArtifactNode.setOriginalScope( "test" );
+ childArtifactNode.addChild( nearestArtifactNode );
assertDependencyTree( expectedRootNode, project );
}