You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2012/11/25 16:12:24 UTC
svn commit: r1413359 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-5387/ resources/mng-5387/src/
resources/mng-5387/src/stuff/
Author: bimargulies
Date: Sun Nov 25 15:12:23 2012
New Revision: 1413359
URL: http://svn.apache.org/viewvc?rev=1413359&view=rev
Log:
MNG-5387: Add ability to replace an artifact in mid-build
o integration test.
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java
- copied, changed from r1413284, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/pom.xml (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/something.txt (with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/somethingelse.txt (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=1413359&r1=1413358&r2=1413359&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Sun Nov 25 15:12:23 2012
@@ -104,7 +104,9 @@ public class IntegrationTestSuite
// -------------------------------------------------------------------------------------------------------------
// Tests that don't run stable and need to be fixed
// -------------------------------------------------------------------------------------------------------------
- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+ // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
+
+ suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );
suite.addTestSuite( MavenITmng5338FileOptionToDirectory.class );
suite.addTestSuite( MavenITmng5280SettingsProfilesRepositoriesOrderTest.class );
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java (from r1413284, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java&r1=1413284&r2=1413359&rev=1413359&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java Sun Nov 25 15:12:23 2012
@@ -19,22 +19,18 @@ package org.apache.maven.it;
* under the License.
*/
+import org.apache.maven.it.util.FileUtils;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-/**
- * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-5382">MNG-5382</a>.
- *
- * @author Jason van Zyl
- */
-public class MavenITmng5382Jsr330Plugin
+public class MavenITmng5387ArtifactReplacementPlugin
extends AbstractMavenIntegrationTestCase
{
private File testDir;
- public MavenITmng5382Jsr330Plugin()
+ public MavenITmng5387ArtifactReplacementPlugin()
{
super( "[3.1,)" );
}
@@ -44,7 +40,7 @@ public class MavenITmng5382Jsr330Plugin
{
super.setUp();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5382" );
+ testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5387" );
}
@@ -55,30 +51,19 @@ public class MavenITmng5382Jsr330Plugin
super.tearDown();
}
- public void testJsr330PluginExecution()
+ public void testArtifactReplacementExecution()
throws Exception
{
- //
- // Build a plugin that uses a JSR330 plugin
- //
Verifier v0 = newVerifier( testDir.getAbsolutePath(), "remote" );
v0.setAutoclean( false );
v0.deleteDirectory( "target" );
- v0.deleteArtifacts( "org.apache.maven.its.mng5382" );
+ v0.deleteArtifacts( "org.apache.maven.its.mng5387" );
v0.executeGoal( "install" );
v0.verifyErrorFreeLog();
v0.resetStreams();
-
- //
- // Execute the JSR330 plugin
- //
- Verifier v1 = newVerifier( testDir.getAbsolutePath(), "remote" );
- v1.setAutoclean( false );
- v1.executeGoal( "org.apache.maven.its.mng5382:jsr330-maven-plugin:0.0.1-SNAPSHOT:hello" );
- v1.verifyErrorFreeLog();
- v1.resetStreams();
- v1.verifyTextInLog( "Hello! I am a component that is being used via constructor injection! That's right, I'm a JSR330 badass." );
+ String path = v0.getArtifactPath( "org.apache.maven.its.mng5387", "mng5387-it", "0.0.1-SNAPSHOT", "txt", "c" );
+ String contents = FileUtils.fileRead( new File( path ), "utf-8" );
+ assertTrue( contents.contains( "This is the second file" ) );
}
-
}
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/pom.xml?rev=1413359&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/pom.xml Sun Nov 25 15:12:23 2012
@@ -0,0 +1,60 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng5387</groupId>
+ <artifactId>mng5387-it</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Test multiple attachments</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts-1</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>src/stuff/something.txt</file>
+ <type>txt</type>
+ <classifier>c</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ <execution>
+ <id>attach-artifacts-2</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>src/stuff/somethingelse.txt</file>
+ <type>txt</type>
+ <classifier>c</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/something.txt
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/something.txt?rev=1413359&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/something.txt (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/something.txt Sun Nov 25 15:12:23 2012
@@ -0,0 +1 @@
+This is the first file.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/something.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/something.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/somethingelse.txt
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/somethingelse.txt?rev=1413359&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/somethingelse.txt (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/somethingelse.txt Sun Nov 25 15:12:23 2012
@@ -0,0 +1 @@
+This is the second file.
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/somethingelse.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-5387/src/stuff/somethingelse.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain