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/07/24 15:15:42 UTC
svn commit: r797437 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
resources/mng-0469/test2/pom.xml
Author: bentmann
Date: Fri Jul 24 13:15:42 2009
New Revision: 797437
URL: http://svn.apache.org/viewvc?rev=797437&view=rev
Log:
o Made IT check plugin config via model inspection for 3.x which provides an effective model including plugin config
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test2/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java?rev=797437&r1=797436&r2=797437&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java Fri Jul 24 13:15:42 2009
@@ -90,8 +90,18 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteDirectory( "target" );
verifier.setAutoclean( false );
- verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" );
- verifier.assertFilePresent( "target/site/info.properties" );
+ if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
+ {
+ verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" );
+ verifier.assertFilePresent( "target/site/info.properties" );
+ }
+ else
+ {
+ verifier.executeGoal( "validate" );
+ Properties props = verifier.loadProperties( "target/config.properties" );
+ assertEquals( "maven-it-plugin-site", props.getProperty( "project.reporting.plugins.0.artifactId" ) );
+ assertFalse( "fail.properties".equals( props.getProperty( "project.reporting.plugins.0.configuration.children.infoFile.0.value" ) ) );
+ }
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test2/pom.xml?rev=797437&r1=797436&r2=797437&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test2/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0469/test2/pom.xml Fri Jul 24 13:15:42 2009
@@ -43,6 +43,26 @@
<infoFile>fail.properties</infoFile>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-expression</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <outputFile>target/config.properties</outputFile>
+ <expressions>
+ <expression>project/build/plugins/8/configuration</expression>
+ </expressions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>eval</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>