From c71097416208b5ff6663acd0b1db740a38e6a4b8 Mon Sep 17 00:00:00 2001
From: carlos <carlos@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 24 May 2005 23:07:32 +0000
Subject: [PATCH] Fixed MPCLOVER-38, maven:set doesn't allow null values Check
 that maven.test.failure.ignore is correctly reset

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@178316 13f79535-47bb-0310-9956-ffa450edef68
---
 .../testCloverOffCleansProperly/maven.xml     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml b/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
index 5c691690..1a1d8e6b 100644
--- a/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
+++ b/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
@@ -25,19 +25,39 @@
 
   <goal name="testPlugin">
 
+    <maven:get var="ignoreTestFailureOld" plugin="maven-test-plugin"
+        property="maven.test.failure.ignore"/>
+
     <attainGoal name="clean"/>
-  	<attainGoal name="clover:on"/>
-  	<attainGoal name="jar"/>
+    <attainGoal name="clover:on"/>
+    <attainGoal name="jar"/>
     <attainGoal name="clover:off"/>
 
-  	<ant:delete dir="${maven.build.dest}"/>
+    <!-- check that maven.test.failure.ignore is correctly reset -->
+    <maven:get var="ignoreTestFailureNew" plugin="maven-test-plugin"
+        property="maven.test.failure.ignore"/>
+
+    <j:set var="ignoreTestFailureOldNull" value="${ignoreTestFailureOld == null}"/>
+    <j:set var="ignoreTestFailureNewNull" value="${ignoreTestFailureNew == null}"/>
+    <j:choose>
+      <j:when test="${ignoreTestFailureOldNull || ignoreTestFailureNewNull}">
+          <assert:assertEquals expected="${ignoreTestFailureOldNull}" value="${ignoreTestFailureNewNull}"
+              msg="maven.test.failure.ignore is not properly reset"/>
+      </j:when>
+      <j:otherwise>
+          <assert:assertEquals expected="${ignoreTestFailureOld}" value="${ignoreTestFailureNew}"
+              msg="maven.test.failure.ignore is not properly reset"/>
+      </j:otherwise>
+    </j:choose>
+
+    <ant:delete dir="${maven.build.dest}"/>
     <ant:record name="${maven.build.dir}/log.txt" action="start"/>
-  	<attainGoal name="jar"/>
+    <attainGoal name="jar"/>
     <ant:record name="${maven.build.dir}/log.txt" action="stop"/>
 
     <assert:assertFileContains file="${maven.build.dir}/log.txt" 
         match="Clover is disabled. Delegating straight to the compiler"/>
-  	
+
   </goal>
 
 </project>
\ No newline at end of file