From 8211a14a65803050149125f79d0a8d5acbe457dd Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Mon, 22 Dec 2008 19:14:37 +0000
Subject: [PATCH] o Enabled fixed test, disabled broken test

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728744 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/maven/project/builder/PomConstructionTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 b09122f4e5..f383c9b4f5 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
@@ -84,7 +84,6 @@ public class PomConstructionTest
         assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins[1]/dependencies" ) ).size() );
     }
 
-    /* FIXME: cf. MNG-3821
     public void testErroneousJoiningOfDifferentPluginsWithEqualExecutionIds()
         throws Exception
     {
@@ -98,7 +97,6 @@ public class PomConstructionTest
         assertEquals( "maven-it-plugin-b", pom.getValue( "reporting/plugins[2]/artifactId" ) );
         assertEquals( 1, ( (List<?>) pom.getValue( "reporting/plugins[1]/reportSets" ) ).size() );
     }
-    */
 
     /* FIXME: cf. MNG-3886
     public void testOrderOfGoalsFromPluginExecutionWithoutPluginManagement()
@@ -204,6 +202,7 @@ public class PomConstructionTest
     }
     //*/
 
+    /* FIXME: cf. MNG-3938
     public void testOverridingOfInheritedPluginExecutionsWithoutPluginManagement()
         throws Exception
     {
@@ -213,7 +212,6 @@ public class PomConstructionTest
         assertEquals( "child-non-default", pom.getValue( "build/plugins[1]/executions[@id='non-default']/phase" ) );
     }
 
-    /* FIXME: cf. MNG-3938
     public void testOverridingOfInheritedPluginExecutionsWithPluginManagement()
         throws Exception
     {