Repository: maven Updated Branches: refs/heads/master 7f21ebe05 -> 58348a897
Merging is done before validation, so ensure that artifactId and modelVersion are never inherited Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/58348a89 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/58348a89 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/58348a89 Branch: refs/heads/master Commit: 58348a8971e0fb4cf26a281f1cf0f2ce3af9f0c9 Parents: 7f21ebe Author: Robert Scholte <[email protected]> Authored: Sat Aug 15 14:57:24 2015 +0200 Committer: Robert Scholte <[email protected]> Committed: Sat Aug 15 14:57:24 2015 +0200 ---------------------------------------------------------------------- .../maven/model/merge/MavenModelMergerTest.java | 38 +++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/58348a89/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java index a44bb0e..3832b0c 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java @@ -34,6 +34,36 @@ public class MavenModelMergerTest { private MavenModelMerger modelMerger = new MavenModelMerger(); + // modelVersion is neither inherited nor injected + @Test + public void testMergeModel_ModelVersion() + { + Model parent = new Model(); + parent.setModelVersion( "4.0.0" ); + Model model = new Model(); + modelMerger.mergeModel_ModelVersion( model, parent, false, null ); + assertNull( model.getModelVersion() ); + + model.setModelVersion( "5.0.0" ); + modelMerger.mergeModel_ModelVersion( model, parent, false, null ); + assertEquals( "5.0.0", model.getModelVersion() ); + } + + // ArtifactId is neither inherited nor injected + @Test + public void testMergeModel_ArtifactId() + { + Model parent = new Model(); + parent.setArtifactId( "PARENT" ); + Model model = new Model(); + modelMerger.mergeModel_ArtifactId( model, parent, false, null ); + assertNull( model.getArtifactId() ); + + model.setArtifactId( "MODEL" ); + modelMerger.mergeModel_ArtifactId( model, parent, false, null ); + assertEquals( "MODEL", model.getArtifactId() ); + } + // Prerequisites are neither inherited nor injected @Test public void testMergeModel_Prerequisites() @@ -41,13 +71,13 @@ public class MavenModelMergerTest Model parent = new Model(); parent.setPrerequisites( new Prerequisites() ); Model model = new Model(); - modelMerger.mergeModel_Prerequisites( model, parent, true, null ); + modelMerger.mergeModel_Prerequisites( model, parent, false, null ); assertNull( model.getPrerequisites() ); Prerequisites modelPrerequisites = new Prerequisites(); modelPrerequisites.setMaven( "3.0" ); model.setPrerequisites( modelPrerequisites ); - modelMerger.mergeModel_Prerequisites( model, parent, true, null ); + modelMerger.mergeModel_Prerequisites( model, parent, false, null ); assertEquals( modelPrerequisites, model.getPrerequisites() ); } @@ -58,13 +88,13 @@ public class MavenModelMergerTest Model parent = new Model(); parent.setProfiles( Collections.singletonList( new Profile() ) );; Model model = new Model(); - modelMerger.mergeModel_Profiles( model, parent, true, null ); + modelMerger.mergeModel_Profiles( model, parent, false, null ); assertEquals( 0, model.getProfiles().size() ); Profile modelProfile = new Profile(); modelProfile.setId( "MODEL" ); model.setProfiles( Collections.singletonList( modelProfile ) ); - modelMerger.mergeModel_Prerequisites( model, parent, true, null ); + modelMerger.mergeModel_Prerequisites( model, parent, false, null ); assertEquals( Collections.singletonList( modelProfile ), model.getProfiles() ); }
