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 2008/03/05 02:03:41 UTC
svn commit: r633736 - in
/maven/core-integration-testing/trunk/core-integration-tests/src/test:
java/org/apache/maven/integrationtests/
resources/mng-2234-activeProfilesFromSettings/
Author: brett
Date: Tue Mar 4 17:03:39 2008
New Revision: 633736
URL: http://svn.apache.org/viewvc?rev=633736&view=rev
Log:
[MNG-2234] add an integration test for activation of profiles from
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java (with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/pom.xml (with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/settings.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=633736&r1=633735&r2=633736&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Tue Mar 4 17:03:39 2008
@@ -178,6 +178,7 @@
suite.addTestSuite( MavenITmng1491ReactorArtifactIdCollision.class );
suite.addTestSuite( MavenITmng3426PluginsClasspathOverrideTest.class );
suite.addTestSuite( MavenITmng3428PluginDescriptorArtifactsIncompleteTest.class );
+// suite.addTestSuite( MavenITmng2234ActiveProfilesFromSettingsTest.class );
suite.addTestSuite( MavenITmng2123VersionRangeDependencyTest.class );
// ----------------------------------------------------------------------------------------------------
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java?rev=633736&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java Tue Mar 4 17:03:39 2008
@@ -0,0 +1,39 @@
+package org.apache.maven.integrationtests;
+
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MavenITmng2234ActiveProfilesFromSettingsTest
+ extends AbstractMavenIntegrationTestCase
+{
+ public MavenITmng2234ActiveProfilesFromSettingsTest()
+ throws InvalidVersionSpecificationException
+ {
+ super( "(2.0.8,)" );
+ }
+
+ public void testitMNG2234 ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2234-activeProfilesFromSettings" );
+
+ Verifier verifier;
+
+ verifier = new Verifier( testDir.getAbsolutePath() );
+
+ List cliOptions = new ArrayList();
+ cliOptions.add( "-s" );
+ cliOptions.add( "settings.xml" );
+ verifier.setCliOptions( cliOptions );
+ verifier.executeGoal( "install" );
+
+ verifier.verifyErrorFreeLog();
+ verifier.assertFilePresent( "target/touch.txt" );
+ verifier.resetStreams();
+ }
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2234ActiveProfilesFromSettingsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/pom.xml?rev=633736&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/pom.xml Tue Mar 4 17:03:39 2008
@@ -0,0 +1,27 @@
+<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.mng2234</groupId>
+ <artifactId>test-artifact</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <profiles>
+ <profile>
+ <id>env-test</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-touch</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>touch</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/settings.xml?rev=633736&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/settings.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/settings.xml Tue Mar 4 17:03:39 2008
@@ -0,0 +1,5 @@
+<settings>
+ <activeProfiles>
+ <activeProfile>env-test</activeProfile>
+ </activeProfiles>
+</settings>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2234-activeProfilesFromSettings/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native