You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/03/04 14:16:08 UTC
svn commit: r749998 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-3641/ resources/mng-3641/child1/
resources/mng-3641/child2/
Author: brett
Date: Wed Mar 4 13:16:07 2009
New Revision: 749998
URL: http://svn.apache.org/viewvc?rev=749998&view=rev
Log:
[MNG-3641] additional test to check that when only some projects in the reactor contain the profile, warning does not appear
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child1/pom.xml (contents, props changed)
- copied, changed from r749151, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child2/pom.xml (contents, props changed)
- copied, changed from r749151, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java?rev=749998&r1=749997&r2=749998&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java Wed Mar 4 13:16:07 2009
@@ -82,5 +82,16 @@
logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
assertFalse( logFile.contains( "[WARNING] Profile with id: 'mng-3641-it-provided-profile' has not been activated." ) );
assertTrue( logFile.contains( "[WARNING] Profile with id: 'mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p' has not been activated." ) );
+
+ // (4) Fourth run: make sure the warning is only printed when the profile is missing in all projects
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile-child" ) );
+ verifier.setLogFileName( "log-4.txt" );
+ verifier.executeGoal( "validate" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ logFile = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
+ assertFalse( logFile.contains( "[WARNING] Profile with id: 'mng-3641-it-provided-profile-child' has not been activated." ) );
}
}
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child1/pom.xml (from r749151, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child1/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child1/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml&r1=749151&r2=749998&rev=749998&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child1/pom.xml Wed Mar 4 13:16:07 2009
@@ -22,16 +22,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.mng3641</groupId>
- <artifactId>profile-test</artifactId>
- <version>1</version>
+ <parent>
+ <groupId>org.apache.maven.its.mng3641</groupId>
+ <artifactId>profile-test</artifactId>
+ <version>1</version>
+ </parent>
+ <artifactId>child1</artifactId>
<packaging>pom</packaging>
- <name>MNG-3641 - Profile activation warning test</name>
+ <name>MNG-3641 - Profile activation warning test - child 1</name>
<profiles>
<profile>
- <id>mng-3641-it-provided-profile</id>
+ <id>mng-3641-it-provided-profile-child</id>
</profile>
</profiles>
</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child1/pom.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child2/pom.xml (from r749151, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child2/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child2/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml&r1=749151&r2=749998&rev=749998&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child2/pom.xml Wed Mar 4 13:16:07 2009
@@ -22,16 +22,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.mng3641</groupId>
- <artifactId>profile-test</artifactId>
- <version>1</version>
+ <parent>
+ <groupId>org.apache.maven.its.mng3641</groupId>
+ <artifactId>profile-test</artifactId>
+ <version>1</version>
+ </parent>
+ <artifactId>child2</artifactId>
<packaging>pom</packaging>
- <name>MNG-3641 - Profile activation warning test</name>
-
- <profiles>
- <profile>
- <id>mng-3641-it-provided-profile</id>
- </profile>
- </profiles>
+ <name>MNG-3641 - Profile activation warning test - child 2</name>
</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/child2/pom.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml?rev=749998&r1=749997&r2=749998&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3641/pom.xml Wed Mar 4 13:16:07 2009
@@ -34,4 +34,9 @@
<id>mng-3641-it-provided-profile</id>
</profile>
</profiles>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
</project>