ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r1077973 - /ant/core/trunk/src/tests/antunit/types/javaresource-test.xml
Date Fri, 04 Mar 2011 14:43:26 GMT
Author: antoine
Date: Fri Mar  4 14:43:26 2011
New Revision: 1077973

URL: http://svn.apache.org/viewvc?rev=1077973&view=rev
Log:
fixing test for gump

Modified:
    ant/core/trunk/src/tests/antunit/types/javaresource-test.xml

Modified: ant/core/trunk/src/tests/antunit/types/javaresource-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/types/javaresource-test.xml?rev=1077973&r1=1077972&r2=1077973&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/types/javaresource-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/types/javaresource-test.xml Fri Mar  4 14:43:26 2011
@@ -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"/>



Mime
View raw message