Author: jdcasey
Date: Thu Jul 24 10:47:23 2008
New Revision: 679473
URL:
http://svn.apache.org/viewvc?rev=679473&view=revLog:
[MNG-3679] Adding integration test, and enabling integration tests of two other previously fixed issues.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.classpath
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.project
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.eclipse.jdt.core.prefs
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.maven.ide.eclipse.prefs
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/target/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/target/classes/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/target/sanity-check.txt
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/target/test-classes/
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=679473&r1=679472&r2=679473&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 Thu Jul 24 10:47:23 2008
@@ -64,7 +64,10 @@
* the tests are to finishing. Newer tests are also more likely to fail, so this is
* a fail fast technique as well.
*/
-
+
+ suite.addTestSuite( MavenITmng3679PluginExecIdInterpolationTest.class );
+ suite.addTestSuite( MavenITmng3671PluginLevelDepInterpolationTest.class );
+ suite.addTestSuite( MavenITmng3667ResolveDepsWithBadPomVersionTest.class );
suite.addTestSuite( MavenITmng3652UserAgentHeader.class );
suite.addTestSuite( MavenITmng3642DynamicResourcesTest.class );
suite.addTestSuite( MavenITmng3581PluginUsesWagonDependency.class );
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java?rev=679473&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java Thu Jul 24 10:47:23 2008
@@ -0,0 +1,31 @@
+package org.apache.maven.integrationtests;
+
+import java.io.File;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Checks that a plugin execution with an id that contains an expression will
+ * still execute without a problem.
+ *
+ * @author jdcasey
+ */
+public class MavenITmng3679PluginExecIdInterpolationTest
+ extends AbstractMavenIntegrationTestCase
+{
+ public void testitMNG3679 ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3679-pluginExecIdInterpolation" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ verifier.executeGoal( "validate" );
+
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ assertTrue( new File( testDir, "target/check.txt" ).exists() );
+ }
+}
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.classpath
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.classpath?rev=679473&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.classpath (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.classpath Thu Jul 24 10:47:23 2008
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.project
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.project?rev=679473&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.project (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.project Thu Jul 24 10:47:23 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>mng-3679-pluginExecIdInterpolation</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.eclipse.jdt.core.prefs?rev=679473&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.eclipse.jdt.core.prefs Thu Jul 24 10:47:23 2008
@@ -0,0 +1,5 @@
+#Thu Jul 24 12:57:19 EDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.source=1.3
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.maven.ide.eclipse.prefs
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.maven.ide.eclipse.prefs?rev=679473&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.maven.ide.eclipse.prefs (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/.settings/org.maven.ide.eclipse.prefs Thu Jul 24 10:47:23 2008
@@ -0,0 +1,8 @@
+#Thu Jul 24 12:57:46 EDT 2008
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=true
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/pom.xml?rev=679473&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/pom.xml Thu Jul 24 10:47:23 2008
@@ -0,0 +1,37 @@
+<?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>
+ <packaging>pom</packaging>
+ <name/>
+ <version>1</version>
+ <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>
+ </build>
+ <properties>
+ <myExecId>test-id</myExecId>
+ </properties>
+</project>
\ No newline at end of file
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/target/sanity-check.txt
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/target/sanity-check.txt?rev=679473&view=auto==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/target/sanity-check.txt (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3679-pluginExecIdInterpolation/target/sanity-check.txt Thu Jul 24 10:47:23 2008
@@ -0,0 +1 @@
+Testing execution with id: test-id\n
\ No newline at end of file
