You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/10/17 20:20:58 UTC
svn commit: r585618 - in
/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests:
MavenIT0114ExtensionThatProvidesResources.java
MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
Author: jvanzyl
Date: Wed Oct 17 11:20:57 2007
New Revision: 585618
URL: http://svn.apache.org/viewvc?rev=585618&view=rev
Log:
o turn off the old crap way of using extensions for plugins and create a new test for pulling resources from actual plugin dependencies.
we are now starting to limit extensions and start using these things properly.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java
- copied, changed from r585300, maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java?rev=585618&r1=585617&r2=585618&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java Wed Oct 17 11:20:57 2007
@@ -1,15 +1,22 @@
package org.apache.maven.integrationtests;
-import java.io.File;
-import java.util.List;
-import java.util.ArrayList;
-
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
public class MavenIT0114ExtensionThatProvidesResources
extends AbstractMavenIntegrationTestCase
{
+ public MavenIT0114ExtensionThatProvidesResources()
+ throws InvalidVersionSpecificationException
+ {
+ super( "[,2.1-SNAPSHOT)" );
+ }
+
public void testit0114()
throws Exception
{
Copied: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java (from r585300, maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java?p2=maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java&p1=maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java&r1=585300&r2=585618&rev=585618&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0114ExtensionThatProvidesResources.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.java Wed Oct 17 11:20:57 2007
@@ -7,37 +7,37 @@
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
-public class MavenIT0114ExtensionThatProvidesResources
+public class MavenIT0129ResourceProvidedToAPluginAsAPluginDependency
extends AbstractMavenIntegrationTestCase
{
public void testit0114()
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/it0114-extensionThatProvidesResources" );
+ ResourceExtractor.simpleExtractResources( getClass(), "/it0129-extensionThatProvidesResources" );
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.its.it0114", "it0114-plugin-runner", "1.0", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.it0114", "it0114-extension", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.it0114", "it0114-plugin", "1.0", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.it0114", "it0114-parent", "1.0", "pom" );
-
- List cliOptions = new ArrayList();
+ verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-plugin-runner", "1.0", "pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-extension", "1.0", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-plugin", "1.0", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0129", "it0129-parent", "1.0", "pom" );
+
+ List cliOptions = new ArrayList();
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
+
//now run the test
testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/it0114-extensionThatProvidesResources/test-project" );
+ ResourceExtractor.simpleExtractResources( getClass(), "/it0129-extensionThatProvidesResources/test-project" );
verifier = new Verifier( testDir.getAbsolutePath() );
cliOptions = new ArrayList();
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
+
}
-}
+}
\ No newline at end of file