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/02/13 23:22:29 UTC

svn commit: r744264 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java resources/mng-0522/pom.xml

Author: bentmann
Date: Fri Feb 13 22:22:29 2009
New Revision: 744264

URL: http://svn.apache.org/viewvc?rev=744264&view=rev
Log:
o Strengthened IT to check both implicitly and explicitly bound plugins

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0522/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java?rev=744264&r1=744263&r2=744264&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java Fri Feb 13 22:22:29 2009
@@ -42,14 +42,15 @@
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0522" );
 
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        Verifier verifier = new Verifier( new File( testDir, "child-project" ).getAbsolutePath() );
         verifier.setAutoclean( false );
-        verifier.deleteDirectory( "child-project/target" );
-        verifier.executeGoal( "initialize" );
+        verifier.deleteDirectory( "target" );
+        verifier.executeGoal( "process-resources" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        verifier.assertFilePresent( "child-project/target/plugin-mngt-config.txt" );
+        verifier.assertFilePresent( "target/plugin-mngt-config-1.txt" );
+        verifier.assertFilePresent( "target/plugin-mngt-config-2.txt" );
     }
 
 }

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0522/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0522/pom.xml?rev=744264&r1=744263&r2=744264&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0522/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0522/pom.xml Fri Feb 13 22:22:29 2009
@@ -27,7 +27,7 @@
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Maven Integration Test :: MNG-522</name> 
+  <name>Maven Integration Test :: MNG-522</name>
   <description>Test for pluginManagement injection of plugin configuration.</description>
 
   <modules>
@@ -38,11 +38,21 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <!-- this checks handling of a plugin which is implicitly bound to the lifecycle -->
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>0.1-stub-SNAPSHOT</version>
+          <configuration>
+            <pathname>target/plugin-mngt-config-1.txt</pathname>
+          </configuration>
+        </plugin>
+        <plugin>
+          <!-- this checks handling of a plugin which is explicitly bound to the lifecycle -->
           <groupId>org.apache.maven.its.plugins</groupId>
           <artifactId>maven-it-plugin-log-file</artifactId>
           <version>2.1-SNAPSHOT</version>
           <configuration>
-            <logFile>target/plugin-mngt-config.txt</logFile>
+            <logFile>target/plugin-mngt-config-2.txt</logFile>
           </configuration>
         </plugin>
       </plugins>