Repository: maven
Updated Branches:
  refs/heads/master d25669e0b -> 7f21ebe05


Add unittests for elements of Model which are neither inherited nor
injected.
Ignoring artifactId and modelVersion, these are required elements.

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7f21ebe0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7f21ebe0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7f21ebe0

Branch: refs/heads/master
Commit: 7f21ebe05513508d377c5428e75e257dc57155d4
Parents: d25669e
Author: Robert Scholte <[email protected]>
Authored: Wed Aug 12 22:18:00 2015 +0200
Committer: Robert Scholte <[email protected]>
Committed: Wed Aug 12 22:18:00 2015 +0200

----------------------------------------------------------------------
 .../maven/model/merge/MavenModelMergerTest.java | 71 ++++++++++++++++++++
 1 file changed, 71 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/7f21ebe0/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
new file mode 100644
index 0000000..a44bb0e
--- /dev/null
+++ 
b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java
@@ -0,0 +1,71 @@
+package org.apache.maven.model.merge;
+
+
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.Collections;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Prerequisites;
+import org.apache.maven.model.Profile;
+import org.junit.Test;
+
+public class MavenModelMergerTest
+{
+    private MavenModelMerger modelMerger = new MavenModelMerger();
+
+    // Prerequisites are neither inherited nor injected
+    @Test
+    public void testMergeModel_Prerequisites()
+    {
+        Model parent = new Model();
+        parent.setPrerequisites( new Prerequisites() );
+        Model model = new Model();
+        modelMerger.mergeModel_Prerequisites( model, parent, true, null );
+        assertNull( model.getPrerequisites() );
+        
+        Prerequisites modelPrerequisites = new Prerequisites();
+        modelPrerequisites.setMaven( "3.0" );
+        model.setPrerequisites( modelPrerequisites );
+        modelMerger.mergeModel_Prerequisites( model, parent, true, null );
+        assertEquals( modelPrerequisites, model.getPrerequisites() );
+    }
+
+    // Profiles are neither inherited nor injected
+    @Test
+    public void testMergeModel_Profiles()
+    {
+        Model parent = new Model();
+        parent.setProfiles( Collections.singletonList( new Profile() ) );;
+        Model model = new Model();
+        modelMerger.mergeModel_Profiles( model, parent, true, 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 );
+        assertEquals( Collections.singletonList( modelProfile ), 
model.getProfiles() );
+    }
+
+}

Reply via email to