Author: brianf
Date: Wed Mar 14 19:34:52 2007
New Revision: 518445
URL: http://svn.apache.org/viewvc?view=rev&rev=518445
Log:
added tests that are commented out for MDEP-44 and MDEP-66
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/one/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/one/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml
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?view=diff&rev=518445&r1=518444&r2=518445
==============================================================================
---
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
Wed Mar 14 19:34:52 2007
@@ -133,6 +133,7 @@
suite.addTestSuite(
MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.class );
suite.addTestSuite( MavenIT0112ExtensionsThatDragDependencies.class );
suite.addTestSuite(
MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.class );
+ //suite.addTestSuite( MavenIT0118AttachedArtifactsInReactor.class );
return suite;
}
}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java?view=auto&rev=518445
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0118AttachedArtifactsInReactor.java
Wed Mar 14 19:34:52 2007
@@ -0,0 +1,31 @@
+package org.apache.maven.integrationtests;
+
+import java.io.File;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+public class MavenIT0118AttachedArtifactsInReactor
+ extends AbstractMavenIntegrationTestCase
+{
+ public void testit0118()
+ throws Exception
+ {
+ File testDir =
+ ResourceExtractor.simpleExtractResources( getClass(),
"/it0118-attachedartifactinreactor" );
+
+ Verifier verifier;
+
+ // Install the parent POM
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.deleteArtifact( "org.apache.maven.its.it0118", "parent",
"1.0", "pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0118", "one", "1.0",
"jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0118", "two", "1.0",
"pom" );
+ List cliOptions = new ArrayList();
+ verifier.executeGoal( "package" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/one/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/one/pom.xml?view=auto&rev=518445
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/one/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/one/pom.xml
Wed Mar 14 19:34:52 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0118</groupId>
+ <artifactId>one</artifactId>
+ <version>1.0</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>src</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/pom.xml?view=auto&rev=518445
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/pom.xml
Wed Mar 14 19:34:52 2007
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0118</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>one</module>
+ <module>two</module>
+ </modules>
+</project>
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml?view=auto&rev=518445
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0118-attachedartifactinreactor/two/pom.xml
Wed Mar 14 19:34:52 2007
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0118</groupId>
+ <artifactId>two</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.it0118</groupId>
+ <artifactId>one</artifactId>
+ <version>1.0</version>
+ <classifier>src</classifier>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/extracted</outputDirectory>
+ <includeTypes>zip</includeTypes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
