Browse Source

Missed a few...

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277503 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 20 years ago
parent
commit
d273066a17
1 changed files with 41 additions and 15 deletions
  1. +41
    -15
      src/etc/testcases/taskdefs/touch.xml

+ 41
- 15
src/etc/testcases/taskdefs/touch.xml View File

@@ -110,19 +110,34 @@
</mapper>
</touch>

<fileset id="touchtest" file="touchtest">
<selector refid="map.selector" />
</fileset>

<fileset id="touchtestfoo" file="touchtestfoo">
<selector refid="map.selector" />
</fileset>

<fileset id="touchtestbar" file="touchtestbar">
<selector refid="map.selector" />
</fileset>

<pathconvert property="touchtest" pathsep=" "
refid="touchtest" setonempty="false" />

<pathconvert property="touchtestfoo" pathsep=" "
refid="touchtestfoo" setonempty="false" />

<pathconvert property="touchtestbar" pathsep=" "
refid="touchtestbar" setonempty="false" />

<fail>
<condition>
<not>
<and>
<isfileselected file="touchtest">
<selector refid="map.selector" />
</isfileselected>
<isfileselected file="touchtestfoo">
<selector refid="map.selector" />
</isfileselected>
<isfileselected file="touchtestbar">
<selector refid="map.selector" />
</isfileselected>
<isset property="touchtest" />
<isset property="touchtestfoo" />
<isset property="touchtestbar" />
</and>
</not>
</condition>
@@ -136,12 +151,17 @@
<mergemapper to="touchtest" />
</touch>

<fileset id="touchtest" file="touchtest">
<selector refid="map.selector" />
</fileset>

<pathconvert property="touchtest" pathsep=" "
refid="touchtest" setonempty="false" />

<fail>
<condition>
<not>
<isfileselected file="touchtest">
<selector refid="map.selector" />
</isfileselected>
<isset property="touchtest" />
</not>
</condition>
</fail>
@@ -150,12 +170,18 @@

<target name="testGoodPattern">
<touch file="touchtest" datetime="06242003142012GMTfoo" pattern="MMddyyyyHHmmssz'foo'" />

<fileset id="touchtest" file="touchtest">
<date millis="1056464412000" />
</fileset>

<pathconvert property="touchtest" pathsep=" "
refid="touchtest" setonempty="false" />

<fail>
<condition>
<not>
<isfileselected file="touchtest">
<date millis="1056464412000" />
</isfileselected>
<isset property="touchtest" />
</not>
</condition>
</fail>


Loading…
Cancel
Save