Author: jdcasey
Date: Mon Apr 3 15:51:20 2006
New Revision: 391164
URL: http://svn.apache.org/viewcvs?rev=391164&view=rev
Log:
[MNG-2196] Unit test to verify that (a) dislocated parent references resolve in
a multimodule build containing both projects, and (b) that long lines of
inheritance don't cause problems inheriting plugin configurations due to
caching of processed project instances.
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
(with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
(with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
(with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
(with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
(with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
(with props)
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
(with props)
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=391164&r1=391163&r2=391164&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Mon Apr 3 15:51:20 2006
@@ -20,10 +20,34 @@
import java.io.IOException;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
public class MavenProjectTest
extends AbstractMavenProjectTestCase
{
+
+ public void testIdentityProtoInheritance()
+ {
+ Parent parent = new Parent();
+
+ parent.setGroupId( "test-group" );
+ parent.setVersion( "1000" );
+ parent.setArtifactId( "test-artifact" );
+
+ Model model = new Model();
+
+ model.setParent( parent );
+ model.setArtifactId( "real-artifact" );
+
+ MavenProject project = new MavenProject( model );
+
+ assertEquals( "groupId proto-inheritance failed.", "test-group",
project.getGroupId() );
+ assertEquals( "artifactId is masked.", "real-artifact",
project.getArtifactId() );
+ assertEquals( "version proto-inheritance failed.", "1000",
project.getVersion() );
+
+ // draw the NPE.
+ project.getId();
+ }
public void testEmptyConstructor()
{
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java?rev=391164&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
Mon Apr 3 15:51:20 2006
@@ -0,0 +1,120 @@
+package org.apache.maven.project.inheritance.t02;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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 java.io.File;
+import java.util.List;
+
+import org.apache.maven.model.Build;
+import org.apache.maven.model.MailingList;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
+
+/**
+ * A test which demonstrates maven's recursive inheritance where
+ * a distinct value is taken from each parent contributing to the
+ * the final model of the project being assembled. There is no
+ * overriding going on amongst the models being used in this test:
+ * each model in the lineage is providing a value that is not present
+ * anywhere else in the lineage. We are just making sure that values
+ * down in the lineage are bubbling up where they should.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
+ * @version $Id$
+ */
+public class ProjectInheritanceTest
+ extends AbstractProjectInheritanceTestCase
+{
+ // ----------------------------------------------------------------------
+ //
+ // p4 inherits from p3
+ // p3 inherits from p2
+ // p2 inherits from p1
+ // p1 inherits from p0
+ // p0 inhertis from super model
+ //
+ // or we can show it graphically as:
+ //
+ // p4 ---> p3 ---> p2 ---> p1 ---> p0 --> super model
+ //
+ // ----------------------------------------------------------------------
+
+ public void testProjectInheritance()
+ throws Exception
+ {
+ File localRepo = getLocalRepositoryPath();
+ File pom0 = new File( localRepo, "p0/pom.xml" );
+ File pom1 = new File( pom0.getParentFile(), "p1/pom.xml" );
+ File pom2 = new File( pom1.getParentFile(), "p2/pom.xml" );
+ File pom3 = new File( pom2.getParentFile(), "p3/pom.xml" );
+ File pom4 = new File( pom3.getParentFile(), "p4/pom.xml" );
+ File pom5 = new File( pom4.getParentFile(), "p5/pom.xml" );
+
+ System.out.println( "Location of project-4's POM: " + pom4.getPath() );
+
+ // load everything...
+ MavenProject project0 = getProject( pom0 );
+ MavenProject project1 = getProject( pom1 );
+ MavenProject project2 = getProject( pom2 );
+ MavenProject project3 = getProject( pom3 );
+ MavenProject project4 = getProject( pom4 );
+ MavenProject project5 = getProject( pom5 );
+
+ assertEquals( "p4", project4.getName() );
+
+ //
----------------------------------------------------------------------
+ // Value inherited from p3
+ //
----------------------------------------------------------------------
+
+ assertEquals( "2000", project4.getInceptionYear() );
+
+ //
----------------------------------------------------------------------
+ // Value taken from p2
+ //
----------------------------------------------------------------------
+
+ assertEquals( "mailing-list", ( (MailingList)
project4.getMailingLists().get( 0 ) ).getName() );
+
+ //
----------------------------------------------------------------------
+ // Value taken from p1
+ //
----------------------------------------------------------------------
+
+ assertEquals( "scm-url/p2/p3/p4", project4.getScm().getUrl() );
+
+ //
----------------------------------------------------------------------
+ // Value taken from p4
+ //
----------------------------------------------------------------------
+
+ assertEquals( "Codehaus", project4.getOrganization().getName() );
+
+ //
----------------------------------------------------------------------
+ // Value taken from super model
+ //
----------------------------------------------------------------------
+
+ assertEquals( "4.0.0", project4.getModelVersion() );
+
+ Build build = project4.getBuild();
+ List plugins = build.getPlugins();
+
+ assertEquals( 1, plugins.size() );
+
+ Plugin plugin = (Plugin) plugins.get( 0 );
+ List executions = plugin.getExecutions();
+
+ assertEquals( 1, executions.size() );
+ }
+}
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml?rev=391164&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
Mon Apr 3 15:51:20 2006
@@ -0,0 +1,13 @@
+<project>
+ <parent>
+ <artifactId>p3</artifactId>
+ <groupId>maven</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p5</artifactId>
+ <packaging>jar</packaging>
+ <name>p5</name>
+ <version>1.0</version>
+</project>
\ No newline at end of file
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml?rev=391164&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
Mon Apr 3 15:51:20 2006
@@ -0,0 +1,13 @@
+<project>
+ <parent>
+ <artifactId>p3</artifactId>
+ <groupId>maven</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p4</artifactId>
+ <packaging>jar</packaging>
+ <name>p4</name>
+ <version>1.0</version>
+</project>
\ No newline at end of file
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml?rev=391164&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
Mon Apr 3 15:51:20 2006
@@ -0,0 +1,14 @@
+<project>
+ <parent>
+ <artifactId>p2</artifactId>
+ <groupId>maven</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p3</artifactId>
+ <packaging>pom</packaging>
+ <name>p3</name>
+ <version>1.0</version>
+ <inceptionYear>2000</inceptionYear>
+</project>
\ No newline at end of file
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml?rev=391164&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
Mon Apr 3 15:51:20 2006
@@ -0,0 +1,18 @@
+<project>
+ <parent>
+ <artifactId>p1</artifactId>
+ <groupId>maven</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p2</artifactId>
+ <packaging>pom</packaging>
+ <name>p2</name>
+ <version>1.0</version>
+ <mailingLists>
+ <mailingList>
+ <name>mailing-list</name>
+ </mailingList>
+ </mailingLists>
+</project>
\ No newline at end of file
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml?rev=391164&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
Mon Apr 3 15:51:20 2006
@@ -0,0 +1,32 @@
+<project>
+ <parent>
+ <artifactId>p0</artifactId>
+ <groupId>maven</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p1</artifactId>
+ <packaging>pom</packaging>
+ <name>p1</name>
+ <version>1.0</version>
+ <scm>
+ <url>scm-url</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>package</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml?rev=391164&view=auto
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
Mon Apr 3 15:51:20 2006
@@ -0,0 +1,11 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven</groupId>
+ <artifactId>p0</artifactId>
+ <packaging>pom</packaging>
+ <name>p0</name>
+ <version>1.0</version>
+ <organization>
+ <name>Codehaus</name>
+ </organization>
+</project>
\ No newline at end of file
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
