From f630bc5d678fe8a20c064f12bbd3eb9ed6ac4353 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 4 Dec 2008 09:54:52 +0000
Subject: [PATCH] re-factor depend test a little.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@723272 13f79535-47bb-0310-9956-ffa450edef68
---
 .../taskdefs/optional/depend/depend-test.xml   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
index 6812bf54a..327e6f8b2 100644
--- a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
+++ b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
@@ -18,13 +18,10 @@
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
   <import file="../../../antunit-base.xml" />
 
-  <property name="src1" location="${java.io.tmpdir}/src1"/>
+  <property name="src1" location="${input}/src1"/>
+  <property name="src2" location="${input}/src2"/>
 
-  <target name="tearDown" depends="antunit-base.tearDown">
-    <delete dir="${src1}"/>
-  </target>
-
-  <target name="testBug45916">
+  <target name="setUp">
     <mkdir dir="${src1}"/>
     <mkdir dir="${output}"/>
     <mkdir dir="${src1}/a"/>
@@ -33,8 +30,8 @@ package a;
 public class B {
 }
 ]]></echo>
-    <mkdir dir="${input}/b"/>
-    <echo file="${input}/b/Main.java"><![CDATA[
+    <mkdir dir="${src2}/b"/>
+    <echo file="${src2}/b/Main.java"><![CDATA[
 package b;
 
 import a.B;
@@ -51,8 +48,10 @@ public class Main {
 
 }
 ]]></echo>
+  </target>
 
-    <javac srcdir="${src1}:${input}"
+  <target name="testBug45916" depends="setUp">
+    <javac srcdir="${src1}:${src2}"
            destdir="${output}"/>
 
     <!--to ensure that the classfiles generated in the previous step
@@ -68,4 +67,5 @@ public class Main {
             classpath="${output}/A.jar"/>
     <au:assertFileExists file="${output}/b/Main$1.class"/>
   </target>
+
 </project>