Return-Path: 
 <notifications-return-6425-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@locus.apache.org
Received: (qmail 17859 invoked from network); 3 Dec 2008 16:39:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 3 Dec 2008 16:39:09 -0000
Received: (qmail 19479 invoked by uid 500); 3 Dec 2008 16:39:20 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 19458 invoked by uid 500); 3 Dec 2008 16:39:20 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 19449 invoked by uid 99); 3 Dec 2008 16:39:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Dec 2008 08:39:20 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Dec 2008 16:38:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 353312388892; Wed,  3 Dec 2008 08:38:48 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r722960 - in /ant/core/trunk/src/tests/antunit/taskdefs:
 dependset-test.xml dependset/
Date: Wed, 03 Dec 2008 16:38:48 -0000
To: notifications@ant.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081203163848.353312388892@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bodewig
Date: Wed Dec  3 08:38:47 2008
New Revision: 722960

URL: http://svn.apache.org/viewvc?rev=722960&view=rev
Log:
make dependset test more regular

Added:
    ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml   (contents, props changed)
      - copied, changed from r722935, ant/core/trunk/src/tests/antunit/taskdefs/dependset/test.xml
Removed:
    ant/core/trunk/src/tests/antunit/taskdefs/dependset/

Copied: ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml (from r722935, ant/core/trunk/src/tests/antunit/taskdefs/dependset/test.xml)
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml?p2=ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml&p1=ant/core/trunk/src/tests/antunit/taskdefs/dependset/test.xml&r1=722935&r2=722960&rev=722960&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/dependset/test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml Wed Dec  3 08:38:47 2008
@@ -16,7 +16,15 @@
   limitations under the License.
 -->
 
-<project name="dependset-test" xmlns:au="antlib:org.apache.ant.antunit">
+<project name="dependset-test" xmlns:au="antlib:org.apache.ant.antunit"
+         default="antunit">
+
+  <import file="../antunit-base.xml" />
+
+  <target name="setUp">
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
+  </target>
 
   <target name="test1">
     <au:expectfailure expectedMessage="At least one set of source resources must be specified">
@@ -40,101 +48,80 @@
     </au:expectfailure>
   </target>
 
-  <target name="test4">
-    <touch file="test4.tmp" />
+  <target name="test4" depends="setUp">
+    <touch file="${input}/test4.tmp" />
     <dependset>
-      <srcfilelist dir="." files="test4.tmp" />
-      <targetfileset id="targetfs" dir="." includes="i-do-not-exist" />
+      <srcfilelist dir="${input}" files="test4.tmp" />
+      <targetfileset id="targetfs" dir="${output}" includes="i-do-not-exist" />
     </dependset>
   </target>
 
-  <target name="test5">
-    <touch file="older.tmp" />
+  <target name="test5" depends="setUp">
+    <touch file="${output}/older.tmp" />
     <sleep seconds="3" />
-    <touch file="newer.tmp" />
+    <touch file="${input}/newer.tmp" />
     <dependset>
-      <srcfilelist dir="." files="newer.tmp" />
-      <targetfilelist dir="." files="older.tmp" />
+      <srcfilelist dir="${input}" files="newer.tmp" />
+      <targetfilelist dir="${output}" files="older.tmp" />
     </dependset>
-    <au:assertFalse>
-      <available file="older.tmp" />
-    </au:assertFalse>
+    <au:assertFileDoesntExist file="${output}/older.tmp"/>
   </target>
 
-  <target name="test6">
-    <touch file="sourceset_1.tmp" />
-  	<touch file="targetset_1.tmp" />
+  <target name="test6" depends="setUp">
+    <touch file="${input}/sourceset_1.tmp" />
+    <touch file="${output}/targetset_1.tmp" />
     <sleep seconds="3" />
-  	<touch file="sourceset_2.tmp" />
-  	<touch file="targetset_2.tmp" />
-  	<sleep seconds="2" />	
+    <touch file="${input}/sourceset_2.tmp" />
+    <touch file="${output}/targetset_2.tmp" />
+    <sleep seconds="2" />	
     <dependset>
       <sources>
-        <filelist dir="." files="sourceset_1.tmp,sourceset_2.tmp" />
+        <filelist dir="${input}" files="sourceset_1.tmp,sourceset_2.tmp" />
       </sources>
       <targets>
-        <filelist dir="." files="targetset_1.tmp,targetset_2.tmp" />
+        <filelist dir="${output}/" files="targetset_1.tmp,targetset_2.tmp" />
       </targets>
     </dependset>
-    <au:assertFalse>
-      <available file="targetset_1.tmp" />
-    </au:assertFalse>
-    <au:assertFalse>
-      <available file="targetset_2.tmp" />
-    </au:assertFalse>
+    <au:assertFileDoesntExist file="${output}/targetset_1.tmp" />
+    <au:assertFileDoesntExist file="${output}/targetset_2.tmp" />
   </target>
 
-  <target name="test7">
-    <touch file="older.tmp" />
+  <target name="test7" depends="setUp">
+    <touch file="${output}/older.tmp" />
     <dependset>
       <sources>
         <propertyresource name="thereisnosuchproperty" />
       </sources>
       <targets>
-        <filelist dir="." files="older.tmp" />
+        <filelist dir="${output}" files="older.tmp" />
       </targets>
     </dependset>
-    <au:assertFalse>
-      <available file="older.tmp" />
-    </au:assertFalse>
+    <au:assertFileDoesntExist file="${output}/older.tmp" />
   </target>
 
-  <target name="test8">
-    <touch file="older.tmp" />
+  <target name="test8" depends="setUp">
+    <touch file="${output}/older.tmp" />
     <property name="foo" value="bar" />
     <dependset>
       <sources>
         <propertyresource name="foo" />
       </sources>
       <targets>
-        <filelist dir="." files="older.tmp" />
+        <filelist dir="${output}" files="older.tmp" />
       </targets>
     </dependset>
-    <au:assertTrue>
-      <available file="older.tmp" />
-    </au:assertTrue>
+    <au:assertFileExists file="${output}/older.tmp" />
   </target>
 
-  <target name="test9">
+  <target name="test9" depends="setUp">
     <au:assertFalse>
-      <available file="test9dir" type="dir" />
+      <available file="${output}/test9dir" type="dir" />
     </au:assertFalse>
-    <touch file="test9.tmp" />
+    <touch file="${input}/test9.tmp" />
     <dependset>
       <srcfileset dir="." includes="test9.tmp" />
-      <targetfileset dir="test9dir" />
+      <targetfileset dir="${output}/test9dir" />
     </dependset>
   </target>
 
-  <target name="tearDown"> 
-    <delete file="test4.tmp" />
-    <delete file="test9.tmp" />
-    <delete file="older.tmp" />
-    <delete file="newer.tmp" />
-  	<delete file="sourceset_1.tmp" />
-   	<delete file="sourceset_2.tmp" />
-  	<delete file="targetset_1.tmp" />
-  	<delete file="targetset_2.tmp" />
-  	
-  </target>
 </project>

Propchange: ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/core/trunk/src/tests/antunit/taskdefs/dependset-test.xml
------------------------------------------------------------------------------
    svn:mergeinfo =