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

[be...@apache.org]

Author: bentmann
Date: Thu Jun 11 14:49:04 2009
New Revision: 783805

URL: http://svn.apache.org/viewvc?rev=783805&view=rev
Log:
o Updated IT to account for effective model being populated with lifecycle-induced plugins in 3.x

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

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java?rev=783805&r1=783804&r2=783805&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java Thu Jun 11 14:49:04 2009
@@ -105,7 +105,11 @@
         assertPathEquals( basedir, "target/site", props.getProperty( "project.reporting.outputDirectory" ) );
         assertEquals( "false", props.getProperty( "project.reporting.excludeDefaults" ) );
         assertTrue( Integer.parseInt( props.getProperty( "project.repositories" ) ) > 0 );
-        assertEquals( "1", props.getProperty( "project.build.plugins" ) );
+        if ( matchesVersionRange( "(,3.0-alpha-3)" ) )
+        {
+            // 3.x will provide the lifecycle bindings in the effective model, don't count these
+            assertEquals( "1", props.getProperty( "project.build.plugins" ) );
+        }
         assertMissing( props, "project.dependencies." );
         assertMissing( props, "project.dependencyManagement." );
 
@@ -167,7 +171,11 @@
             assertEquals( "true", props.getProperty( "project.reporting.excludeDefaults" ) );
         }
         assertTrue( Integer.parseInt( props.getProperty( "project.repositories" ) ) > 1 );
-        assertEquals( "1", props.getProperty( "project.build.plugins" ) );
+        if ( matchesVersionRange( "(,3.0-alpha-3)" ) )
+        {
+            // 3.x will provide the lifecycle bindings in the effective model, don't count these
+            assertEquals( "1", props.getProperty( "project.build.plugins" ) );
+        }
         assertEquals( "1", props.getProperty( "project.dependencies" ) );
         assertEquals( "parent-dep-b", props.getProperty( "project.dependencies.0.artifactId" ) );
         assertEquals( "1", props.getProperty( "project.dependencyManagement.dependencies" ) );
@@ -223,8 +231,9 @@
         assertPathEquals( basedir, "docs", props.getProperty( "project.reporting.outputDirectory" ) );
         assertEquals( "false", props.getProperty( "project.reporting.excludeDefaults" ) );
         assertTrue( Integer.parseInt( props.getProperty( "project.repositories" ) ) > 1 );
-        if ( matchesVersionRange( "(2.0.4,)" ) )
+        if ( matchesVersionRange( "(2.0.4,3.0-alpha-3)" ) )
         {
+            // 3.x will provide the lifecycle bindings in the effective model, don't count these
             assertEquals( "1", props.getProperty( "project.build.plugins" ) );
         }
         assertEquals( "4", props.getProperty( "project.dependencies" ) );