Author: antoine
Date: Wed Mar 2 04:54:04 2011
New Revision: 1076104
URL: http://svn.apache.org/viewvc?rev=1076104&view=rev
Log:
intervert execution order of tearDown and antunit-base.tearDown
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/import-url-test.xml
Modified: ant/core/trunk/src/tests/antunit/taskdefs/import-url-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/import-url-test.xml?rev=1076104&r1=1076103&r2=1076104&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/import-url-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/import-url-test.xml Wed Mar 2
04:54:04 2011
@@ -40,7 +40,6 @@
<echo file="${input}/a/c/test.properties"><![CDATA[
foo=bar
]]></echo>
- <property name="test.jar" location="${java.io.tmpdir}/test.jar"/>
<jar destfile="${test.jar}">
<fileset dir="${input}"/>
</jar>
@@ -63,7 +62,7 @@ foo=bar
<au:assertLogContains text="foo is bar"/>
</target>
- <target name="tearDown" depends="antunit-base.tearDown">
+ <target name="tearDown">
<taskdef name="close"
classname="org.apache.tools.ant.taskdefs.CloseResources"/>
<close>
@@ -72,5 +71,6 @@ foo=bar
</javaresource>
</close>
<delete file="${test.jar}" quiet="true" deleteonexit="true"/>
+ <antcall target="antunit-base.tearDown"/>
</target>
</project>
