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/08/25 15:29:03 UTC
svn commit: r807616 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3401/ resources/mng-3401/with-mgmt/
resources/mng-3401/without-mgmt/
Author: bentmann
Date: Tue Aug 25 13:29:03 2009
New Revision: 807616
URL: http://svn.apache.org/viewvc?rev=807616&view=rev
Log:
o Extended IT to check the case of using plugin management, too
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/with-mgmt/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/with-mgmt/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/without-mgmt/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml
- copied, changed from r807517, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/pom.xml
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java?rev=807616&r1=807615&r2=807616&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java Tue Aug 25 13:29:03 2009
@@ -41,12 +41,28 @@
/**
* Test that the configuration of an execution block with the id "default-cli" applies to direct CLI
- * invocations of a goal as well.
+ * invocations of a goal as well if the plugin is configured under build/plugins.
*/
- public void testitMNG3401()
+ public void testitWithoutPluginManagement()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3401" );
+ testit( "without-mgmt" );
+ }
+
+ /**
+ * Test that the configuration of an execution block with the id "default-cli" applies to direct CLI
+ * invocations of a goal as well if the plugin is configured under build/pluginManagement/plugins.
+ */
+ public void testitWithPluginManagement()
+ throws Exception
+ {
+ testit( "with-mgmt" );
+ }
+
+ private void testit( String project )
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3401/" + project );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/with-mgmt/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/with-mgmt/pom.xml?rev=807616&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/with-mgmt/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/with-mgmt/pom.xml Tue Aug 25 13:29:03 2009
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3401</groupId>
+ <artifactId>test</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3401</name>
+ <description>
+ Test that the configuration of an execution block with the id "default-cli" applies to direct CLI
+ invocations of a goal as well.
+ </description>
+
+ <build>
+ <!-- NOTE: This variant of the test uses plugin management -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-configuration</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <!-- plugin-level config still applies as well but is recessive -->
+ <propertiesFile>target/config.properties</propertiesFile>
+ <stringParam>FAILED</stringParam>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <configuration>
+ <stringParam>PASSED</stringParam>
+ <!-- NOTE: Intentionally using append mode here to check the config gets processed only once -->
+ <stringParams combine.children="append">
+ <!-- NOTE: These values are deliberately not in alpha order! -->
+ <stringParam>a</stringParam>
+ <stringParam>c</stringParam>
+ <stringParam>b</stringParam>
+ <stringParam>d</stringParam>
+ </stringParams>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/with-mgmt/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml (from r807517, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/pom.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/pom.xml&r1=807517&r2=807616&rev=807616&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml Tue Aug 25 13:29:03 2009
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.it.mng3401</groupId>
- <artifactId>mng-3401</artifactId>
+
+ <groupId>org.apache.maven.its.mng3401</groupId>
+ <artifactId>test</artifactId>
<version>1</version>
<packaging>pom</packaging>
@@ -13,6 +14,7 @@
</description>
<build>
+ <!-- NOTE: This variant of the test does not use plugin management -->
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>