diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java
index 79189b5c89..8c4ac02440 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010Test.java
@@ -23,6 +23,7 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.List;
public class MavenIT0010Test
extends AbstractMavenIntegrationTestCase
@@ -31,22 +32,28 @@ public class MavenIT0010Test
/**
* Since the artifact resolution does not use the project builder, we must
* ensure that the full hierarchy of all dependencies is resolved. This
- * includes the dependencies of the parent-pom's of dependencies. This test
- * will check this, by depending on classworlds, which is a dependency of
- * maven-component, which is the parent of maven-plugin, which is an
- * explicit dependency of this test.
- * # TODO: must correct the assumptions of this test
+ * includes the dependencies of the parent-pom's of dependencies.
*/
public void testit0010()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0010" );
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0010/PersonFinder.class" );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
+ verifier.deleteArtifacts( "org.apache.maven.its.it0010" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- }
-}
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0010", "a", "0.1", "jar" );
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0010", "b", "0.2", "jar" );
+ verifier.assertArtifactPresent( "org.apache.maven.its.it0010", "parent", "1.0", "pom" );
+ List artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.it0010:a:jar:0.1" ) );
+ assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.it0010:b:jar:0.2" ) );
+ }
+
+}
diff --git a/its/core-it-suite/src/test/resources/it0010/pom.xml b/its/core-it-suite/src/test/resources/it0010/pom.xml
index 987c7947c2..d81e4a9ba2 100644
--- a/its/core-it-suite/src/test/resources/it0010/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0010/pom.xml
@@ -1,32 +1,81 @@
+
+
+
+
4.0.0
- Maven Integration Test :: it0010
+
org.apache.maven.its.it0010
- maven-it-it0010
- Since the artifact resolution does not use the project builder, we must
- ensure that the full hierarchy of all dependencies is resolved. This
- includes the dependencies of the parent-pom's of dependencies. This test
- will check this, by depending on classworlds, which is a dependency of
- maven-component, which is the parent of maven-plugin, which is an
- explicit dependency of this test.
- # TODO: must correct the assumptions of this test
-
- jar
+ test
1.0
+ jar
+
+ Maven Integration Test :: it0010
+
+ Since the artifact resolution does not use the project builder, we must
+ ensure that the full hierarchy of all dependencies is resolved. This
+ includes the dependencies of the parent-pom's of dependencies.
+
+
+
+
+ maven-core-it
+ file:///${basedir}/repo
+
+ ignore
+
+
+ ignore
+
+
+
+
- org.apache.maven
- maven-plugin-api
- 2.0-beta-1
+ org.apache.maven.its.it0010
+ a
+ 0.1
jar
compile
-
- junit
- junit
- 3.8.1
- jar
- test
-
+
+
+
+
+ org.apache.maven.its.plugins
+ maven-it-plugin-dependency-resolution
+ 2.1-SNAPSHOT
+
+ target/compile.txt
+
+
+
+ test
+ validate
+
+ compile
+
+
+
+
+
+
diff --git a/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.jar b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.jar
new file mode 100644
index 0000000000..796b7aa6f9
Binary files /dev/null and b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.jar differ
diff --git a/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.pom b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.pom
new file mode 100644
index 0000000000..b153e09725
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/0.1/a-0.1.pom
@@ -0,0 +1,45 @@
+
+
+
+
+
+ 4.0.0
+
+
+ org.apache.maven.its.it0010
+ parent
+ 1.0
+
+
+ a
+ 0.1
+ jar
+
+
+
+ maven-core-it
+ file:///${basedir}/repo
+
+
+
+
+ true
+
+
diff --git a/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml
new file mode 100644
index 0000000000..4ccb15345c
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/a/maven-metadata.xml
@@ -0,0 +1,12 @@
+
+ org.apache.maven.its.it0010
+ a
+ 0.1
+
+ 0.1
+
+ 0.1
+
+ 20081229185855
+
+
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.jar b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.jar
new file mode 100644
index 0000000000..85d2deadb0
Binary files /dev/null and b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.jar differ
diff --git a/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.pom b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.pom
new file mode 100644
index 0000000000..2b4cf5fde8
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/0.2/b-0.2.pom
@@ -0,0 +1,40 @@
+
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.its.it0010
+ b
+ 0.2
+ jar
+
+
+
+ maven-core-it
+ file:///${basedir}/repo
+
+
+
+
+ true
+
+
diff --git a/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml
new file mode 100644
index 0000000000..7e549dfee3
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/b/maven-metadata.xml
@@ -0,0 +1,12 @@
+
+ org.apache.maven.its.it0010
+ b
+ 0.2
+
+ 0.2
+
+ 0.2
+
+ 20081229185350
+
+
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/parent-1.0.pom b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/parent-1.0.pom
new file mode 100644
index 0000000000..6ba23e25bd
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/1.0/parent-1.0.pom
@@ -0,0 +1,48 @@
+
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.its.it0010
+ parent
+ 1.0
+ pom
+
+
+
+ maven-core-it
+ file:///${basedir}/repo
+
+
+
+
+ true
+
+
+
+
+ org.apache.maven.its.it0010
+ b
+ 0.2
+
+
+
diff --git a/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml
new file mode 100644
index 0000000000..2f2227c1e5
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0010/repo/org/apache/maven/its/it0010/parent/maven-metadata.xml
@@ -0,0 +1,12 @@
+
+ org.apache.maven.its.it0010
+ parent
+ 1.0
+
+ 1.0
+
+ 1.0
+
+ 20081229185535
+
+
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/it0010/src/main/java/org/apache/maven/it0010/PersonFinder.java b/its/core-it-suite/src/test/resources/it0010/src/main/java/org/apache/maven/it0010/PersonFinder.java
deleted file mode 100644
index f7097b08d1..0000000000
--- a/its/core-it-suite/src/test/resources/it0010/src/main/java/org/apache/maven/it0010/PersonFinder.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.apache.maven.it0010;
-
-public class PersonFinder
-{
- public void findPerson()
- throws Exception
- {
- // look it up at runtime, but do not require it at compile time
- Class.forName( "org.codehaus.classworlds.ClassRealm" );
- }
-}
diff --git a/its/core-it-suite/src/test/resources/it0010/src/test/java/org/apache/maven/it0010/PersonFinderTest.java b/its/core-it-suite/src/test/resources/it0010/src/test/java/org/apache/maven/it0010/PersonFinderTest.java
deleted file mode 100644
index ce2ff39dbd..0000000000
--- a/its/core-it-suite/src/test/resources/it0010/src/test/java/org/apache/maven/it0010/PersonFinderTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.apache.maven.it0010;
-
-import junit.framework.TestCase;
-
-public class PersonFinderTest
- extends TestCase
-{
- public void testFindPerson()
- throws Exception
- {
- // should be no exceptions
- new PersonFinder().findPerson();
- }
-}