diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java index 5a6459449e..52589ddd10 100644 --- a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java @@ -19,8 +19,6 @@ package org.apache.maven.embedder; * under the License. */ -import junit.framework.TestCase; -import org.apache.maven.settings.SettingsConfigurationException; import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequest; @@ -32,6 +30,7 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Profile; import org.apache.maven.settings.Repository; import org.apache.maven.settings.Settings; +import org.apache.maven.settings.SettingsConfigurationException; import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader; import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer; import org.codehaus.plexus.util.FileUtils; @@ -49,6 +48,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import junit.framework.TestCase; + public class MavenEmbedderTest extends TestCase { @@ -206,7 +207,7 @@ public class MavenEmbedderTest /** * Test that two executions of the embedder don't share data that has changed, see MNG-3013 - * + * * @throws Exception */ public void testTwoExecutionsDoNotCacheChangedData() @@ -325,6 +326,18 @@ public class MavenEmbedderTest artifacts.iterator().next(); } + public void testProjectReading_FromChildLevel_ScmInheritanceCalculations() + throws Exception + { + File pomFile = new File( basedir, "src/test/projects/readProject-withScmInheritance/modules/child1/pom.xml" ); + + MavenProject project = maven.readProject( pomFile ); + + assertEquals( "http://host/viewer?path=/trunk/parent/modules/child1", project.getScm().getUrl() ); + assertEquals( "scm:svn:http://host/trunk/parent/modules/child1", project.getScm().getConnection() ); + assertEquals( "scm:svn:https://host/trunk/parent/modules/child1", project.getScm().getDeveloperConnection() ); + } + /* public void testProjectReadingWithDistributionStatus() throws Exception diff --git a/maven-embedder/src/test/projects/readProject-withScmInheritance/modules/child1/pom.xml b/maven-embedder/src/test/projects/readProject-withScmInheritance/modules/child1/pom.xml new file mode 100755 index 0000000000..d269726d5a --- /dev/null +++ b/maven-embedder/src/test/projects/readProject-withScmInheritance/modules/child1/pom.xml @@ -0,0 +1,13 @@ + + 4.0.0 + + + scm.inherit + parent + 1 + ../../pom.xml + + + child1 + + \ No newline at end of file diff --git a/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml b/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml new file mode 100755 index 0000000000..cec339e7fd --- /dev/null +++ b/maven-embedder/src/test/projects/readProject-withScmInheritance/pom.xml @@ -0,0 +1,19 @@ + + 4.0.0 + + scm.inherit + parent + 1 + pom + + + scm:svn:http://host/trunk/parent + scm:svn:https://host/trunk/parent + http://host/viewer?path=/trunk/parent + + + + modules/child1 + + + \ No newline at end of file diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java new file mode 100644 index 0000000000..0b641b4620 --- /dev/null +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java @@ -0,0 +1,100 @@ +package org.apache.maven.project.inheritance.t12scm; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase; + +import java.io.File; + +/** + * Verifies SCM inheritance uses modules statement from parent. + * + * @author jdcasey + * @version $Id$ + */ +public class ProjectInheritanceTest + extends AbstractProjectInheritanceTestCase +{ + // ---------------------------------------------------------------------- + // + // p1 inherits from p0 + // p0 inhertis from super model + // + // or we can show it graphically as: + // + // p1 ---> p0 --> super model + // + // ---------------------------------------------------------------------- + + public void testScmInfoCalculatedCorrectlyOnParentAndChildRead() + throws Exception + { + File localRepo = getLocalRepositoryPath(); + + File pom0 = new File( localRepo, "p0/pom.xml" ); + File pom0Basedir = pom0.getParentFile(); + File pom1 = new File( pom0Basedir, "modules/p1/pom.xml" ); + + // load the child project, which inherits from p0... + MavenProject project0 = getProject( pom0 ); + MavenProject project1 = getProject( pom1 ); + + System.out.println( "\n\n" ); + System.out.println( "Parent SCM URL is: " + project0.getScm().getUrl() ); + System.out.println( "Child SCM URL is: " + project1.getScm().getUrl() ); + System.out.println(); + System.out.println( "Parent SCM connection is: " + project0.getScm().getConnection() ); + System.out.println( "Child SCM connection is: " + project1.getScm().getConnection() ); + System.out.println(); + System.out.println( "Parent SCM developer connection is: " + + project0.getScm().getDeveloperConnection() ); + System.out.println( "Child SCM developer connection is: " + + project1.getScm().getDeveloperConnection() ); + + assertEquals( project1.getScm().getUrl(), project0.getScm().getUrl() + "/modules/p1" ); + assertEquals( project1.getScm().getConnection(), project0.getScm().getConnection() + + "/modules/p1" ); + assertEquals( project1.getScm().getDeveloperConnection(), project0.getScm() + .getDeveloperConnection() + + "/modules/p1" ); + } + + public void testScmInfoCalculatedCorrectlyOnChildOnlyRead() + throws Exception + { + File localRepo = getLocalRepositoryPath(); + + File pom1 = new File( localRepo, "p0/modules/p1/pom.xml" ); + + // load the child project, which inherits from p0... + MavenProject project1 = getProject( pom1 ); + + System.out.println( "\n\n" ); + System.out.println( "Child SCM URL is: " + project1.getScm().getUrl() ); + System.out.println( "Child SCM connection is: " + project1.getScm().getConnection() ); + System.out.println( "Child SCM developer connection is: " + + project1.getScm().getDeveloperConnection() ); + + assertEquals( project1.getScm().getUrl(), "http://host/viewer?path=/p0/modules/p1" ); + assertEquals( project1.getScm().getConnection(), "scm:svn:http://host/p0/modules/p1" ); + assertEquals( project1.getScm().getDeveloperConnection(), "scm:svn:https://host/p0/modules/p1" ); + } +} diff --git a/maven-project/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml new file mode 100644 index 0000000000..e9ddf0d78c --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml @@ -0,0 +1,11 @@ + + + p0 + maven + 1.0 + ../../pom.xml + + 4.0.0 + p1 + + diff --git a/maven-project/src/test/resources/inheritance-repo/t12scm/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t12scm/p0/pom.xml new file mode 100644 index 0000000000..97bf7ccc22 --- /dev/null +++ b/maven-project/src/test/resources/inheritance-repo/t12scm/p0/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + maven + p0 + pom + 1.0 + + + scm:svn:http://host/p0 + scm:svn:https://host/p0 + http://host/viewer?path=/p0 + + + + modules/p1 + + +