Author: bentmann
Date: Tue Mar 10 14:33:37 2009
New Revision: 752120
URL: http://svn.apache.org/viewvc?rev=752120&view=rev
Log:
o Decoupled IT from production plugin
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3679/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java?rev=752120&r1=752119&r2=752120&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java
Tue Mar 10 14:33:37 2009
@@ -33,6 +33,7 @@
public class MavenITmng3679PluginExecIdInterpolationTest
extends AbstractMavenIntegrationTestCase
{
+
public MavenITmng3679PluginExecIdInterpolationTest()
{
super( ALL_MAVEN_VERSIONS );
@@ -44,12 +45,13 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3679" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
-
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- assertTrue( new File( testDir, "target/check.txt" ).exists() );
+ verifier.assertFilePresent( "target/check.txt" );
}
+
}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3679/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3679/pom.xml?rev=752120&r1=752119&r2=752120&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3679/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3679/pom.xml
Tue Mar 10 14:33:37 2009
@@ -1,37 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>test</groupId>
- <artifactId>mng-3679-pluginExecIdInterpolation</artifactId>
+
+ <groupId>org.apache.maven.its.mng3679</groupId>
+ <artifactId>test</artifactId>
<packaging>pom</packaging>
- <name/>
<version>1</version>
+
+ <name/>
<description/>
+
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>${myExecId}</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir
dir="${project.build.directory}" />
- <echo
file="${project.build.directory}/check.txt">${myExecId}</echo>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>${myExecId}</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ <configuration>
+ <logFile>target/check.txt</logFile>
+ <string>${myExecId}</string>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
+
<properties>
<myExecId>test-id</myExecId>
</properties>
-</project>
\ No newline at end of file
+</project>
