Browse Source

Use the output dir which get cleaned up in the tearDown

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1376403 13f79535-47bb-0310-9956-ffa450edef68
master
Nicolas Lalevee 12 years ago
parent
commit
ee5f3b4185
1 changed files with 15 additions and 15 deletions
  1. +15
    -15
      src/tests/antunit/core/extension-point-test.xml

+ 15
- 15
src/tests/antunit/core/extension-point-test.xml View File

@@ -89,73 +89,73 @@
</target> </target>


<target name="testExtensionPointInIncludedBuildfileWithNestedInclude"> <target name="testExtensionPointInIncludedBuildfileWithNestedInclude">
<mkdir dir="output"/>
<echo file="output/abstract-compile.xml"><![CDATA[
<mkdir dir="${output}"/>
<echo file="${output}/abstract-compile.xml"><![CDATA[
<project name="abstract-compile"> <project name="abstract-compile">
<extension-point name="compile"/> <extension-point name="compile"/>
</project>]]></echo> </project>]]></echo>
<echo file="output/compile-java.xml"><![CDATA[
<echo file="${output}/compile-java.xml"><![CDATA[
<project name="compile-java"> <project name="compile-java">
<include file="abstract-compile.xml" as="abstract-compile"/> <include file="abstract-compile.xml" as="abstract-compile"/>
<target name="compile-java" extensionOf="abstract-compile.compile"> <target name="compile-java" extensionOf="abstract-compile.compile">
<echo>in compile java</echo> <echo>in compile java</echo>
</target> </target>
</project>]]></echo> </project>]]></echo>
<echo file="output/build.xml"><![CDATA[
<echo file="${output}/build.xml"><![CDATA[
<project name="master"> <project name="master">
<include file="compile-java.xml" as="compile"/> <include file="compile-java.xml" as="compile"/>
</project>]]></echo> </project>]]></echo>
<!-- here prefix should be concatened from each include first <!-- here prefix should be concatened from each include first
"compile" then "abstract-compile"--> "compile" then "abstract-compile"-->
<ant dir="output" target="compile.abstract-compile.compile"/>
<ant dir="${output}" target="compile.abstract-compile.compile"/>
<au:assertLogContains text="in compile java"/> <au:assertLogContains text="in compile java"/>


</target> </target>


<target name="testExtensionPointInIncludedBuildfileWithNestedImport"> <target name="testExtensionPointInIncludedBuildfileWithNestedImport">
<mkdir dir="output"/>
<echo file="output/abstract-compile.xml"><![CDATA[
<mkdir dir="${output}"/>
<echo file="${output}/abstract-compile.xml"><![CDATA[
<project name="abstract-compile"> <project name="abstract-compile">
<extension-point name="compile"/> <extension-point name="compile"/>
</project>]]></echo> </project>]]></echo>
<echo file="output/compile-java.xml"><![CDATA[
<echo file="${output}/compile-java.xml"><![CDATA[
<project name="compile-java"> <project name="compile-java">
<import file="abstract-compile.xml"/> <import file="abstract-compile.xml"/>
<target name="compile-java" extensionOf="compile"> <target name="compile-java" extensionOf="compile">
<echo>in compile java</echo> <echo>in compile java</echo>
</target> </target>
</project>]]></echo> </project>]]></echo>
<echo file="output/build.xml"><![CDATA[
<echo file="${output}/build.xml"><![CDATA[
<project name="master"> <project name="master">
<include file="compile-java.xml" as="compile"/> <include file="compile-java.xml" as="compile"/>
</project>]]></echo> </project>]]></echo>
<!-- here the prefix should be "compile" as the import containing <!-- here the prefix should be "compile" as the import containing
the extension point is done inside an include using "compile" the extension point is done inside an include using "compile"
as prefix --> as prefix -->
<ant dir="output" target="compile.compile"/>
<ant dir="${output}" target="compile.compile"/>
<au:assertLogContains text="in compile java"/> <au:assertLogContains text="in compile java"/>


</target> </target>


<target name="testExtensionPointInImportedBuildfileWithNestedImport"> <target name="testExtensionPointInImportedBuildfileWithNestedImport">
<mkdir dir="output"/>
<echo file="output/abstract-compile.xml"><![CDATA[
<mkdir dir="${output}"/>
<echo file="${output}/abstract-compile.xml"><![CDATA[
<project name="abstract-compile"> <project name="abstract-compile">
<extension-point name="compile"/> <extension-point name="compile"/>
</project>]]></echo> </project>]]></echo>
<echo file="output/compile-java.xml"><![CDATA[
<echo file="${output}/compile-java.xml"><![CDATA[
<project name="compile-java"> <project name="compile-java">
<import file="abstract-compile.xml"/> <import file="abstract-compile.xml"/>
<target name="compile-java" extensionOf="compile"> <target name="compile-java" extensionOf="compile">
<echo>in compile java</echo> <echo>in compile java</echo>
</target> </target>
</project>]]></echo> </project>]]></echo>
<echo file="output/build.xml"><![CDATA[
<echo file="${output}/build.xml"><![CDATA[
<project name="master"> <project name="master">
<import file="compile-java.xml"/> <import file="compile-java.xml"/>
</project>]]></echo> </project>]]></echo>
<!-- here extension point should not be prefixed at all --> <!-- here extension point should not be prefixed at all -->
<ant dir="output" target="compile"/>
<ant dir="${output}" target="compile"/>
<au:assertLogContains text="in compile java"/> <au:assertLogContains text="in compile java"/>


</target> </target>


Loading…
Cancel
Save