ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant/src/etc/testcases/taskdefs touch.xml
Date Wed, 26 Jan 2005 23:50:21 GMT
mbenson     2005/01/26 15:50:21

  Modified:    src/etc/testcases/taskdefs touch.xml
  Log:
  Missed a few...
  
  Revision  Changes    Path
  1.8       +41 -15    ant/src/etc/testcases/taskdefs/touch.xml
  
  Index: touch.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/touch.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- touch.xml	26 Jan 2005 23:36:09 -0000	1.7
  +++ touch.xml	26 Jan 2005 23:50:21 -0000	1.8
  @@ -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>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message