svn commit: r928486 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java

[bentmann]

Author: bentmann
Date: Sun Mar 28 19:50:16 2010
New Revision: 928486

URL: http://svn.apache.org/viewvc?rev=928486&view=rev
Log:
[MNG-4005] Throw Validation Error if pom contains a dependency with two 
different versions

o Relaxed to warning for now to ease migration

Modified:
    
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java?rev=928486&r1=928485&r2=928486&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java
 Sun Mar 28 19:50:16 2010
@@ -23,8 +23,7 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -38,7 +37,7 @@ public class MavenITmng4005UniqueDepende
 
     public MavenITmng4005UniqueDependencyKeyTest()
     {
-        super( "[3.0-alpha-3,)" );
+        super( "[3.0-alpha-8,)" );
     }
 
     /**
@@ -85,20 +84,23 @@ public class MavenITmng4005UniqueDepende
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.deleteDirectory( "target" );
-        try
+        verifier.executeGoal( "validate" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        List lines = verifier.loadLines( verifier.getLogFileName(), "UTF-8" );
+        boolean foundWarning = false;
+        for ( Iterator it = lines.iterator(); it.hasNext(); )
         {
-            verifier.executeGoal( "validate" );
-            verifier.verifyErrorFreeLog();
-            fail( "Duplicate dependency did not cause validation error" );
-        }
-        catch ( VerificationException e )
-        {
-            // expected
-        }
-        finally
-        {
-            verifier.resetStreams();
+            String line = (String) it.next();
+            
+            if ( line.startsWith( "[WARNING]" ) && line.indexOf( "must be 
unique: junit:junit:jar" ) > 0 )
+            {
+                foundWarning = true;
+            }
         }
+        
+        assertTrue( "Duplicate dependency warning wasn't generated.", 
foundWarning );
     }
 
 }