Browse Source

removed commented taskdefs, trailing spaces

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@393295 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 19 years ago
parent
commit
cae488b559
1 changed files with 15 additions and 20 deletions
  1. +15
    -20
      src/etc/testcases/taskdefs/copy.xml

+ 15
- 20
src/etc/testcases/taskdefs/copy.xml View File

@@ -5,7 +5,7 @@
<target name="test1"> <target name="test1">
<copy file="copy.xml" tofile="copytest1.tmp" /> <copy file="copy.xml" tofile="copytest1.tmp" />
</target> </target>
<target name="test2"> <target name="test2">
<copy file="copy.xml" todir="copytest1dir" overwrite="true"/> <copy file="copy.xml" todir="copytest1dir" overwrite="true"/>
</target> </target>
@@ -47,7 +47,7 @@ a=b=
<touch file="copytest3.tmp"/> <touch file="copytest3.tmp"/>
<!--wait --> <!--wait -->
<sleep seconds="4"/> <sleep seconds="4"/>
<!-- copy a different file to two places -->
<!-- copy a different file to two places -->
<copy file="copy.xml" tofile="copytest3a.tmp" overwrite="true"/> <copy file="copy.xml" tofile="copytest3a.tmp" overwrite="true"/>
<copy file="copy.xml" tofile="copytest3b.tmp" overwrite="true"/> <copy file="copy.xml" tofile="copytest3b.tmp" overwrite="true"/>
<!--wait --> <!--wait -->
@@ -59,7 +59,7 @@ a=b=
overwrite="true" overwrite="true"
preservelastmodified="true" /> preservelastmodified="true" />
<!-- copy a newer file onto an older one (should work) --> <!-- copy a newer file onto an older one (should work) -->
<copy file="copytest3a.tmp" tofile="copytest3.tmp"
<copy file="copytest3a.tmp" tofile="copytest3.tmp"
preservelastmodified="true" /> preservelastmodified="true" />
<!-- expected state : <!-- expected state :
3a.tmp==3.tmp==copy.xml 3a.tmp==3.tmp==copy.xml
@@ -69,13 +69,13 @@ a=b=
3b.tmp==copy.xml 3b.tmp==copy.xml
--> -->
</target> </target>
<target name="test_single_file_fileset"> <target name="test_single_file_fileset">
<copy tofile="copytest_single_file_fileset.tmp"> <copy tofile="copytest_single_file_fileset.tmp">
<fileset dir="." includes="copy.xml"/> <fileset dir="." includes="copy.xml"/>
</copy> </copy>
</target> </target>
<target name="test_single_file_path"> <target name="test_single_file_path">
<copy tofile="copytest_single_file_path.tmp"> <copy tofile="copytest_single_file_path.tmp">
<path> <path>
@@ -83,7 +83,7 @@ a=b=
</path> </path>
</copy> </copy>
</target> </target>
<target name="testFilterSet"> <target name="testFilterSet">
<copy file="copy.filterset" tofile="copy.filterset.tmp"> <copy file="copy.filterset" tofile="copy.filterset.tmp">
<filterset> <filterset>
@@ -129,14 +129,9 @@ a=b=
</copy> </copy>
</target> </target>


<!--
<typedef name="resource" classname="org.apache.tools.ant.types.Resource"/>
<typedef name="resources" classname="org.apache.tools.ant.types.resources.Resources"/>
-->
<property name="to.dir" value="copy-todir-tmp"/> <property name="to.dir" value="copy-todir-tmp"/>
<property name="from.dir" value="copy-fromdir-tmp"/> <property name="from.dir" value="copy-fromdir-tmp"/>

<target name="testResource.prepare"> <target name="testResource.prepare">
<mkdir dir="${from.dir}"/> <mkdir dir="${from.dir}"/>
<concat destfile="${from.dir}/file1.txt">This is file 1</concat> <concat destfile="${from.dir}/file1.txt">This is file 1</concat>
@@ -144,7 +139,7 @@ a=b=
<concat destfile="${from.dir}/file3.txt">This is file 3</concat> <concat destfile="${from.dir}/file3.txt">This is file 3</concat>
<concat destfile="${from.dir}/fileNR.txt">This is file @NR@</concat> <concat destfile="${from.dir}/fileNR.txt">This is file @NR@</concat>
</target> </target>
<target name="testFileResourcePlain" depends="testResource.prepare"> <target name="testFileResourcePlain" depends="testResource.prepare">
<copy todir="${to.dir}" flatten="true"> <copy todir="${to.dir}" flatten="true">
<resources> <resources>
@@ -176,19 +171,19 @@ a=b=
</filterset> </filterset>
</copy> </copy>
</target> </target>
<target name="testResourcePlain"> <target name="testResourcePlain">
</target> </target>
<target name="testResourcePlainWithMapper"> <target name="testResourcePlainWithMapper">
</target> </target>
<target name="testResourcePlainWithFilter"> <target name="testResourcePlainWithFilter">
</target> </target>
<target name="testOnlineResources"> <target name="testOnlineResources">
</target> </target>
<target name="testPathAsResource" depends="testResource.prepare"> <target name="testPathAsResource" depends="testResource.prepare">
<copy todir="${to.dir}"> <copy todir="${to.dir}">
<path> <path>
@@ -196,7 +191,7 @@ a=b=
</path> </path>
</copy> </copy>
</target> </target>
<target name="testZipfileset" depends="testResource.prepare"> <target name="testZipfileset" depends="testResource.prepare">
<zip destfile="${from.dir}/test.zip" roundup="false"> <zip destfile="${from.dir}/test.zip" roundup="false">
<fileset dir="${from.dir}" excludes="*.zip"/> <fileset dir="${from.dir}" excludes="*.zip"/>
@@ -205,7 +200,7 @@ a=b=
<zipfileset src="${from.dir}/test.zip"/> <zipfileset src="${from.dir}/test.zip"/>
</copy> </copy>
</target> </target>
<target name="cleanup"> <target name="cleanup">
<delete file="copytest1.tmp"/> <delete file="copytest1.tmp"/>
<delete file="copytest3.tmp"/> <delete file="copytest3.tmp"/>


Loading…
Cancel
Save