dion        2004/06/29 06:55:38

  Modified:    xdoc/xdocs changes.xml
               xdoc/src/plugin-test maven.xml
  Log:
  Use assert taglib in plugin test
  
  Revision  Changes    Path
  1.56      +1 -0      maven-plugins/xdoc/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/xdoc/xdocs/changes.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- changes.xml       29 Jun 2004 08:48:35 -0000      1.55
  +++ changes.xml       29 Jun 2004 13:55:37 -0000      1.56
  @@ -26,6 +26,7 @@
     </properties>
     <body>
       <release version="1.7.3-SNAPSHOT" date="in CVS">
  +      <action dev="dion" type="update">Use assert taglib in plugin tests</action>
         <action dev="carlos" type="add" issue="MPXDOC-112">Add instructions to 
checkout with maven to cvs-usage page</action>
       </release>
       <release version="1.7.2" date="2004-06-25">
  
  
  
  1.6       +3 -12     maven-plugins/xdoc/src/plugin-test/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/xdoc/src/plugin-test/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml 4 Mar 2004 18:39:49 -0000       1.5
  +++ maven.xml 29 Jun 2004 13:55:38 -0000      1.6
  @@ -17,6 +17,7 @@
    -->
   <project xmlns:util="jelly:util"
            xmlns:j="jelly:core"
  +         xmlns:assert="assert"
            xmlns:doc="doc">
            
     <goal name="testPlugin" prereqs="clean,test-xdoc,test-jsltosite">
  @@ -26,23 +27,13 @@
     <goal name="test-xdoc">
       <j:set var="maven.docs.src" value="${basedir}/xdocs-replacement"/>
       <attainGoal name="xdoc"/>
  -
  -    <j:set var="expectedFile" 
  -      value="${maven.docs.dest}/test.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}/test.html"/>
     </goal>
     
     
     <goal name="test-jsltosite">
       <doc:jslToSite srcdir="${basedir}/testdocs" />
  -    <j:set var="expectedFile" value="${maven.docs.dest}/testjsltosite.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}/testjsltosite.html"/>
     </goal>
     
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to