svn commit: r671707 - in /maven/sandbox/trunk/mercury/src: main/java/org/apache/maven/mercury/metadata/MetadataTree.java test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java

[ogusakov]

Author: ogusakov
Date: Wed Jun 25 18:57:20 2008
New Revision: 671707

URL: http://svn.apache.org/viewvc?rev=671707&view=rev
Log:
fixed circular dependency test. Found circular dep. in pmd:pmd:3.9 ??? testing 
..

Modified:
    
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java
    
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java

Modified: 
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java?rev=671707&r1=671706&r2=671707&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java
 (original)
+++ 
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java
 Wed Jun 25 18:57:20 2008
@@ -117,10 +117,14 @@
   throws MetadataTreeException
   {
     MetadataTreeNode p = parent;
+    int count = 0;
     while( p != null )
     {
+      count++;
+System.out.println("circ "+md+" vs "+p.md);
       if( md.sameGA(p.md) )
-        throw new MetadataTreeException("circular dependency for " + md );
+        throw new MetadataTreeException("circular dependency "+count+" levels 
up for " + md + " as dependency of "+parent.md );
+      p = p.parent;
     }
   }
   //-----------------------------------------------------

Modified: 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java?rev=671707&r1=671706&r2=671707&view=diff
==============================================================================
--- 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java
 (original)
+++ 
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java
 Wed Jun 25 18:57:20 2008
@@ -13,8 +13,10 @@
 {
   private static final Log log = LogFactoryImpl.getLog( MetadataTreeTest.class 
);
   
-//ArtifactMetadata md = new ArtifactMetadata( "pmd:pmd:3.9" );
+//  ArtifactMetadata md = new ArtifactMetadata( "pmd:pmd:3.9" );
+//  File repo = new File("./target/test-classes/localRepo");
   ArtifactMetadata md = new ArtifactMetadata( "a:a:1" );
+  File repo = new File("./target/test-classes/controlledRepo");
   MetadataTree mt;
   MockMetadataSource mms = new MockMetadataSource();
 
@@ -29,7 +31,7 @@
           mms
         , null
         , null
-        , new DefaultLocalRepository( "local", null, new 
File("./target/test-classes/controlledRepo") )
+        , new DefaultLocalRepository( "local", null, repo )
         , null
                           );
   }