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/01/06 15:29:12 UTC
svn commit: r731952 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/MavenIT0023Test.java resources/it0023/pom.xml
resources/it0023/settings.xml resources/it0023/src/
Author: bentmann
Date: Tue Jan 6 06:29:11 2009
New Revision: 731952
URL: http://svn.apache.org/viewvc?rev=731952&view=rev
Log:
o Decoupled it0023 from production plugins
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/settings.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java?rev=731952&r1=731951&r2=731952&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023Test.java Tue Jan 6 06:29:11 2009
@@ -23,8 +23,6 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.List;
-import java.util.ArrayList;
public class MavenIT0023Test
extends AbstractMavenIntegrationTestCase
@@ -37,15 +35,17 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0023" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings settings.xml" );
- verifier.setCliOptions( cliOptions );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.getCliOptions().add( "--settings" );
+ verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
- verifier.assertFilePresent( "target/test.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ verifier.assertFilePresent( "target/test.txt" );
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/pom.xml?rev=731952&r1=731951&r2=731952&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/pom.xml Tue Jan 6 06:29:11 2009
@@ -1,10 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0023</name>
+
<groupId>org.apache.maven.its.it0023</groupId>
<artifactId>maven-it-it0023</artifactId>
- <description>Test profile inclusion from settings.xml (this one is activated by an id in the activeProfiles section).</description>
<version>1.0-SNAPSHOT</version>
+
+ <name>Maven Integration Test :: it0023</name>
+ <description>Test profile inclusion from settings.xml (this one is activated by an id in the activeProfiles section).</description>
+
<build>
<plugins>
<plugin>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/settings.xml?rev=731952&r1=731951&r2=731952&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0023/settings.xml Tue Jan 6 06:29:11 2009
@@ -1,3 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<settings>
<activeProfiles>
<activeProfile>test-profile</activeProfile>
@@ -6,16 +27,9 @@
<profiles>
<profile>
<id>test-profile</id>
-
- <activation>
- <property>
- <name>includeProfile</name>
- </property>
- </activation>
-
<properties>
<test>test.txt</test>
</properties>
</profile>
</profiles>
-</settings>
\ No newline at end of file
+</settings>