From 8e3adc631c80a1fb519b3ef821046b331d81fae6 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Sat, 10 Jan 2009 10:46:00 +0000
Subject: [PATCH] o Created UT for MNG-3979

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733262 13f79535-47bb-0310-9956-ffa450edef68
---
 .../project/builder/PomConstructionTest.java  | 10 +-
 .../pom.xml                                   | 97 +++++++++++++++++++
 .../sub/pom.xml                               | 84 ++++++++++++++++
 3 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
 create mode 100644 maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml

diff --git a/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
index 636996ac76..6415124e48 100644
--- a/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
@@ -418,7 +418,15 @@ public class PomConstructionTest
         assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/prop0" ).toString() ) );
         assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/prop1" ).toString() ) );
     }
-   
+
+    /* FIXME: cf. MNG-3979
+    public void testJoiningOfContainersWhenChildHasEmptyElements()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPom( "id-container-joining-with-empty-elements/sub" );
+        assertNotNull( pom );
+    }
+    //*/
 
     private PomArtifactResolver artifactResolver( String basedir )
     {
diff --git a/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml b/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
new file mode 100644
index 0000000000..ed95efb09d
--- /dev/null
+++ b/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.its.mng3979</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>Maven Integration Test :: MNG-3979</name> 
+  <description>
+    Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
+    POM has a non-empty element and the child POM has an empty element to join.
+  </description>
+
+  <properties>
+    <prop0>test</prop0>
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>equal-repo-id</id>
+      <url>http://maven.apache.org/null</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>equal-build-exec-id</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>reset</goal>
+            </goals>
+            <configuration>
+              <logFile>target/exec.log</logFile>
+              <string>test</string>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <reportSets>
+          <reportSet>
+            <id>equal-report-exec-id</id>
+            <reports>
+              <report>reset</report>
+            </reports>
+            <configuration>
+              <logFile>target/exec.log</logFile>
+              <string>test</string>
+            </configuration>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>
diff --git a/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml b/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
new file mode 100644
index 0000000000..9bd61d0f62
--- /dev/null
+++ b/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.its.mng3979</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1</version>
+  </parent>
+
+  <artifactId>child</artifactId>
+
+  <name>Maven Integration Test :: MNG-3979</name> 
+  <description>
+    Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
+    POM has a non-empty element and the child POM has an empty element to join.
+  </description>
+
+  <properties/>
+
+  <repositories>
+    <repository>
+      <id>equal-repo-id</id>
+      <url>file:///${basedir}/null</url>
+      <snapshots/>
+      <releases/>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>equal-build-exec-id</id>
+            <phase>initialize</phase>
+            <goals/>
+            <configuration/>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <reportSets>
+          <reportSet>
+            <id>equal-report-exec-id</id>
+            <reports/>
+            <configuration/>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>