- Add optional msg attribute to assertFileExists and assertEquals tags

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114911 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
dion 2004-03-15 11:47:05 +00:00
parent be9219f24b
commit d876cc18b9
2 changed files with 9 additions and 2 deletions

View File

@ -277,14 +277,18 @@
<define:taglib uri="assert"> <define:taglib uri="assert">
<define:tag name="assertFileExists"> <define:tag name="assertFileExists">
<!-- @file : Full file path --> <!-- @file : Full file path -->
<!-- @msg : optional message to be displayed -->
<u:file var="fileAsFile" name="${file}"/> <u:file var="fileAsFile" name="${file}"/>
<j:if test="${!(fileAsFile.exists())}"> <j:if test="${!(fileAsFile.exists())}">
<ant:fail>${file} does not exist</ant:fail> <ant:fail>${file} does not exist.${msg}</ant:fail>
</j:if> </j:if>
</define:tag> </define:tag>
<define:tag name="assertEquals"> <define:tag name="assertEquals">
<!-- @expected : the expected value -->
<!-- @actual : the actual value -->
<!-- @msg : optional message to be displayed -->
<j:if test="${not(expected.equals(value))}"> <j:if test="${not(expected.equals(value))}">
<ant:fail>Expected [${expected}] but got [${value}]</ant:fail> <ant:fail>Expected [${expected}] but got [${value}].${msg}</ant:fail>
</j:if> </j:if>
</define:tag> </define:tag>
</define:taglib> </define:taglib>

View File

@ -25,6 +25,9 @@
</properties> </properties>
<body> <body>
<release version="1.3-SNAPSHOT" date="in CVS"> <release version="1.3-SNAPSHOT" date="in CVS">
<action dev="dion" type="update">
Add optional msg attribute to assertFileExists and assertEquals tags
</action>
<action dev="brett" type="fix" issue="MPPLUGIN-12"> <action dev="brett" type="fix" issue="MPPLUGIN-12">
Don't uninstall incorrect plugins when running plugin:download Don't uninstall incorrect plugins when running plugin:download
</action> </action>