dion 2004/06/29 06:09:59
Modified: faq project.xml
faq/src/plugin-test maven.xml
faq/xdocs changes.xml
Log:
Use assert taglib in plugin test
Revision Changes Path
1.35 +1 -1 maven-plugins/faq/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/faq/project.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.xml 26 Jun 2004 03:15:36 -0000 1.34
+++ project.xml 29 Jun 2004 13:09:59 -0000 1.35
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-faq-plugin</id>
<name>Maven FAQ Plug-in</name>
- <currentVersion>1.4</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>Creates XDoc documentation from an FAQ XML document.</description>
<shortDescription>FAQ Plugin</shortDescription>
1.3 +3 -13 maven-plugins/faq/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/faq/src/plugin-test/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 4 Mar 2004 18:05:31 -0000 1.2
+++ maven.xml 29 Jun 2004 13:09:59 -0000 1.3
@@ -16,6 +16,7 @@
*/
-->
<project xmlns:util="jelly:util"
+ xmlns:assert="assert"
xmlns:j="jelly:core">
<goal name="testPlugin" prereqs="clean,test-faq">
@@ -25,19 +26,8 @@
<goal name="test-faq">
<attainGoal name="site"/>
- <j:set var="expectedFile"
- value="${maven.docs.dest}/faq.html"/>
- <util:file var="file" name="${expectedFile}" />
- <j:if test="${!(file.exists())}">
- <fail>${expectedFile} not generated</fail>
- </j:if>
-
- <j:set var="expectedFile"
- value="${maven.docs.dest}/faq2.html"/>
- <util:file var="file" name="${expectedFile}" />
- <j:if test="${!(file.exists())}">
- <fail>${expectedFile} not generated</fail>
- </j:if>
+ <assert:assertFileExists file="${maven.docs.dest}/faq.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/faq2.html"/>
</goal>
</project>
1.17 +4 -0 maven-plugins/faq/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/faq/xdocs/changes.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- changes.xml 26 Jun 2004 03:15:36 -0000 1.16
+++ changes.xml 29 Jun 2004 13:09:59 -0000 1.17
@@ -24,6 +24,10 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.5-SNAPSHOT" date="in CVS">
+ <action dev="dion" type="update">Use assert tag library in plugin
tests.</action>
+ </release>
+
<release version="1.4" date="2004-06-25">
<action dev="brett" type="fix" issue="MPFAQ-13">Correctly pass through CDATA
content</action>
<action dev="brett" type="fix" issue="MPFAQ-12">Make sure maven.faq.src
exists to avoid exceptions</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
