Author: brianf
Date: Sat Apr 7 13:42:13 2007
New Revision: 526481
URL: http://svn.apache.org/viewvc?view=rev&rev=526481
Log:
updated IT tests to handle prefixes from the settings.xml
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/one/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java?view=diff&rev=526481&r1=526480&r2=526481
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
Sat Apr 7 13:42:13 2007
@@ -1,7 +1,6 @@
package org.apache.maven.integrationtests;
import java.io.File;
-import java.util.List;
import java.util.ArrayList;
import org.apache.maven.it.Verifier;
@@ -13,31 +12,34 @@
public void testit0119()
throws Exception
{
- File testDir =
- ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder" );
Verifier verifier;
- // Install the parent POM, extension and the plugin
+ // Install the parent POM, extension and the plugin
verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.plugins", "it0119", "1.0",
"jar" );
- verifier.deleteArtifact( "org.codehaus.mojo", "it0119", "1.0", "jar" );
- verifier.deleteArtifact( "it0119", "it0119", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.it0119",
"it0119-parent", "1.0", "pom" );
-
-
- List cliOptions = new ArrayList();
+
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- //now run the test
- testDir =
- ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder/test-project" );
+
+ // now run the test. Since we have apache and codehaus, i should get
the apache one first
+ testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder/test-project" );
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "it0119:apache" );
verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+
+
+// now run the test. Since we have apache and codehaus and a prefix in my
settings, i should get the custom one first
+ testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder/test-project" );
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ //use my custom settings upon invocation.
+ ArrayList cli = new ArrayList();
+ cli.add("-s "+testDir.getAbsolutePath()+"/settings.xml");
+ verifier.setCliOptions( cli );
+ verifier.executeGoal( "it0119:custom" );
+ verifier.verifyErrorFreeLog();
}
}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 7 13:42:13 2007
@@ -0,0 +1 @@
+target
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 7 13:42:13 2007
@@ -0,0 +1,3 @@
+.classpath
+.project
+target
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/one/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 7 13:42:13 2007
@@ -0,0 +1 @@
+target
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 7 13:42:13 2007
@@ -0,0 +1 @@
+target
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt?view=diff&rev=526481&r1=526480&r2=526481
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
Sat Apr 7 13:42:13 2007
@@ -1,3 +1,5 @@
This test checks the order of plugin searching. In <2.0.7, Maven searched
codehaus before apache.
-This is to fix MNG-2926. This test will fail with 2.0.6 and less.
\ No newline at end of file
+This test also verifies that prefixes set by a user in the settings are
searched first before the standard ones.
+
+This is to fix MNG-2926. This test will fail with Maven <=2.0.6.
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 7 13:42:13 2007
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java?view=auto&rev=526481
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java
Sat Apr 7 13:42:13 2007
@@ -0,0 +1,19 @@
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
+ * @goal id
+ */
+public class IDMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Apache");
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 7 13:42:13 2007
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java?view=auto&rev=526481
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java
Sat Apr 7 13:42:13 2007
@@ -0,0 +1,19 @@
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
+ * @goal id
+ */
+public class IDMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Codehaus");
+ }
+
+}
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 7 13:42:13 2007
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java?view=auto&rev=526481
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java
Sat Apr 7 13:42:13 2007
@@ -0,0 +1,19 @@
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
+ * @goal id
+ */
+public class IDMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Custom");
+ }
+
+}
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml?view=diff&rev=526481&r1=526480&r2=526481
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
Sat Apr 7 13:42:13 2007
@@ -3,33 +3,11 @@
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.it0114</groupId>
- <artifactId>it0114-plugin-runner</artifactId>
+ <groupId>org.apache.maven.its.it0119</groupId>
+ <artifactId>it0119-plugin-runner</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
- <name>it0114 - plugin runner</name>
+ <name>it0119 - plugin runner</name>
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.it0114</groupId>
- <artifactId>it0114-extension</artifactId>
- <version>1.0</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.its.it0114</groupId>
- <artifactId>it0114-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
-
- </plugin>
- </plugins>
</build>
</project>
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml?view=auto&rev=526481
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml
Sat Apr 7 13:42:13 2007
@@ -0,0 +1,5 @@
+<settings>
+<pluginGroups>
+ <pluginGroup>it0119</pluginGroup>
+</pluginGroups>
+</settings>
\ No newline at end of file
