Browse Source

re-factor depend test a little.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@723272 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 16 years ago
parent
commit
f630bc5d67
1 changed files with 9 additions and 9 deletions
  1. +9
    -9
      src/tests/antunit/taskdefs/optional/depend/depend-test.xml

+ 9
- 9
src/tests/antunit/taskdefs/optional/depend/depend-test.xml View File

@@ -18,13 +18,10 @@
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
<import file="../../../antunit-base.xml" /> <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="${src1}"/>
<mkdir dir="${output}"/> <mkdir dir="${output}"/>
<mkdir dir="${src1}/a"/> <mkdir dir="${src1}/a"/>
@@ -33,8 +30,8 @@ package a;
public class B { public class B {
} }
]]></echo> ]]></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; package b;


import a.B; import a.B;
@@ -51,8 +48,10 @@ public class Main {


} }
]]></echo> ]]></echo>
</target>


<javac srcdir="${src1}:${input}"
<target name="testBug45916" depends="setUp">
<javac srcdir="${src1}:${src2}"
destdir="${output}"/> destdir="${output}"/>


<!--to ensure that the classfiles generated in the previous step <!--to ensure that the classfiles generated in the previous step
@@ -68,4 +67,5 @@ public class Main {
classpath="${output}/A.jar"/> classpath="${output}/A.jar"/>
<au:assertFileExists file="${output}/b/Main$1.class"/> <au:assertFileExists file="${output}/b/Main$1.class"/>
</target> </target>

</project> </project>

Loading…
Cancel
Save