dion 2004/03/15 03:47:05
Modified: plugin/xdocs changes.xml
plugin plugin.jelly
Log:
- Add optional msg attribute to assertFileExists and assertEquals tags
Revision Changes Path
1.15 +3 -0 maven-plugins/plugin/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 8 Mar 2004 22:26:11 -0000 1.14
+++ changes.xml 15 Mar 2004 11:47:05 -0000 1.15
@@ -25,6 +25,9 @@
</properties>
<body>
<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">
Don't uninstall incorrect plugins when running plugin:download
</action>
1.33 +6 -2 maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- plugin.jelly 8 Mar 2004 22:26:11 -0000 1.32
+++ plugin.jelly 15 Mar 2004 11:47:05 -0000 1.33
@@ -277,14 +277,18 @@
<define:taglib uri="assert">
<define:tag name="assertFileExists">
<!-- @file : Full file path -->
+ <!-- @msg : optional message to be displayed -->
<u:file var="fileAsFile" name="${file}"/>
<j:if test="${!(fileAsFile.exists())}">
- <ant:fail>${file} does not exist</ant:fail>
+ <ant:fail>${file} does not exist.${msg}</ant:fail>
</j:if>
</define:tag>
<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))}">
- <ant:fail>Expected [${expected}] but got [${value}]</ant:fail>
+ <ant:fail>Expected [${expected}] but got [${value}].${msg}</ant:fail>
</j:if>
</define:tag>
</define:taglib>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
