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:44:58 UTC
svn commit: r556040 - in /maven/shared/trunk/maven-dependency-tree/src:
main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java
test/java/org/apache/maven/shared/dependency/tree/DependencyNodeTest.java
Author: markh
Date: Fri Jul 13 08:44:56 2007
New Revision: 556040
URL: http://svn.apache.org/viewvc?view=rev&rev=556040
Log:
Added support for node changes in DependencyNode.toNodeString for all node states
Modified:
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java
maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyNodeTest.java
Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java?view=diff&rev=556040&r1=556039&r2=556040
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java Fri Jul 13 08:44:56 2007
@@ -629,48 +629,49 @@
}
buffer.append( artifact );
+
+ ItemAppender appender = new ItemAppender( buffer, included ? " (" : " - ", "; ", included ? ")" : "" );
+ if ( getPremanagedVersion() != null )
+ {
+ appender.append( "version managed from ", getPremanagedVersion() );
+ }
+
+ if ( getPremanagedScope() != null )
+ {
+ appender.append( "scope managed from ", getPremanagedScope() );
+ }
+
+ if ( getOriginalScope() != null )
+ {
+ appender.append( "scope updated from ", getOriginalScope() );
+ }
+
+ if ( getFailedUpdateScope() != null )
+ {
+ appender.append( "scope not updated to ", getFailedUpdateScope() );
+ }
+
switch ( state )
{
case INCLUDED:
- ItemAppender appender = new ItemAppender( buffer, " (", "; ", ")" );
-
- if ( getPremanagedVersion() != null )
- {
- appender.append( "version managed from ", getPremanagedVersion() );
- }
-
- if ( getPremanagedScope() != null )
- {
- appender.append( "scope managed from ", getPremanagedScope() );
- }
-
- if ( getOriginalScope() != null )
- {
- appender.append( "scope updated from ", getOriginalScope() );
- }
-
- if ( getFailedUpdateScope() != null )
- {
- appender.append( "scope not updated to ", getFailedUpdateScope() );
- }
-
- appender.flush();
break;
case OMITTED_FOR_DUPLICATE:
- buffer.append( " - omitted for duplicate" );
+ appender.append( "omitted for duplicate" );
break;
case OMITTED_FOR_CONFLICT:
- buffer.append( " - omitted for conflict with " ).append( relatedArtifact.getVersion() );
+ appender.append( "omitted for conflict with ", relatedArtifact.getVersion() );
break;
case OMITTED_FOR_CYCLE:
- buffer.append( " - omitted for cycle" );
+ appender.append( "omitted for cycle" );
break;
}
-
+
+ appender.flush();
+
if ( !included )
{
buffer.append( ')' );
Modified: maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyNodeTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyNodeTest.java?view=diff&rev=556040&r1=556039&r2=556040
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyNodeTest.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/test/java/org/apache/maven/shared/dependency/tree/DependencyNodeTest.java Fri Jul 13 08:44:56 2007
@@ -96,9 +96,57 @@
assertFalse( it.hasNext() );
}
- public void testToNodeString()
+ public void testToNodeStringIncluded()
{
- assertEquals( "groupId1:artifactId1:jar:1:compile", node1.toNodeString() );
+ Artifact artifact = createArtifact( "g:a:t:1:s" );
+ DependencyNode node = new DependencyNode( artifact );
+
+ assertEquals( "g:a:t:1:s", node.toNodeString() );
+ }
+
+ public void testToNodeStringIncludedWithUpdatedScope()
+ {
+ Artifact artifact = createArtifact( "g:a:t:1:s" );
+ DependencyNode node = new DependencyNode( artifact );
+ node.setOriginalScope( "x" );
+
+ assertEquals( "g:a:t:1:s (scope updated from x)", node.toNodeString() );
+ }
+
+ public void testToNodeStringOmittedForDuplicate()
+ {
+ Artifact artifact = createArtifact( "g:a:t:1:s" );
+ Artifact duplicateArtifact = createArtifact( "g:a:t:1:s" );
+ DependencyNode node = new DependencyNode( artifact, DependencyNode.OMITTED_FOR_DUPLICATE, duplicateArtifact );
+
+ assertEquals( "(g:a:t:1:s - omitted for duplicate)", node.toNodeString() );
+ }
+
+ public void testToNodeStringOmittedForDuplicateWithUpdatedScope()
+ {
+ Artifact artifact = createArtifact( "g:a:t:1:s" );
+ Artifact duplicateArtifact = createArtifact( "g:a:t:1:s" );
+ DependencyNode node = new DependencyNode( artifact, DependencyNode.OMITTED_FOR_DUPLICATE, duplicateArtifact );
+ node.setOriginalScope( "x" );
+
+ assertEquals( "(g:a:t:1:s - scope updated from x; omitted for duplicate)", node.toNodeString() );
+ }
+
+ public void testToNodeStringOmittedForConflict()
+ {
+ Artifact artifact = createArtifact( "g:a:t:1:s" );
+ Artifact conflictArtifact = createArtifact( "g:a:t:2:s" );
+ DependencyNode node = new DependencyNode(artifact, DependencyNode.OMITTED_FOR_CONFLICT, conflictArtifact);
+
+ assertEquals( "(g:a:t:1:s - omitted for conflict with 2)", node.toNodeString() );
+ }
+
+ public void testToNodeStringOmittedForCycle()
+ {
+ Artifact artifact = createArtifact( "g:a:t:1:s" );
+ DependencyNode node = new DependencyNode(artifact, DependencyNode.OMITTED_FOR_CYCLE);
+
+ assertEquals( "(g:a:t:1:s - omitted for cycle)", node.toNodeString() );
}
public void testToString()