From 41f63c2abff3fc7117047f6ea8dc3854e51da6a1 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sat, 13 Jun 2009 09:48:05 +0000 Subject: [PATCH] o Extended IT to check dependency with classifier, too git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@784355 13f79535-47bb-0310-9956-ffa450edef68 --- .../MavenIT0142DirectDependencyScopesTest.java | 12 ++++++++---- .../src/test/resources/it0142/pom-template.xml | 8 ++++++++ .../its/it0142/runtime/0.1/runtime-0.1-retro.jar | Bin 0 -> 2951 bytes 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 its/core-it-suite/src/test/resources/it0142/repo/org/apache/maven/its/it0142/runtime/0.1/runtime-0.1-retro.jar diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java index 09a27019b6..c19395bc42 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java @@ -81,21 +81,24 @@ public class MavenIT0142DirectDependencyScopesTest List runtimeArtifacts = verifier.loadLines( "target/runtime-artifacts.txt", "UTF-8" ); assertTrue( runtimeArtifacts.toString(), runtimeArtifacts.contains( "org.apache.maven.its.it0142:compile:jar:0.1" ) ); assertTrue( runtimeArtifacts.toString(), runtimeArtifacts.contains( "org.apache.maven.its.it0142:runtime:jar:0.1" ) ); - assertEquals( 2, runtimeArtifacts.size() ); + assertTrue( runtimeArtifacts.toString(), runtimeArtifacts.contains( "org.apache.maven.its.it0142:runtime:jar:retro:0.1" ) ); + assertEquals( 3, runtimeArtifacts.size() ); List runtimeClassPath = verifier.loadLines( "target/runtime-cp.txt", "UTF-8" ); assertTrue( runtimeClassPath.toString(), runtimeClassPath.contains( "classes" ) ); assertTrue( runtimeClassPath.toString(), runtimeClassPath.contains( "compile-0.1.jar" ) ); assertTrue( runtimeClassPath.toString(), runtimeClassPath.contains( "runtime-0.1.jar" ) ); - assertEquals( 3, runtimeClassPath.size() ); + assertTrue( runtimeClassPath.toString(), runtimeClassPath.contains( "runtime-0.1-retro.jar" ) ); + assertEquals( 4, runtimeClassPath.size() ); List testArtifacts = verifier.loadLines( "target/test-artifacts.txt", "UTF-8" ); assertTrue( testArtifacts.toString(), testArtifacts.contains( "org.apache.maven.its.it0142:system:jar:0.1" ) ); assertTrue( testArtifacts.toString(), testArtifacts.contains( "org.apache.maven.its.it0142:provided:jar:0.1" ) ); assertTrue( testArtifacts.toString(), testArtifacts.contains( "org.apache.maven.its.it0142:compile:jar:0.1" ) ); assertTrue( testArtifacts.toString(), testArtifacts.contains( "org.apache.maven.its.it0142:runtime:jar:0.1" ) ); + assertTrue( testArtifacts.toString(), testArtifacts.contains( "org.apache.maven.its.it0142:runtime:jar:retro:0.1" ) ); assertTrue( testArtifacts.toString(), testArtifacts.contains( "org.apache.maven.its.it0142:test:jar:0.1" ) ); - assertEquals( 5, testArtifacts.size() ); + assertEquals( 6, testArtifacts.size() ); List testClassPath = verifier.loadLines( "target/test-cp.txt", "UTF-8" ); assertTrue( testClassPath.toString(), testClassPath.contains( "classes" ) ); @@ -104,8 +107,9 @@ public class MavenIT0142DirectDependencyScopesTest assertTrue( testClassPath.toString(), testClassPath.contains( "provided-0.1.jar" ) ); assertTrue( testClassPath.toString(), testClassPath.contains( "compile-0.1.jar" ) ); assertTrue( testClassPath.toString(), testClassPath.contains( "runtime-0.1.jar" ) ); + assertTrue( testClassPath.toString(), testClassPath.contains( "runtime-0.1-retro.jar" ) ); assertTrue( testClassPath.toString(), testClassPath.contains( "test-0.1.jar" ) ); - assertEquals( 7, testClassPath.size() ); + assertEquals( 8, testClassPath.size() ); } } diff --git a/its/core-it-suite/src/test/resources/it0142/pom-template.xml b/its/core-it-suite/src/test/resources/it0142/pom-template.xml index 577292ad3d..da5f96e762 100644 --- a/its/core-it-suite/src/test/resources/it0142/pom-template.xml +++ b/its/core-it-suite/src/test/resources/it0142/pom-template.xml @@ -50,6 +50,14 @@ under the License. 0.1 runtime + + + org.apache.maven.its.it0142 + runtime + 0.1 + runtime + retro + org.apache.maven.its.it0142 test diff --git a/its/core-it-suite/src/test/resources/it0142/repo/org/apache/maven/its/it0142/runtime/0.1/runtime-0.1-retro.jar b/its/core-it-suite/src/test/resources/it0142/repo/org/apache/maven/its/it0142/runtime/0.1/runtime-0.1-retro.jar new file mode 100644 index 0000000000000000000000000000000000000000..1f3afea587a7a12dc9eee1a3f130eb5e1ab09ed2 GIT binary patch literal 2951 zcmWIWW@h1H0D;JbO_pE=l;8x?zOEsTx}JV+`TuQ}lbAEG>!4=~NPm6TC&YjTl)^*}wf3hTOikS8R zm5QBnx`TwhgMv%uYONKK;TD=~93)yJd^+eeP{zx+*z3R}zjc1=1nRohg?pKuC@{8d zu3#>X(~Hw%Ky{XKot38mGXsMk8v_G7&{+lfxq213Ijte5^KKgm?BTv(pVKQh>44B& zh4w|EB0D^LxO{UJilm-+cyBr5q7*u*D@o+Q3Zt*tcgt4j&@?QJf-(UGM>Y+2UA$3ATS%Io)sQzoJ5b|&t=e^qNq3^RQ}_vk<)#tgZzE*(_poqHBtYZR4m48_EF0SAyzxe6)qcYC&%d=;{ ztdWd8x?x9S_t8H_QEuIq^U@6F-rs%hdq$llTbo*<^tTu-Z+Xk2*9zY3)tA3-ufFKx zI$h^s_Phl;6GKgsCwSheOuW7*Wz~aQeSyk*MZ_0ASQaVw)+*oR=eoz0Z>u$?)+BUt zuKnt$7(A`~wZObz!u3KE#5b0?I4(;Gb<6CS{IWgdg1TBw-|X{epZxfuqEH(Y>^Svd z_ACjT)m{>D8ya|$eEq)H9qz1`nXo+8ea}I$eiP@p51B(5Z^~QS?f#i?lwa$D)NhX2 zQF}tyOquoA`fizE&qtFSiE7S$sr|DXK9tl)ue8~s-B;~l_b)E+PiVo{_J{=yH%{}- z+|$H&!hYr!t0_kuCC`=gU$~Vv!)#yOlhllm)^mIMw%yQQHT%MgX1>!k3P4CxZQ-jP3kY%i{FDAgw~UhG{Gn{#0D9>rhs zuf+Bps6V+bVE^)`yzlH5So>GAOPB9%{~!*_G?-bQA2~1QCYGh;{cR>bB+Xz% z`3|!HdkGJ-VoBpJ@+`mzUhF9xVUH3ANg)LD2*@5pdJphs1vXC^7&w5ihKYgUE6`8| F1^}>9V|M@m literal 0 HcmV?d00001