From 6c7290dcbe09c4dcf77bf802c994274808b1da15 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Wed, 9 May 2007 15:39:56 +0000
Subject: [PATCH] finish antunitizing length test

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@536570 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/taskdefs/length-test.xml | 48 +++++++++++++---------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/tests/antunit/taskdefs/length-test.xml b/src/tests/antunit/taskdefs/length-test.xml
index e163fdc40..88298f4b1 100644
--- a/src/tests/antunit/taskdefs/length-test.xml
+++ b/src/tests/antunit/taskdefs/length-test.xml
@@ -1,10 +1,14 @@
-<project name="length">
+<project name="length-test" default="antunit"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <import file="../antunit-base.xml" />
+
   <property name="dir" location="lengthtestdir" />
   <property name="dir.a" location="${dir}/a" />
   <property name="dir.b" location="${dir}/b" />
   <property name="zipfile" location="lengthtest.zip" />
 
-  <target name="init">
+  <target name="setUp">
     <mkdir dir="${dir.a}" />
     <mkdir dir="${dir.b}" />
     <property name="foo" location="${dir.a}/foo" />
@@ -13,7 +17,12 @@
     <echo file="${bar}" message="bar" />
   </target>
 
-  <target name="testEach" depends="init">
+  <target name="tearDown">
+    <delete dir="${dir}" />
+    <delete file="${zipfile}" />
+  </target>
+
+  <target name="testEach" depends="setUp">
     <length mode="each" property="length.each">
       <fileset id="fs" dir="${dir}" />
     </length>
@@ -35,7 +44,7 @@
     </fail>
   </target>
 
-  <target name="testEachCondition" depends="init">
+  <target name="testEachCondition" depends="setUp">
     <length mode="each" property="length.each">
       <fileset id="fs" dir="${dir}" />
     </length>
@@ -56,7 +65,7 @@
     </fail>
   </target>
 
-  <target name="testAll" depends="init">
+  <target name="testAll" depends="setUp">
     <length property="length.all">
       <fileset id="foo" file="${dir.a}/foo" />
       <fileset id="bar" file="${dir.b}/bar" />
@@ -70,7 +79,7 @@
     </fail>
   </target>
 
-  <target name="testAllCondition" depends="init">
+  <target name="testAllCondition" depends="setUp">
     <fail>
       <condition>
         <not>
@@ -83,7 +92,7 @@
     </fail>
   </target>
 
-  <target name="testFile" depends="init">
+  <target name="testFile" depends="setUp">
     <length property="length.foo" file="${dir.a}/foo" />
     <fail>
       <condition>
@@ -94,7 +103,7 @@
     </fail>
   </target>
 
-  <target name="testFileCondition" depends="init">
+  <target name="testFileCondition" depends="setUp">
     <fail>
       <condition>
         <not>
@@ -104,7 +113,7 @@
     </fail>
   </target>
 
-  <target name="testBoth" depends="init">
+  <target name="testBoth" depends="setUp">
     <length property="length.foo" file="${dir.a}/foo">
       <fileset file="${dir.b}/bar" />
     </length>
@@ -117,7 +126,7 @@
     </fail>
   </target>
 
-  <target name="testBothCondition" depends="init">
+  <target name="testBothCondition" depends="setUp">
     <fail>
       <condition>
         <not>
@@ -129,7 +138,7 @@
     </fail>
   </target>
 
-  <target name="testDupes" depends="init">
+  <target name="testDupes" depends="setUp">
     <length property="length.foo" file="${dir.a}/foo">
       <fileset dir="${dir}" />
     </length>
@@ -142,7 +151,7 @@
     </fail>
   </target>
 
-  <target name="testDupesCondition" depends="init">
+  <target name="testDupesCondition" depends="setUp">
     <fail>
       <condition>
         <not>
@@ -218,11 +227,15 @@
   </target>
 
   <target name="testTrimFile" description="should fail">
-    <length file="${ant.file}" trim="false" />
+    <au:expectfailure>
+      <length file="${ant.file}" trim="false" />
+    </au:expectfailure>
   </target>
 
   <target name="testStringFile" description="should fail">
-    <length string="foo" file="${ant.file}" />
+    <au:expectfailure>
+      <length string="foo" file="${ant.file}" />
+    </au:expectfailure>
   </target>
 
   <target name="testImmutable">
@@ -237,7 +250,7 @@
     </fail>
   </target>
 
-  <target name="zip" depends="init">
+  <target name="zip" depends="setUp">
     <zip destfile="${zipfile}">
       <fileset file="${foo}" />
       <fileset file="${bar}" />
@@ -280,9 +293,4 @@
     </fail>
   </target>
 
-  <target name="cleanup">
-    <delete dir="${dir}" />
-    <delete file="${zipfile}" />
-  </target>
-
 </project>