From b68956f74a18fe50d7ece3f3212c18c08f579973 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Fri, 16 Jan 2009 22:14:51 +0000 Subject: [PATCH] o Decoupled mng-0249 from production plugins git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@735158 13f79535-47bb-0310-9956-ffa450edef68 --- ...enITmng0249ResolveDepsFromReactorTest.java | 34 +++--- .../src/test/resources/mng-0249/pom.xml | 32 +++++- .../test-component-a/classes/test.properties | 1 + .../mng-0249/test-component-a/pom.xml | 63 +++++++++-- .../test-component-a/src/main/java/A.java | 5 - .../test-component-b/classes/test.properties | 1 + .../mng-0249/test-component-b/pom.xml | 78 +++++++++++--- .../test-component-b/src/main/java/B.java | 7 -- .../test-component-c/classes/test.properties | 1 + .../mng-0249/test-component-c/pom.xml | 102 +++++++++++++++--- .../test-component-c/src/main/java/C.java | 7 -- .../src/main/webapp/WEB-INF/web.xml | 5 - 12 files changed, 263 insertions(+), 73 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/mng-0249/test-component-a/classes/test.properties delete mode 100644 its/core-it-suite/src/test/resources/mng-0249/test-component-a/src/main/java/A.java create mode 100644 its/core-it-suite/src/test/resources/mng-0249/test-component-b/classes/test.properties delete mode 100644 its/core-it-suite/src/test/resources/mng-0249/test-component-b/src/main/java/B.java create mode 100644 its/core-it-suite/src/test/resources/mng-0249/test-component-c/classes/test.properties delete mode 100644 its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/java/C.java delete mode 100644 its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/webapp/WEB-INF/web.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java index 8f7bc17c6f..80928d915b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java @@ -23,6 +23,7 @@ import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +import java.util.List; /** * This is a test set for MNG-249. @@ -35,24 +36,33 @@ public class MavenITmng0249ResolveDepsFromReactorTest { /** - * Test that the reactor can establish the artifact location of known projects for dependencies + * Test that the reactor can establish the artifact location of known projects for dependencies. */ - public void testitMNG249() + public void testitMNG0249() throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0249" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.executeGoal( "package" ); - verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" ); - verifier.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" ); - verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-a-0.1.jar" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar" ); + verifier.setAutoclean( false ); + verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - } -} + List ccp = verifier.loadLines( "test-component-c/target/compile.txt", "UTF-8" ); + assertTrue( ccp.toString(), ccp.contains( "test-component-c/classes" ) ); + assertTrue( ccp.toString(), ccp.contains( "test-component-b/classes" ) ); + assertTrue( ccp.toString(), ccp.contains( "test-component-a/classes" ) ); + List rcp = verifier.loadLines( "test-component-c/target/runtime.txt", "UTF-8" ); + assertTrue( rcp.toString(), rcp.contains( "test-component-c/classes" ) ); + assertTrue( rcp.toString(), rcp.contains( "test-component-b/classes" ) ); + assertTrue( rcp.toString(), rcp.contains( "test-component-a/classes" ) ); + + List tcp = verifier.loadLines( "test-component-c/target/test.txt", "UTF-8" ); + assertTrue( tcp.toString(), tcp.contains( "test-component-c/classes" ) ); + assertTrue( tcp.toString(), tcp.contains( "test-component-b/classes" ) ); + assertTrue( tcp.toString(), tcp.contains( "test-component-a/classes" ) ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-0249/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/pom.xml index 9f5be434a8..3e22493623 100644 --- a/its/core-it-suite/src/test/resources/mng-0249/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0249/pom.xml @@ -1,11 +1,35 @@ + + + + 4.0.0 - Maven Integration Test :: it0042 - org.apache.maven.its.it0042 - maven-it-it0042 - Test that the reactor can establish the artifact location of known projects for dependencies + + org.apache.maven.its.mng0249 + parent 0.1 pom + + Maven Integration Test :: MNG-249 + Test that the reactor can establish the artifact location of known projects for dependencies + test-component-c test-component-b diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-a/classes/test.properties b/its/core-it-suite/src/test/resources/mng-0249/test-component-a/classes/test.properties new file mode 100644 index 0000000000..dd2ee08570 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0249/test-component-a/classes/test.properties @@ -0,0 +1 @@ +key = value diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-a/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/test-component-a/pom.xml index 379c5cad60..1847115ddf 100644 --- a/its/core-it-suite/src/test/resources/mng-0249/test-component-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0249/test-component-a/pom.xml @@ -1,12 +1,63 @@ + + + + 4.0.0 - - maven-it-it0042 - org.apache.maven.its.it0042 - 0.1 - + + + org.apache.maven.its.mng0249 + parent + 0.1 + + test-component-a 0.1 - Test Component A jar + + Maven Integration Test :: MNG-249 :: Test Component A + + + classes + + + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + + + + compile + validate + + classes + + + set + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-a/src/main/java/A.java b/its/core-it-suite/src/test/resources/mng-0249/test-component-a/src/main/java/A.java deleted file mode 100644 index 3b769edb37..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0249/test-component-a/src/main/java/A.java +++ /dev/null @@ -1,5 +0,0 @@ -package it0042; - -public class A { -} - diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-b/classes/test.properties b/its/core-it-suite/src/test/resources/mng-0249/test-component-b/classes/test.properties new file mode 100644 index 0000000000..dd2ee08570 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0249/test-component-b/classes/test.properties @@ -0,0 +1 @@ +key = value diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-b/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/test-component-b/pom.xml index 1ced58c70f..e967d1cb5e 100644 --- a/its/core-it-suite/src/test/resources/mng-0249/test-component-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0249/test-component-b/pom.xml @@ -1,19 +1,71 @@ + + + + 4.0.0 - - maven-it-it0042 - org.apache.maven.its.it0042 - 0.1 - + + + org.apache.maven.its.mng0249 + parent + 0.1 + + test-component-b 0.1 - Test Component B jar - - - org.apache.maven.its.it0042 - test-component-a - 0.1 - - + + Maven Integration Test :: MNG-249 :: Test Component B + + + + org.apache.maven.its.mng0249 + test-component-a + 0.1 + + + + + classes + + + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + + + + compile + validate + + classes + + + set + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-b/src/main/java/B.java b/its/core-it-suite/src/test/resources/mng-0249/test-component-b/src/main/java/B.java deleted file mode 100644 index 4ea9caf2e1..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0249/test-component-b/src/main/java/B.java +++ /dev/null @@ -1,7 +0,0 @@ -package it0042; - -public class B - extends A -{ -} - diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-c/classes/test.properties b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/classes/test.properties new file mode 100644 index 0000000000..dd2ee08570 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/classes/test.properties @@ -0,0 +1 @@ +key = value diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-c/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/pom.xml index 58fa1e129d..045f9f44b2 100644 --- a/its/core-it-suite/src/test/resources/mng-0249/test-component-c/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/pom.xml @@ -1,20 +1,94 @@ + + + + 4.0.0 - - maven-it-it0042 - org.apache.maven.its.it0042 - 0.1 - + + + org.apache.maven.its.mng0249 + parent + 0.1 + test-component-c 0.1 - Test Component C - war - - - org.apache.maven.its.it0042 - test-component-b - 0.1 - - + jar + + Maven Integration Test :: MNG-249 :: Test Component C + + + + + org.apache.maven.its.mng0249 + test-component-b + 0.1 + + + + + classes + + + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + + + + compile + validate + + classes + + + set + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + + resolve + validate + + target/compile.txt + target/runtime.txt + target/test.txt + 2 + + + compile + runtime + test + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/java/C.java b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/java/C.java deleted file mode 100644 index 577f29017d..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/java/C.java +++ /dev/null @@ -1,7 +0,0 @@ -package it0042; - -public class C - extends A -{ -} - diff --git a/its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/webapp/WEB-INF/web.xml b/its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 92bb2e9825..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0249/test-component-c/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - -