Author: jdcasey
Date: Mon Feb 9 16:44:09 2009
New Revision: 742607
URL: http://svn.apache.org/viewvc?rev=742607&view=rev
Log:
[MNG-2720] Clean up the integration test for MNG-2720, so it uses one of the
standard IT plugins (*-plugin-dependencies, to be specific).
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/child1/
(props changed)
- copied from r742603,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/child1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/child2/
(props changed)
- copied from r742603,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/child2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/child3/
(props changed)
- copied from r742603,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/child3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/pom.xml
(contents, props changed)
- copied, changed from r742603,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/pom.xml
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/plugin/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/child1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/child2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/child3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java?rev=742607&r1=742606&r2=742607&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java
Mon Feb 9 16:44:09 2009
@@ -19,15 +19,13 @@
package org.apache.maven.it;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
/**
* This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-2720";>MNG-2720</a>.
*
@@ -54,18 +52,34 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2720" );
- File pluginDir = new File( testDir, "plugin" );
- File projectDir = new File( testDir, "project-hierarchy" );
- // First, install the plugin used for the test.
- Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- // Now, build the project hierarchy that uses the plugin to verify
sibling dependencies.
- verifier = new Verifier( projectDir.getAbsolutePath() );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List compileClassPath = verifier.loadLines(
"child2/target/compile.classpath", "UTF-8" );
+ assertTrue( find( "child1-1.jar", compileClassPath ) );
+
+ compileClassPath = verifier.loadLines(
"child3/target/compile.classpath", "UTF-8" );
+ assertFalse( find( "child1-1.jar", compileClassPath ) );
+ assertTrue( find( "child1-1-tests.jar", compileClassPath ) );
+
+ }
+
+ private boolean find( String pathSubstr, List classPath )
+ {
+ for ( Iterator it = classPath.iterator(); it.hasNext(); )
+ {
+ String path = (String) it.next();
+
+ if ( path.indexOf( pathSubstr ) > -1 )
+ {
+ return true;
+ }
+ }
+
+ return false;
}
}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/child1/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/child2/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/child3/
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/pom.xml
(from r742603,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/pom.xml?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/pom.xml&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/pom.xml&r1=742603&r2=742607&rev=742607&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/project-hierarchy/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/pom.xml
Mon Feb 9 16:44:09 2009
@@ -5,7 +5,7 @@
<artifactId>project-hierarchy</artifactId>
<packaging>pom</packaging>
<version>1</version>
- <name>MNG-2720 Project Hierarchy 1</name>
+ <name>MNG-2720 Project Hierarchy</name>
<modules>
<module>child1</module>
@@ -16,16 +16,19 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.its.mng2720</groupId>
- <artifactId>maven-mng2720-plugin</artifactId>
- <version>1</version>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
<executions>
<execution>
- <id>test</id>
+ <id>compile-classpath</id>
<phase>package</phase>
<goals>
- <goal>test</goal>
+ <goal>compile</goal>
</goals>
+ <configuration>
+
<compileClassPath>${project.build.directory}/compile.classpath</compileClassPath>
+ </configuration>
</execution>
</executions>
</plugin>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2720/pom.xml
------------------------------------------------------------------------------
svn:mergeinfo =
