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/02/28 20:31:24 UTC
svn commit: r748909 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-2130/ resources/mng-2130/child/
resources/mng-2196/ resources/mng-2196/level1/
resources/mng-2196/level1/level2/ resources/mn...
Author: bentmann
Date: Sat Feb 28 19:31:24 2009
New Revision: 748909
URL: http://svn.apache.org/viewvc?rev=748909&view=rev
Log:
o Decoupled ITs from production plugins
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/child/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/level3/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java Sat Feb 28 19:31:24 2009
@@ -43,6 +43,8 @@
File child = new File( testDir, "parent/child" );
Verifier verifier = new Verifier( child.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java Sat Feb 28 19:31:24 2009
@@ -24,6 +24,9 @@
import java.io.File;
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2130">MNG-2130</a>.
+ */
public class MavenITmng2130ParentLookupFromReactorCacheTest
extends AbstractMavenIntegrationTestCase
{
@@ -34,18 +37,19 @@
/**
* Test that parent-POMs cached during a build are available as parents
- * to other POMs in the multimodule build. [MNG-2130]
+ * to other POMs in the multimodule build.
*/
public void testitMNG2130()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2130" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.it0099", "maven-it-it0099-parent", "1", "pom" );
- verifier.executeGoal( "package" );
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.mng2130" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java Sat Feb 28 19:31:24 2009
@@ -25,13 +25,16 @@
import java.io.File;
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2196">MNG-2196</a>.
+ */
public class MavenITmng2196ParentResolutionTest
extends AbstractMavenIntegrationTestCase
{
public MavenITmng2196ParentResolutionTest()
{
- super( "(,2.0.2),(2.0.2,)" );
+ super( ALL_MAVEN_VERSIONS );
}
/**
@@ -43,12 +46,14 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2196" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2196" );
-
if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
{
- verifier.executeGoal( "package" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
@@ -56,7 +61,7 @@
{
try
{
- verifier.executeGoal( "package" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
}
catch ( VerificationException e )
@@ -68,5 +73,5 @@
throw new VerificationException( "Build should have failed with java.io.IOException" );
}
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/child/pom.xml?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/child/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/child/pom.xml Sat Feb 28 19:31:24 2009
@@ -1,8 +1,8 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.its.it0099</groupId>
- <artifactId>maven-it-it0099</artifactId>
+ <groupId>org.apache.maven.its.mng2130</groupId>
+ <artifactId>parent</artifactId>
<version>1</version>
</parent>
<artifactId>child</artifactId>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/pom.xml?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2130/pom.xml Sat Feb 28 19:31:24 2009
@@ -1,13 +1,16 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0099</name>
- <groupId>org.apache.maven.its.it0099</groupId>
- <artifactId>maven-it-it0099</artifactId>
- <description>Test that parent-POMs cached during a build are available as parents
- to other POMs in the multimodule build. [MNG-2130]</description>
- <version>1</version>
+ <groupId>org.apache.maven.its.mng2130</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
<packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-2130</name>
+ <description>
+ Test that parent-POMs cached during a build are available as parents
+ to other POMs in the multimodule build.
+ </description>
<modules>
<module>child</module>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/level3/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/level3/pom.xml?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/level3/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/level3/pom.xml Sat Feb 28 19:31:24 2009
@@ -1,10 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0103</groupId>
+ <groupId>org.apache.maven.its.mng2196</groupId>
<artifactId>level1</artifactId>
<version>1</version>
</parent>
+
<artifactId>level3</artifactId>
<version>1</version>
</project>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/pom.xml?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/level2/pom.xml Sat Feb 28 19:31:24 2009
@@ -1,10 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0103</groupId>
+ <groupId>org.apache.maven.its.mng2196</groupId>
<artifactId>level1</artifactId>
<version>1</version>
</parent>
+
<artifactId>level2</artifactId>
<packaging>pom</packaging>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/pom.xml?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/level1/pom.xml Sat Feb 28 19:31:24 2009
@@ -1,12 +1,15 @@
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.maven.its.it0103</groupId>
+ <groupId>org.apache.maven.its.mng2196</groupId>
<artifactId>maven-it-it0103</artifactId>
<version>1</version>
</parent>
+
<artifactId>level1</artifactId>
<packaging>pom</packaging>
+
<modules>
<module>level2</module>
</modules>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/pom.xml?rev=748909&r1=748908&r2=748909&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/pom.xml Sat Feb 28 19:31:24 2009
@@ -1,13 +1,18 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0103</name>
- <groupId>org.apache.maven.its.it0103</groupId>
+
+ <groupId>org.apache.maven.its.mng2196</groupId>
<artifactId>maven-it-it0103</artifactId>
- <description>Verify that multimodule builds where one project references another as
- a parent can build, even if that parent is not correctly referenced by
- <relativePath/> and is not in the local repository. [MNG-2196]</description>
<version>1</version>
<packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-2196</name>
+ <description>
+ Verify that multimodule builds where one project references another as
+ a parent can build, even if that parent is not correctly referenced by
+ <relativePath/> and is not in the local repository.
+ </description>
+
<modules>
<module>level1</module>
</modules>