Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78C28D716 for ; Sat, 27 Oct 2012 12:21:25 +0000 (UTC) Received: (qmail 48386 invoked by uid 500); 27 Oct 2012 12:21:24 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 48173 invoked by uid 500); 27 Oct 2012 12:21:23 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 48146 invoked by uid 99); 27 Oct 2012 12:21:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Oct 2012 12:21:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Oct 2012 12:21:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 459D623888E4; Sat, 27 Oct 2012 12:20:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1402786 - in /maven/maven-3/trunk/maven-aether-provider/src/test: java/org/apache/maven/repository/internal/ resources/repo/ut/simple/artifact/1.0/ resources/repo/ut/simple/dependency/1.0/ Date: Sat, 27 Oct 2012 12:20:38 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121027122038.459D623888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hboutemy Date: Sat Oct 27 12:20:37 2012 New Revision: 1402786 URL: http://svn.apache.org/viewvc?rev=1402786&view=rev Log: added dependency with classifier test Added: maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar (with props) Modified: maven/maven-3/trunk/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom Modified: maven/maven-3/trunk/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java?rev=1402786&r1=1402785&r2=1402786&view=diff ============================================================================== --- maven/maven-3/trunk/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java (original) +++ maven/maven-3/trunk/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java Sat Oct 27 12:20:37 2012 @@ -65,12 +65,12 @@ public class RepositorySystemTest Artifact artifact = new DefaultArtifact( artifactCoords ); CollectRequest collectRequest = new CollectRequest(); - collectRequest.setRoot( new Dependency( artifact, "" ) ); + collectRequest.setRoot( new Dependency( artifact, null ) ); collectRequest.addRepository( newTestRepository() ); CollectResult collectResult = system.collectDependencies( session, collectRequest ); - assertEquals( 1, collectResult.getRoot().getChildren().size() ); + assertEquals( 2, collectResult.getRoot().getChildren().size() ); Dependency dep = collectResult.getRoot().getChildren().get( 0 ).getDependency(); assertEquals( "compile", dep.getScope() ); assertFalse( dep.isOptional() ); @@ -89,6 +89,25 @@ public class RepositorySystemTest assertEquals( "true", depArtifact.getProperty( "constitutesBuildPath", null ) ); assertEquals( "false", depArtifact.getProperty( "includesDependencies", null ) ); assertEquals( 4, depArtifact.getProperties().size() ); + + dep = collectResult.getRoot().getChildren().get( 1 ).getDependency(); + assertEquals( "compile", dep.getScope() ); + assertFalse( dep.isOptional() ); + assertEquals( 0, dep.getExclusions().size() ); + depArtifact = dep.getArtifact(); + assertEquals( "ut.simple", depArtifact.getGroupId() ); + assertEquals( "dependency", depArtifact.getArtifactId() ); + assertEquals( "1.0", depArtifact.getVersion() ); + assertEquals( "1.0", depArtifact.getBaseVersion() ); + assertNull( depArtifact.getFile() ); + assertFalse( depArtifact.isSnapshot() ); + assertEquals( "sources", depArtifact.getClassifier() ); + assertEquals( "jar", depArtifact.getExtension() ); + assertEquals( "java", depArtifact.getProperty( "language", null ) ); + assertEquals( "jar", depArtifact.getProperty( "type", null ) ); // shouldn't it be java-sources given the classifier? + assertEquals( "true", depArtifact.getProperty( "constitutesBuildPath", null ) ); // shouldn't it be false given the classifier? + assertEquals( "false", depArtifact.getProperty( "includesDependencies", null ) ); + assertEquals( 4, depArtifact.getProperties().size() ); } public static RepositorySystemSession newMavenRepositorySystemSession( RepositorySystem system ) Modified: maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom?rev=1402786&r1=1402785&r2=1402786&view=diff ============================================================================== --- maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom (original) +++ maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom Sat Oct 27 12:20:37 2012 @@ -38,5 +38,11 @@ ut.simple dependency + + ut.simple + dependency + 1.0 + sources + \ No newline at end of file Added: maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar?rev=1402786&view=auto ============================================================================== Binary file - no diff available. Propchange: maven/maven-3/trunk/maven-aether-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream