svn commit: r736236 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/builder/ resources-project-builder/join-different-containers-same-id/

[si...@apache.org]

Author: sisbell
Date: Tue Jan 20 22:20:34 2009
New Revision: 736236

URL: http://svn.apache.org/viewvc?rev=736236&view=rev
Log:
MNG-3984

Added:
    maven/components/trunk/maven-project/src/test/resources-project-builder/join-different-containers-same-id/
    maven/components/trunk/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml
Modified:
    maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java

Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=736236&r1=736235&r2=736236&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Tue Jan 20 22:20:34 2009
@@ -208,7 +208,16 @@
     }
     //*/
 
-    /* FIXME: cf. MNG-3937  */
+    /* MNG-3984*/
+    public void testDifferentContainersWithSameId()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPom( "join-different-containers-same-id" );
+        assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/executions[1]/goals" ) ).size() );
+        assertEquals( 1, ( (List<?>) pom.getValue( "build/pluginManagement/plugins[1]/executions[1]/goals" ) ).size() );
+    }
+
+    /* FIXME: cf. MNG-3937*/
     public void testOrderOfMergedPluginExecutionGoalsWithoutPluginManagement()
         throws Exception
     {

Added: maven/components/trunk/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml?rev=736236&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml Tue Jan 20 22:20:34 2009
@@ -0,0 +1,66 @@
+<?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>mng3984</groupId>
+  <artifactId>test</artifactId>
+  <version>0.1</version>
+  <packaging>pom</packaging>
+
+  <name>MNG-3984</name>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.its.plugins</groupId>
+          <artifactId>maven-it-plugin-b</artifactId>
+          <version>1.0-SNAPSHOT</version>
+            <executions>
+              <execution>
+                <id>foo</id>
+                <goals>
+                  <goal>a</goal>
+                </goals>
+              </execution>
+            </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-a</artifactId>
+        <version>1.0-SNAPSHOT</version>
+            <executions>
+              <execution>
+                <id>foo</id>
+                <goals>
+                  <goal>b</goal>
+                </goals>
+              </execution>
+            </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>