Author: bentmann
Date: Fri Sep 18 17:42:53 2009
New Revision: 816726
URL: http://svn.apache.org/viewvc?rev=816726&view=rev
Log:
o Strengthened IT
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0674/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java?rev=816726&r1=816725&r2=816726&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
Fri Sep 18 17:42:53 2009
@@ -23,6 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Properties;
/**
* This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-674";>MNG-674</a>.
@@ -33,15 +34,37 @@
public class MavenITmng0674PluginParameterAliasTest
extends AbstractMavenIntegrationTestCase
{
+
public MavenITmng0674PluginParameterAliasTest()
{
super( ALL_MAVEN_VERSIONS );
}
/**
- * Test parameter alias usage.
+ * Test parameter alias usage for lifecycle-bound goal execution.
+ */
+ public void testitLifecycle()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0674" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.setLogFileName( "log-lifecycle.txt" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ Properties props = verifier.loadProperties( "target/config.properties"
);
+ assertEquals( "MNG-674-1", props.getProperty( "aliasParam" ) );
+ assertEquals( "MNG-674-2", props.getProperty(
"aliasDefaultExpressionParam" ) );
+ }
+
+ /**
+ * Test parameter alias usage for direct goal execution from CLI.
*/
- public void testitMNG674()
+ public void testitCli()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0674" );
@@ -49,11 +72,14 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
+ verifier.setLogFileName( "log-cli.txt" );
+ verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-configuration:config" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- verifier.assertFilePresent( "target/touchFile.txt" );
+ Properties props = verifier.loadProperties( "target/config.properties"
);
+ assertEquals( "MNG-674-1", props.getProperty( "aliasParam" ) );
+ assertEquals( "MNG-674-2", props.getProperty(
"aliasDefaultExpressionParam" ) );
}
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0674/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0674/pom.xml?rev=816726&r1=816725&r2=816726&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0674/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0674/pom.xml
Fri Sep 18 17:42:53 2009
@@ -1,21 +1,36 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0049</name>
- <groupId>org.apache.maven.its.it0049</groupId>
- <artifactId>maven-it-it0049</artifactId>
- <description>Test parameter alias usage.</description>
+
+ <groupId>org.apache.maven.its.mng0674</groupId>
+ <artifactId>test</artifactId>
<version>1.0-SNAPSHOT</version>
+
+ <name>Maven Integration Test :: MNG-674</name>
+ <description>Test parameter alias usage.</description>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-touch</artifactId>
+ <artifactId>maven-it-plugin-configuration</artifactId>
<version>2.1-SNAPSHOT</version>
<configuration>
- <pluginFile>touchFile.txt</pluginFile>
+ <propertiesFile>target/config.properties</propertiesFile>
+ <!-- parameter that has no default value -->
+ <aliasParamLegacy>MNG-674-1</aliasParamLegacy>
+ <!-- parameter that has a default value -->
+ <fullyAnnotatedParam>MNG-674-2</fullyAnnotatedParam>
</configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>config</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
-
</project>
