You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/05/25 13:02:02 UTC

svn commit: r778385 - /maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java

Author: bentmann
Date: Mon May 25 11:02:02 2009
New Revision: 778385

URL: http://svn.apache.org/viewvc?rev=778385&view=rev
Log:
o Fixed test to account for fixed handling of optional dependencies

Modified:
    maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java

Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java?rev=778385&r1=778384&r2=778385&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java Mon May 25 11:02:02 2009
@@ -65,14 +65,14 @@
         Set set = project1.getArtifacts();
         assertNotNull("No artifacts", set);
         assertTrue("No Artifacts", set.size() > 0);
-        assertTrue("Set size should be 4, is " + set.size(), set.size() == 4 );
+        assertTrue("Set size should be 3, is " + set.size(), set.size() == 3 );
 
         Iterator iter = set.iterator();
 
         while (iter.hasNext())
         {
             Artifact artifact = (Artifact)iter.next();
-            assertFalse("", artifact.getArtifactId().equals("maven-test-d"));
+            assertFalse( "", artifact.getArtifactId().equals( "t07-d" ) );
             System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Optional=" + (artifact.isOptional() ? "true" : "false"));
             assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
         }