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/17 12:17:24 UTC
svn commit: r795027 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
resources/mng-2576/pom.xml resources/mng-2576/sub-d/pom-special.xml
resources/mng-2576/sub-d/pom.xml
Author: bentmann
Date: Fri Jul 17 10:17:24 2009
New Revision: 795027
URL: http://svn.apache.org/viewvc?rev=795027&view=rev
Log:
o Extended IT to check selection of projects with non-default POM filenames
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2576/sub-d/pom-special.xml
- copied unchanged from r793815, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2576/sub-d/pom.xml
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2576/sub-d/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2576/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java?rev=795027&r1=795026&r2=795027&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java Fri Jul 17 10:17:24 2009
@@ -153,6 +153,32 @@
}
/**
+ * Verify that using the mere basedir in the project list properly matches projects with non-default POM files.
+ */
+ public void testitMatchesByBasedir()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setAutoclean( false );
+ clean( verifier );
+ verifier.assertFileNotPresent( "sub-d/pom.xml" );
+ verifier.getCliOptions().add( "-pl" );
+ verifier.getCliOptions().add( "sub-d" );
+ verifier.setLogFileName( "log-basedir.txt" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ verifier.assertFileNotPresent( "target/touch.txt" );
+ verifier.assertFileNotPresent( "sub-a/target/touch.txt" );
+ verifier.assertFileNotPresent( "sub-b/target/touch.txt" );
+ verifier.assertFileNotPresent( "sub-c/target/touch.txt" );
+ verifier.assertFilePresent( "sub-d/target/touch.txt" );
+ }
+
+ /**
* Verify that reactor is resumed from specified project.
*/
public void testitResumeFrom()
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2576/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2576/pom.xml?rev=795027&r1=795026&r2=795027&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2576/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2576/pom.xml Fri Jul 17 10:17:24 2009
@@ -34,7 +34,7 @@
<module>sub-a</module>
<module>sub-b</module>
<module>sub-c</module>
- <module>sub-d</module>
+ <module>sub-d/pom-special.xml</module>
</modules>
<build>