Author: carlos
Date: Tue May 24 16:07:32 2005
New Revision: 178316
URL: http://svn.apache.org/viewcvs?rev=178316&view=rev
Log:
Fixed MPCLOVER-38, maven:set doesn't allow null values
Check that maven.test.failure.ignore is correctly reset
Modified:
maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
Modified:
maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml?rev=178316&r1=178315&r2=178316&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
(original)
+++
maven/maven-1/plugins/trunk/clover/src/plugin-test/testCloverOffCleansProperly/maven.xml
Tue May 24 16:07:32 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
