carlos      2004/07/05 11:44:47

  Modified:    ant/src/plugin-test maven.xml
  Log:
  Fixed test for issue MPANT-17
  
  Revision  Changes    Path
  1.8       +17 -2     maven-plugins/ant/src/plugin-test/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ant/src/plugin-test/maven.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- maven.xml 5 Jul 2004 13:34:40 -0000       1.7
  +++ maven.xml 5 Jul 2004 18:44:47 -0000       1.8
  @@ -18,7 +18,10 @@
   <project xmlns:util="jelly:util"
            xmlns:j="jelly:core"
            xmlns:ant="jelly:ant"
  -         xmlns:assert="assert">
  +         xmlns:maven="jelly:maven"
  +         xmlns:u="jelly:util"
  +         xmlns:assert="assert"
  +         xmlns:x="jelly:xml">
            
     <goal name="testPlugin" prereqs="test-ant">
       <attainGoal name="clean"/>
  @@ -31,7 +34,19 @@
   
       <ant:property name="noget" value="noget" />
       <ant:ant/>
  -    
  +
  +    <!-- load build.xml file and check that 'target' property is relative -->
  +    <u:file name="${basedir}/build.xml" var="buildFile"/>
  +    <x:parse var="buildXml" xml="${buildFile.toURL()}" />
  +    <x:set var="properties" select="$buildXml/project/property"/>
  +    <j:set var="defaulttargetdirName" 
value="${properties[0].attribute('name').value}"/>
  +    <j:set var="defaulttargetdirValue" 
value="${properties[0].attribute('value').value}"/>
  +
  +    <assert:assertEquals expected="defaulttargetdir" value="${defaulttargetdirName}"
  +      msg="first target is not defaulttargetdir"/>
  +    <assert:assertEquals expected="target" value="${defaulttargetdirValue}"
  +      msg="defaulttargetdir property is not relative"/>
  +
       <assert:assertFileExists 
file="${maven.build.dest}/directory-1/file1.properties"/>
       <assert:assertFileExists file="${maven.build.dest}/file2.properties"/>
       <assert:assertFileExists 
file="${maven.test.dest}/directory-1/file1.properties"/>
  
  
  

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

Reply via email to