Author: mbenson
Date: Wed Sep 14 14:59:52 2005
New Revision: 280954

URL: http://svn.apache.org/viewcvs?rev=280954&view=rev
Log:
partially antunit-ize DependSetTest

Modified:
    ant/core/trunk/src/etc/testcases/taskdefs/dependset.xml
    
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java

Modified: ant/core/trunk/src/etc/testcases/taskdefs/dependset.xml
URL: 
http://svn.apache.org/viewcvs/ant/core/trunk/src/etc/testcases/taskdefs/dependset.xml?rev=280954&r1=280953&r2=280954&view=diff
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/dependset.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/dependset.xml Wed Sep 14 14:59:52 
2005
@@ -22,7 +22,7 @@
     <touch file="test4.tmp"/>
     <dependset>
       <srcfilelist dir="." files="test4.tmp"/>
-      <targetfileset dir="." includes="i-do-not-exist"/>
+      <targetfileset id="targetfs" dir="." includes="i-do-not-exist"/>
     </dependset>
   </target>
 
@@ -34,6 +34,11 @@
       <srcfilelist dir="." files="newer.tmp"/>
       <targetfilelist dir="." files="older.tmp"/>
     </dependset>
+    <fail>
+      <condition>
+        <available file="older.tmp" />
+      </condition>
+    </fail>
   </target>
   
   <target name="cleanup"> 

Modified: 
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java
URL: 
http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java?rev=280954&r1=280953&r2=280954&view=diff
==============================================================================
--- 
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java 
(original)
+++ 
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java 
Wed Sep 14 14:59:52 2005
@@ -55,10 +55,6 @@
 
     public void test5() {
         executeTarget("test5");
-        java.io.File f = new java.io.File(getProjectDir(), "older.tmp");
-        if (f.exists()) {
-           fail("dependset failed to remove out of date file " + f.toString());
-        }
     }
 
 }



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

Reply via email to