Author: bentmann
Date: Wed Jun 17 17:05:40 2009
New Revision: 785729
URL: http://svn.apache.org/viewvc?rev=785729&view=rev
Log:
o Decoupled IT from assumption that reporting config => build config
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3811/child/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java?rev=785729&r1=785728&r2=785729&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
Wed Jun 17 17:05:40 2009
@@ -55,11 +55,13 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- Properties props = verifier.loadProperties( "target/pom.properties" );
- assertEquals( "2", props.getProperty( "stringParams" ) );
- assertEquals( "parentParam", props.getProperty( "stringParams.0" ) );
- assertEquals( "childParam", props.getProperty( "stringParams.1" ) );
- assertEquals( "true", props.getProperty( "booleanParam" ) );
+ Properties props = verifier.loadProperties( "target/config.properties"
);
+ String p = "project.reporting.plugins.0.configuration.children.";
+
+ assertEquals( "2", props.getProperty( p + "stringParams.0.children" )
);
+ assertEquals( "parentParam", props.getProperty( p +
"stringParams.0.children.stringParam.0.value" ) );
+ assertEquals( "childParam", props.getProperty( p +
"stringParams.0.children.stringParam.1.value" ) );
+ assertEquals( "true", props.getProperty( p + "booleanParam.0.value" )
);
}
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3811/child/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3811/child/pom.xml?rev=785729&r1=785728&r2=785729&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3811/child/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3811/child/pom.xml
Wed Jun 17 17:05:40 2009
@@ -33,22 +33,27 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-configuration</artifactId>
+ <artifactId>maven-it-plugin-expression</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
- <propertiesFile>target/pom.properties</propertiesFile>
+ <outputFile>target/config.properties</outputFile>
+ <expressions>
+ <expression>project/reporting/plugins/0/configuration</expression>
+ </expressions>
</configuration>
<executions>
<execution>
<id>test</id>
+ <phase>validate</phase>
<goals>
- <goal>config</goal>
+ <goal>eval</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
@@ -64,4 +69,3 @@
</plugins>
</reporting>
</project>
-
