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 2008/11/19 00:19:48 UTC
svn commit: r718762 - in /maven/core-integration-testing/trunk:
core-it-suite/src/test/java/org/apache/maven/it/
core-it-suite/src/test/resources/bootstrap/
core-it-suite/src/test/resources/it0090/
core-it-suite/src/test/resources/it0090/src/ core-it-s...
Author: bentmann
Date: Tue Nov 18 15:19:47 2008
New Revision: 718762
URL: http://svn.apache.org/viewvc?rev=718762&view=rev
Log:
o Deleted maven-it-plugin-generate-envar-properties which is superceded by maven-it-plugin-configuration
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0090/src/
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-generate-envar-properties/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0090/pom.xml
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090Test.java?rev=718762&r1=718761&r2=718762&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090Test.java Tue Nov 18 15:19:47 2008
@@ -25,6 +25,7 @@
import java.io.File;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
public class MavenIT0090Test
extends AbstractMavenIntegrationTestCase
@@ -37,14 +38,18 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath(), true );
Map envVars = new HashMap();
envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
- verifier.executeGoal( "test", envVars );
- verifier.assertFilePresent( "target/mojo-generated.properties" );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.executeGoal( "validate", envVars );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ Properties props = verifier.loadProperties( "target/env.properties" );
+ assertEquals( "MAVEN_TEST_ENVAR_VALUE", props.getProperty( "stringParam" ) );
}
-}
+}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml?rev=718762&r1=718761&r2=718762&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/pom.xml Tue Nov 18 15:19:47 2008
@@ -121,12 +121,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-generate-envar-properties</artifactId>
- <version>${itPluginVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.plugins</groupId>
<artifactId>maven-it-plugin-generate-properties</artifactId>
<version>${itPluginVersion}</version>
<scope>runtime</scope>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0090/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0090/pom.xml?rev=718762&r1=718761&r2=718762&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0090/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0090/pom.xml Tue Nov 18 15:19:47 2008
@@ -1,58 +1,52 @@
+<?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 :: it0090</name>
+
<groupId>org.apache.maven.its.it0090</groupId>
<artifactId>maven-it-it0090</artifactId>
- <description>Test that ensures that envars are interpolated correctly into plugin
- configurations.</description>
<version>1.0</version>
-
- <repositories>
- <repository>
- <id>test-plugins</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>test-plugins</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
+
+ <name>Maven Integration Test :: it0090</name>
+ <description>
+ Test that ensures that envars are interpolated correctly into plugin
+ configurations.
+ </description>
+
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-generate-envar-properties</artifactId>
+ <artifactId>maven-it-plugin-configuration</artifactId>
<version>2.1-SNAPSHOT</version>
<executions>
<execution>
- <phase>process-resources</phase>
+ <phase>validate</phase>
<configuration>
- <mavenTestEnvar>${env.MAVEN_TEST_ENVAR}</mavenTestEnvar>
+ <propertiesFile>target/env.properties</propertiesFile>
+ <stringParam>${env.MAVEN_TEST_ENVAR}</stringParam>
</configuration>
<goals>
- <goal>generate-envar-properties</goal>
+ <goal>config</goal>
</goals>
</execution>
</executions>
Modified: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml?rev=718762&r1=718761&r2=718762&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/pom.xml Tue Nov 18 15:19:47 2008
@@ -44,7 +44,6 @@
<module>maven-it-plugin-expression</module>
<module>maven-it-plugin-file</module>
<module>maven-it-plugin-fork</module>
- <module>maven-it-plugin-generate-envar-properties</module>
<module>maven-it-plugin-generate-properties</module>
<module>maven-it-plugin-no-project</module>
<module>maven-it-plugin-packaging</module>