Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 80883 invoked from network); 29 Apr 2009 22:42:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Apr 2009 22:42:36 -0000 Received: (qmail 27677 invoked by uid 500); 29 Apr 2009 22:42:36 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 27599 invoked by uid 500); 29 Apr 2009 22:42:36 -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 27590 invoked by uid 99); 29 Apr 2009 22:42:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2009 22:42:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 29 Apr 2009 22:42:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E9D123888A6; Wed, 29 Apr 2009 22:42:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r769976 - /maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java Date: Wed, 29 Apr 2009 22:42:15 -0000 To: commits@maven.apache.org From: jdcasey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090429224215.6E9D123888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdcasey Date: Wed Apr 29 22:42:15 2009 New Revision: 769976 URL: http://svn.apache.org/viewvc?rev=769976&view=rev Log: [MNG-2365] Adding unit test from patch, to verify test vs. compile classpath ordering. Modified: maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java Modified: maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=769976&r1=769975&r2=769976&view=diff ============================================================================== --- maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java (original) +++ maven/components/branches/maven-2.2.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java Wed Apr 29 22:42:15 2009 @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; +import org.apache.maven.artifact.DependencyResolutionRequiredException; import org.apache.maven.artifact.versioning.ManagedVersionMap; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Model; @@ -33,6 +34,22 @@ extends AbstractMavenProjectTestCase { + public void testTestClasspathOrdering() + throws DependencyResolutionRequiredException + { + Model model = new Model(); + + MavenProject project = new MavenProject( model ); + project.getBuild().setOutputDirectory( "main" ); + project.getBuild().setTestOutputDirectory( "test" ); + + List testClasspath = project.getTestClasspathElements(); + + // test-classes should be before main-classes, see MNG-3118 + assertEquals( "test", new File( (String) testClasspath.get( 0 ) ).getName() ); + assertEquals( "main", new File( (String) testClasspath.get( 1 ) ).getName() ); + } + public void testShouldInterpretChildPathAdjustmentBasedOnModulePaths() throws IOException { @@ -46,7 +63,9 @@ MavenProject childProject = new MavenProject( childModel ); - File childFile = new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis() + "/child/pom.xml" ); + File childFile = + new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis() + + "/child/pom.xml" ); childProject.setFile( childFile ); @@ -85,7 +104,7 @@ MavenProject project = new MavenProject(); assertEquals( MavenProject.EMPTY_PROJECT_GROUP_ID + ":" + MavenProject.EMPTY_PROJECT_ARTIFACT_ID + ":jar:" - + MavenProject.EMPTY_PROJECT_VERSION, project.getId() ); + + MavenProject.EMPTY_PROJECT_VERSION, project.getId() ); } public void testClone() @@ -97,8 +116,8 @@ MavenProject clonedProject = (MavenProject) projectToClone.clone(); assertEquals( "maven-core", clonedProject.getArtifactId() ); Map clonedMap = clonedProject.getManagedVersionMap(); - assertNotNull("ManagedVersionMap not copied", clonedMap); - assertTrue("ManagedVersionMap is not empty", clonedMap.isEmpty()); + assertNotNull( "ManagedVersionMap not copied", clonedMap ); + assertTrue( "ManagedVersionMap is not empty", clonedMap.isEmpty() ); } public void testCloneWithDependencyManagement() @@ -107,22 +126,23 @@ File f = getFileForClasspathResource( "dependencyManagement-pom.xml" ); MavenProject projectToClone = getProjectWithDependencies( f ); DependencyManagement dep = projectToClone.getDependencyManagement(); - assertNotNull("No dependencyManagement", dep); + assertNotNull( "No dependencyManagement", dep ); List list = dep.getDependencies(); - assertNotNull("No dependencies", list); - assertTrue("Empty dependency list", !list.isEmpty()); + assertNotNull( "No dependencies", list ); + assertTrue( "Empty dependency list", !list.isEmpty() ); Map map = projectToClone.getManagedVersionMap(); - assertNotNull("No ManagedVersionMap", map); - assertTrue("ManagedVersionMap is empty", !map.isEmpty()); + assertNotNull( "No ManagedVersionMap", map ); + assertTrue( "ManagedVersionMap is empty", !map.isEmpty() ); MavenProject clonedProject = (MavenProject) projectToClone.clone(); assertEquals( "maven-core", clonedProject.getArtifactId() ); Map clonedMap = clonedProject.getManagedVersionMap(); - assertNotNull("ManagedVersionMap not copied", clonedMap); - assertTrue("ManagedVersionMap is empty", !clonedMap.isEmpty()); - assertTrue("Not a ManagedVersionMap", clonedMap instanceof ManagedVersionMap); - assertTrue("ManagedVersionMap does not contain test key", clonedMap.containsKey("maven-test:maven-test-b:jar")); + assertNotNull( "ManagedVersionMap not copied", clonedMap ); + assertTrue( "ManagedVersionMap is empty", !clonedMap.isEmpty() ); + assertTrue( "Not a ManagedVersionMap", clonedMap instanceof ManagedVersionMap ); + assertTrue( "ManagedVersionMap does not contain test key", + clonedMap.containsKey( "maven-test:maven-test-b:jar" ) ); } public void testGetModulePathAdjustment() @@ -143,14 +163,16 @@ assertEquals( "..", pathAdjustment ); } - - public void testCloneWithDistributionManagement() throws Exception + + public void testCloneWithDistributionManagement() + throws Exception { - + File f = getFileForClasspathResource( "distributionManagement-pom.xml" ); MavenProject projectToClone = getProject( f ); MavenProject clonedProject = (MavenProject) projectToClone.clone(); - assertNotNull( "clonedProject - distributionManagement", clonedProject.getDistributionManagementArtifactRepository() ); + assertNotNull( "clonedProject - distributionManagement", + clonedProject.getDistributionManagementArtifactRepository() ); } }