From 20372c38fa356b4da9ad6e63789ba3ffac080f05 Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Fri, 4 Mar 2011 14:43:26 +0000
Subject: [PATCH] fixing test for gump

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1077973 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/types/javaresource-test.xml | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/tests/antunit/types/javaresource-test.xml b/src/tests/antunit/types/javaresource-test.xml
index dddf3f48f..d0e99e004 100644
--- a/src/tests/antunit/types/javaresource-test.xml
+++ b/src/tests/antunit/types/javaresource-test.xml
@@ -19,41 +19,40 @@
   <import file="../antunit-base.xml" />
 
   <target name="setUp">
-    <mkdir dir="${input}"/>
-    <echo file="${input}/foo.txt">Hello, world</echo>
-    <echo file="${input}/x.properties">a=b</echo>
-    <mkdir dir="${output}"/>
-    <jar destfile="${output}/javaresource-test.jar">
-      <fileset dir="${input}"/>
-    </jar>
+    <mkdir dir="${resources}"/>
+    <echo file="${resources}/foo.txt">Hello, world</echo>
+    <echo file="${resources}/x.properties">a=b</echo>
   </target>
 
   <target name="testReadFromFile" depends="setUp">
     <concat>
       <javaresource name="foo.txt">
-        <classpath location="${input}"/>
+        <classpath location="${resources}"/>
       </javaresource>
     </concat>
     <au:assertLogContains text="Hello, world"/>
     <loadproperties>
       <javaresource name="x.properties">
-        <classpath location="${input}"/>
+        <classpath location="${resources}"/>
       </javaresource>
     </loadproperties>
     <au:assertPropertyEquals name="a" value="b"/>
   </target>
 
   <target name="testReadFromJar" depends="setUp">
-    <delete dir="${input}"/>
+    <jar destfile="${test.jar}">
+      <fileset dir="${resources}"/>
+    </jar>
+    <delete dir="${resources}"/>
     <concat>
       <javaresource name="foo.txt">
-        <classpath location="${output}/javaresource-test.jar"/>
+        <classpath location="${test.jar}"/>
       </javaresource>
     </concat>
     <au:assertLogContains text="Hello, world"/>
     <loadproperties>
       <javaresource name="x.properties">
-        <classpath location="${output}/javaresource-test.jar"/>
+        <classpath location="${test.jar}"/>
       </javaresource>
     </loadproperties>
     <au:assertPropertyEquals name="a" value="b"/>