Author: bentmann
Date: Mon May 25 07:27:29 2009
New Revision: 778322
URL: http://svn.apache.org/viewvc?rev=778322&view=rev
Log:
o Restructured IT to use separate POMs for each test part
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/direct/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/direct/pom.xml
- copied, changed from r778239,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/lifecycle/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/lifecycle/pom.xml
- copied unchanged from r778239,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml
- copied, changed from r778239,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings.xml
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java?rev=778322&r1=778321&r2=778322&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
Mon May 25 07:27:29 2009
@@ -47,6 +47,7 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0449" );
+ testDir = new File( testDir, "lifecycle" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
@@ -54,8 +55,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng0449" );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
- verifier.filterFile( "settings.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
- verifier.setLogFileName( "log-lifecycle.txt" );
+ verifier.filterFile( "../settings-template.xml", "settings.xml",
"UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -67,12 +67,13 @@
/**
* Verify that versions for plugins are automatically resolved if not
given in the POM by checking first LATEST and
- * then RELEASE in the repo metadata when the plugin is invoked from the
command line.
+ * then RELEASE in the repo metadata when the plugin is invoked directly
from the command line.
*/
public void testitCliInvocation()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0449" );
+ testDir = new File( testDir, "direct" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
@@ -80,8 +81,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng0449" );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
- verifier.filterFile( "settings.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
- verifier.setLogFileName( "log-cli.txt" );
+ verifier.filterFile( "../settings-template.xml", "settings.xml",
"UTF-8", verifier.newDefaultFilterProperties() );
verifier.executeGoal(
"org.apache.maven.its.mng0449:maven-it-plugin-a:touch" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/direct/pom.xml
(from r778239,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/direct/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/direct/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/pom.xml&r1=778239&r2=778322&rev=778322&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/direct/pom.xml
Mon May 25 07:27:29 2009
@@ -32,40 +32,4 @@
Verify that versions for plugins are automatically resolved if not given
in the POM by checking first LATEST and
then RELEASE in the repo metadata.
</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.mng0449</groupId>
- <artifactId>maven-it-plugin-a</artifactId>
- <!-- NOTE: <version> intentionally omitted, should resolve to
0.2-SNAPSHOT instead of 0.1 -->
- <executions>
- <execution>
- <id>test-1</id>
- <phase>validate</phase>
- <goals>
- <!-- creates target/touch-release.txt in 0.1 and
target/touch-snapshot.txt in 0.2-SNAPSHOT -->
- <goal>touch</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.its.mng0449</groupId>
- <artifactId>maven-it-plugin-b</artifactId>
- <!-- NOTE: <version> intentionally omitted, should resolve to 0.1 -->
- <!-- NOTE: Intentionally using <extensions> here to trigger to other
code paths for plugin loading, too -->
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>test-2</id>
- <phase>validate</phase>
- <goals>
- <goal>package</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml
(from r778239,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings.xml)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings.xml&r1=778239&r2=778322&rev=778322&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0449/settings-template.xml
Mon May 25 07:27:29 2009
@@ -34,7 +34,7 @@
<repositories>
<repository>
<id>maven-core-it</id>
- <url>@baseurl@/repo</url>
+ <url>@baseurl@/../repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
@@ -46,7 +46,7 @@
<pluginRepositories>
<pluginRepository>
<id>maven-core-it</id>
- <url>@baseurl@/repo</url>
+ <url>@baseurl@/../repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
