You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/13 11:48:05 UTC
svn commit: r784355 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0142/
resources/it0142/repo/org/apache/maven/its/it0142/runtime/0.1/
Author: bentmann
Date: Sat Jun 13 09:48:05 2009
New Revision: 784355
URL: http://svn.apache.org/viewvc?rev=784355&view=rev
Log:
o Extended IT to check dependency with classifier, too
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0142/repo/org/apache/maven/its/it0142/runtime/0.1/runtime-0.1-retro.jar
- copied unchanged from r783444, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0142/repo/org/apache/maven/its/it0142/runtime/0.1/runtime-0.1.jar
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0142/pom-template.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java?rev=784355&r1=784354&r2=784355&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java Sat Jun 13 09:48:05 2009
@@ -81,21 +81,24 @@
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 @@
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() );
}
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0142/pom-template.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0142/pom-template.xml?rev=784355&r1=784354&r2=784355&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0142/pom-template.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0142/pom-template.xml Sat Jun 13 09:48:05 2009
@@ -51,6 +51,14 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <!-- just to have a classifier in the mix as well -->
+ <groupId>org.apache.maven.its.it0142</groupId>
+ <artifactId>runtime</artifactId>
+ <version>0.1</version>
+ <scope>runtime</scope>
+ <classifier>retro</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.its.it0142</groupId>
<artifactId>test</artifactId>
<version>0.1</version>