http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/notarget.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/topleveltasks/notarget.xml b/src/etc/testcases/core/topleveltasks/notarget.xml index 9ce0239..2543751 100644 --- a/src/etc/testcases/core/topleveltasks/notarget.xml +++ b/src/etc/testcases/core/topleveltasks/notarget.xml @@ -16,6 +16,6 @@ limitations under the License. --> <project default="foo"> - <echo message="Called"/> - <target name="foo"/> + <echo message="Called" /> + <target name="foo" /> </project>
http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/targetlevelant.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/topleveltasks/targetlevelant.xml b/src/etc/testcases/core/topleveltasks/targetlevelant.xml index 61229f9..9b1bb1d 100644 --- a/src/etc/testcases/core/topleveltasks/targetlevelant.xml +++ b/src/etc/testcases/core/topleveltasks/targetlevelant.xml @@ -17,6 +17,6 @@ --> <project basedir="." default="foo"> <target name="foo"> - <ant antfile="notarget.xml"/> + <ant antfile="notarget.xml" /> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/topleveltasks/toplevelant.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/topleveltasks/toplevelant.xml b/src/etc/testcases/core/topleveltasks/toplevelant.xml index 67a5cae..968ad6c 100644 --- a/src/etc/testcases/core/topleveltasks/toplevelant.xml +++ b/src/etc/testcases/core/topleveltasks/toplevelant.xml @@ -16,6 +16,6 @@ limitations under the License. --> <project basedir="." default="foo"> - <ant antfile="notarget.xml"/> - <target name="foo"/> + <ant antfile="notarget.xml" /> + <target name="foo" /> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/core/unknownelement.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/unknownelement.xml b/src/etc/testcases/core/unknownelement.xml index fec8f18..b6d8939 100644 --- a/src/etc/testcases/core/unknownelement.xml +++ b/src/etc/testcases/core/unknownelement.xml @@ -17,7 +17,7 @@ --> <project> <target name="testMaybeConfigure"> - <taskdef name="parent" + <taskdef name="parent" classname="org.apache.tools.ant.UnknownElementTest$Parent" loaderref="unknown.id"> <classpath> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/build.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/filters/build.xml b/src/etc/testcases/filters/build.xml index c03443a..b70b778 100644 --- a/src/etc/testcases/filters/build.xml +++ b/src/etc/testcases/filters/build.xml @@ -18,7 +18,7 @@ <project default="tearDown" basedir="."> <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> @@ -34,7 +34,7 @@ </filterchain> </copy> </target> - + <target name="testNegateLineContains" depends="setUp"> <copy file="input/linecontains.test" tofile="${output}/negatelinecontains.test"> @@ -49,12 +49,12 @@ <condition> <not> <filesmatch file1="${output}/negatelinecontains.test" - file2="expected/negatelinecontains.test"/> + file2="expected/negatelinecontains.test" /> </not> </condition> </fail> </target> - + <target name="testEscapeUnicode" depends="setUp"> <copy todir="${output}" encoding="UTF-8"> <fileset dir="input"> @@ -71,16 +71,16 @@ <target name="testStripJavaComments" depends="setUp"> <copy todir="${output}"> - <fileset dir="input" includes="stripjavacomments.test"/> + <fileset dir="input" includes="stripjavacomments.test" /> <filterchain> - <filterreader classname="org.apache.tools.ant.filters.StripJavaComments"/> + <filterreader classname="org.apache.tools.ant.filters.StripJavaComments" /> </filterchain> </copy> </target> <target name="testReplaceTokens" depends="setUp"> <copy todir="${output}"> - <fileset dir="input" includes="replacetokens.test"/> + <fileset dir="input" includes="replacetokens.test" /> <filterchain> <replacetokens> <token key="foo" value=""/> @@ -91,18 +91,18 @@ <target name="testReplaceTokensPropertyFile" depends="setUp"> <copy tofile="${output}/replacetokensPropertyFile.test"> - <fileset dir="input" includes="replacetokens.test"/> + <fileset dir="input" includes="replacetokens.test" /> <filterchain> - <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> + <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> <param type="propertiesfile" value="${basedir}/input/sample.properties"/> - </filterreader> + </filterreader> </filterchain> </copy> </target> <target name="testReplaceTokensDoubleEncoded" depends="setUp"> <copy todir="${output}"> - <fileset dir="input" includes="replacetokens.double.test"/> + <fileset dir="input" includes="replacetokens.double.test" /> <filterchain> <replacetokens> <token key="foo" value=""/> @@ -113,7 +113,7 @@ <target name="testReplaceTokensDoubleEncodedToSimple" depends="setUp"> <copy todir="${output}"> - <fileset dir="input" includes="replacetokens.double.test"/> + <fileset dir="input" includes="replacetokens.double.test" /> <filterchain> <replacetokens begintoken="@@" endtoken="@@"> <token key="foo" value=""/> @@ -124,7 +124,7 @@ <target name="testReplaceTokensMustacheStyle" depends="setUp"> <copy todir="${output}"> - <fileset dir="input" includes="replacetokens.mustache.test"/> + <fileset dir="input" includes="replacetokens.mustache.test" /> <filterchain> <replacetokens begintoken="{{" endtoken="}}"> <token key="foo" value=""/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/concat.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/filters/concat.xml b/src/etc/testcases/filters/concat.xml index 7aca7bd..262dd16 100644 --- a/src/etc/testcases/filters/concat.xml +++ b/src/etc/testcases/filters/concat.xml @@ -20,7 +20,7 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> <echo file="${output}/prepend.txt" message="this-should-be-the-first-line${line.separator}"/> <echo file="${output}/append.txt" message="this-should-be-the-last-line${line.separator}"/> <copy file="input/head-tail.test" tofile="${output}/concatfilter.test"/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/dynamicfilter.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/filters/dynamicfilter.xml b/src/etc/testcases/filters/dynamicfilter.xml index ef9ffc3..cb52d21 100644 --- a/src/etc/testcases/filters/dynamicfilter.xml +++ b/src/etc/testcases/filters/dynamicfilter.xml @@ -20,20 +20,20 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> <target name="dynamicfilter"> <path id="test-classes"> - <pathelement location="../../../../build/testcases"/> - <pathelement path="${java.class.path}"/> + <pathelement location="../../../../build/testcases" /> + <pathelement path="${java.class.path}" /> </path> - <typedef - name="customfilter" + <typedef + name="customfilter" classname="org.apache.tools.ant.filters.DynamicFilterTest$CustomFilter"> <classpath refid="test-classes"/> </typedef> - + <concat destfile="${output}/input"> hello world </concat> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/head-tail.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/filters/head-tail.xml b/src/etc/testcases/filters/head-tail.xml index 9bff110..e0ffed7 100644 --- a/src/etc/testcases/filters/head-tail.xml +++ b/src/etc/testcases/filters/head-tail.xml @@ -20,7 +20,7 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> @@ -59,7 +59,7 @@ </target> <target name="testFilterReaderHeadLinesSkip" depends="setUp"> - <copy file="input/head-tail.test" + <copy file="input/head-tail.test" tofile="${output}/head-tail.filterReaderHeadLinesSkip.test"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.HeadFilter"> @@ -113,7 +113,7 @@ </target> <target name="testFilterReaderTailLinesSkip" depends="setUp"> - <copy file="input/head-tail.test" + <copy file="input/head-tail.test" tofile="${output}/head-tail.filterReaderTailLinesSkip.test"> <filterchain> <filterreader classname="org.apache.tools.ant.filters.TailFilter"> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/filters/tokenfilter.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/filters/tokenfilter.xml b/src/etc/testcases/filters/tokenfilter.xml index de468c1..b1b5aef 100644 --- a/src/etc/testcases/filters/tokenfilter.xml +++ b/src/etc/testcases/filters/tokenfilter.xml @@ -20,7 +20,7 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> <target name="tokenfilter"> @@ -34,7 +34,7 @@ <target name="trimignore"> <concat destfile="${output}/input"> Hello - + World </concat> <copy file="${output}/input" tofile="${output}/output" overwrite="yes"> @@ -314,17 +314,17 @@ <target name="customtokenfilter"> <path id="test-classes"> - <pathelement location="../../../../build/testcases"/> - <pathelement path="${java.class.path}"/> + <pathelement location="../../../../build/testcases" /> + <pathelement path="${java.class.path}" /> </path> - <typedef - name="capitalize" + <typedef + name="capitalize" classname="org.apache.tools.ant.filters.TokenFilterTest$Capitalize"> <classpath refid="test-classes"/> </typedef> - + <concat destfile="${output}/input"> hello world </concat> @@ -344,14 +344,14 @@ i = 1; </script> </target> - + <target name="hasregex"> <concat destfile="${output}/replaceregexp"> hello world </concat> <replaceregexp file="${output}/replaceregexp" - match="hello( )world" - replace="bye\1world"/> + match="hello( )world" + replace="bye\1world"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/abstractcvstask.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/abstractcvstask.xml b/src/etc/testcases/taskdefs/abstractcvstask.xml index 3f7f258..5de8b5e 100644 --- a/src/etc/testcases/taskdefs/abstractcvstask.xml +++ b/src/etc/testcases/taskdefs/abstractcvstask.xml @@ -16,7 +16,7 @@ limitations under the License. --> -<project name="abstractcvstask-test" basedir="../../../../" +<project name="abstractcvstask-test" basedir="../../../../" default="tearDown"> <import file="../buildfiletest-base.xml" optional="false"/> @@ -29,7 +29,7 @@ <cvs cvsroot="[email protected]:/cvs" package="src/Makefile" dest="${output}" - quiet="true"/> + quiet="true" /> </target> <target name="tag-attribute"> @@ -37,7 +37,7 @@ package="src/Makefile" dest="${output}" quiet="true" - tag="OPENBSD_5_3"/> + tag="OPENBSD_5_3" /> <cvs cvsroot="[email protected]:/cvs" package="src/Makefile" dest="${output}" http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/ant.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/ant.xml b/src/etc/testcases/taskdefs/ant.xml index 74a4953..33ef1da 100644 --- a/src/etc/testcases/taskdefs/ant.xml +++ b/src/etc/testcases/taskdefs/ant.xml @@ -19,14 +19,14 @@ <project name="ant-test" basedir="." default="test1"> <path id="inheritable"> - <pathelement path="${java.class.path}"/> + <pathelement path="${java.class.path}" /> </path> <target name="cleanup"> - <delete file="test1.log"/> - <delete file="test2.log"/> - <delete file="ant/test3.log"/> - <delete file="ant/test4.log"/> + <delete file="test1.log" /> + <delete file="test2.log" /> + <delete file="ant/test3.log" /> + <delete file="ant/test4.log" /> </target> <target name="all" depends="test1,test2,test3,test4"/> @@ -63,38 +63,38 @@ </target> <target name="inheritBasedir"> - <ant antfile="ant/ant.xml" target="dummy" inheritAll="true"/> + <ant antfile="ant/ant.xml" target="dummy" inheritAll="true" /> </target> <target name="doNotInheritBasedir"> - <ant antfile="ant/ant.xml" target="dummy" inheritAll="false"/> + <ant antfile="ant/ant.xml" target="dummy" inheritAll="false" /> </target> <target name="explicitBasedir1"> - <ant antfile="taskdefs/ant/ant.xml" target="dummy" inheritAll="true" - dir=".."/> + <ant antfile="taskdefs/ant/ant.xml" target="dummy" inheritAll="true" + dir=".." /> </target> <target name="explicitBasedir2"> - <ant antfile="taskdefs/ant/ant.xml" target="dummy" inheritAll="false" - dir=".."/> + <ant antfile="taskdefs/ant/ant.xml" target="dummy" inheritAll="false" + dir=".." /> </target> <target name="tripleCall"> - <ant antfile="ant/ant.xml" target="callback" inheritAll="false"/> + <ant antfile="ant/ant.xml" target="callback" inheritAll="false" /> </target> <target name="testInherit"> - <ant antfile="ant/references.xml" inheritRefs="true" target="dummy"/> + <ant antfile="ant/references.xml" inheritRefs="true" target="dummy" /> </target> <target name="testNoInherit"> - <ant antfile="ant/references.xml" inheritRefs="false" target="dummy"/> + <ant antfile="ant/references.xml" inheritRefs="false" target="dummy" /> </target> <target name="testRename"> <ant antfile="ant/references.xml" inheritRefs="false" target="dummy"> - <reference refid="path" torefid="newpath"/> + <reference refid="path" torefid="newpath" /> </ant> </target> @@ -107,71 +107,71 @@ <pathelement location="${rootdir}/test/testframework.jar"/> <path refid="project.classpath"/> </path> - <ant antfile="ant/references.xml" target="testInheritPath"> + <ant antfile="ant/references.xml" target="testInheritPath"> <reference refid="test.classpath"/> </ant> </target> <target name="testLogfilePlacement"> <ant antfile="ant.xml" target="dummy" output="test1.log" - inheritall="false"/> - <ant antfile="ant.xml" target="dummy" output="test2.log"/> + inheritall="false" /> + <ant antfile="ant.xml" target="dummy" output="test2.log" /> <ant antfile="ant.xml" target="dummy" output="test3.log" - inheritall="false" dir="ant"/> - <ant antfile="ant.xml" target="dummy" output="test4.log" - dir="ant"/> + inheritall="false" dir="ant" /> + <ant antfile="ant.xml" target="dummy" output="test4.log" + dir="ant" /> </target> <target name="testRefid"> <ant antfile="ant/references.xml" inheritRefs="false" target="dummy"> - <property name="testprop" refid="inheritable"/> + <property name="testprop" refid="inheritable" /> </ant> </target> <target name="test-property-override-inheritall-start"> - <property name="test" value="1"/> + <property name="test" value="1" /> <ant antfile="ant.xml" target="test-property-override-inheritall-level-2" inheritall="true"> - <property name="test" value="2"/> + <property name="test" value="2" /> </ant> </target> <target name="test-property-override-inheritall-level-2"> - <property name="test" value="3"/> + <property name="test" value="3" /> <ant antfile="ant.xml" target="test-property-override-inheritall-level-3" inheritall="true"> - <property name="test" value="4"/> + <property name="test" value="4" /> </ant> </target> <target name="test-property-override-inheritall-level-3"> - <property name="test" value="5"/> - <echo message="The value of test is ${test}"/> + <property name="test" value="5" /> + <echo message="The value of test is ${test}" /> </target> <target name="test-property-override-no-inheritall-start"> - <property name="test" value="1"/> + <property name="test" value="1" /> <ant antfile="ant.xml" target="test-property-override-no-inheritall-level-2" inheritall="false"> - <property name="test" value="2"/> + <property name="test" value="2" /> </ant> </target> <target name="test-property-override-no-inheritall-level-2"> - <property name="test" value="3"/> + <property name="test" value="3" /> <ant antfile="ant.xml" target="test-property-override-no-inheritall-level-3" inheritall="false"> - <property name="test" value="4"/> + <property name="test" value="4" /> </ant> </target> <target name="test-property-override-no-inheritall-level-3"> - <property name="test" value="5"/> - <echo message="The value of test is ${test}"/> + <property name="test" value="5" /> + <echo message="The value of test is ${test}" /> </target> <target name="test-propertyset"> @@ -181,7 +181,7 @@ <propertyref name="test1"/> <mapper type="glob" from="*" to="*.x"/> </propertyset> - <ant antfile="ant.xml" target="echo-for-propertyset-test" + <ant antfile="ant.xml" target="echo-for-propertyset-test" inheritall="false"> <propertyset refid="set"/> </ant> @@ -199,7 +199,7 @@ <target name="middleman" depends="infinite-loop-via-depends"/> <target name="dependent" depends="middleman"/> - + <target name="multi-same-property"> <ant antfile="ant.xml" target="echo-for-multi-same"> <property name="prop" value="one"/> @@ -224,22 +224,22 @@ <target name="blank-target"> <ant antfile="ant.topleveltest.xml"> - <target name=""/> + <target name="" /> </ant> </target> <target name="multiple-targets"> <ant antfile="ant.xml"> - <target name="ta"/> - <target name="tb"/> - <target name="tc"/> + <target name="ta" /> + <target name="tb" /> + <target name="tc" /> </ant> </target> <target name="multiple-targets-2"> <ant antfile="ant.xml"> - <target name="tb"/> - <target name="da"/> + <target name="tb" /> + <target name="da" /> </ant> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/ant/ant.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/ant/ant.xml b/src/etc/testcases/taskdefs/ant/ant.xml index 8965882..52c9a70 100644 --- a/src/etc/testcases/taskdefs/ant/ant.xml +++ b/src/etc/testcases/taskdefs/ant/ant.xml @@ -22,12 +22,12 @@ </target> <target name="dummy"> - <echo message="${basedir}"/> + <echo message="${basedir}" /> </target> <target name="callback"> - <ant antfile="../ant.xml" target="dummy" inheritAll="false"/> + <ant antfile="../ant.xml" target="dummy" inheritAll="false" /> </target> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/ant/references.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/ant/references.xml b/src/etc/testcases/taskdefs/ant/references.xml index 6966db7..0f3a693 100644 --- a/src/etc/testcases/taskdefs/ant/references.xml +++ b/src/etc/testcases/taskdefs/ant/references.xml @@ -17,13 +17,13 @@ --> <project name="test" default="def" basedir="."> - <path id="no-override"/> + <path id="no-override" /> <target name="def"> <fail>This build file should only be run from within the testcase</fail> </target> - <target name="dummy"/> + <target name="dummy" /> <target name="testInheritPath"> <pathconvert refid="test.classpath" pathsep="${line.separator}" property="myprop"/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/antlib.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/antlib.xml b/src/etc/testcases/taskdefs/antlib.xml index 1221437..d1c4061 100644 --- a/src/etc/testcases/taskdefs/antlib.xml +++ b/src/etc/testcases/taskdefs/antlib.xml @@ -20,8 +20,8 @@ <property name="testcases.dir" location="../../../../build/testcases"/> <path id="testclasses"> - <pathelement location="${testcases.dir}"/> - <pathelement path="${java.class.path}"/> + <pathelement location="${testcases.dir}" /> + <pathelement path="${java.class.path}" /> </path> <target name="antlib.file"> @@ -53,13 +53,13 @@ <x:p xmlns:x="abc">Hello from x:p</x:p> </target> - <target name="antlib_uri"> + <target name="antlib_uri" > <typedef uri="antlib:org.example.tasks" onerror="failall"/> </target> <target name="antlib_uri_auto" xmlns:ex="antlib:org.example.tasks"> <ex:simple> - <echo message="inside simple"/> + <echo message="inside simple" /> </ex:simple> </target> @@ -68,5 +68,5 @@ <echo message="inside simple"/> </ex:simple> </target> - -</project> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/available.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/available.xml b/src/etc/testcases/taskdefs/available.xml index 5bc71ed..324c054 100644 --- a/src/etc/testcases/taskdefs/available.xml +++ b/src/etc/testcases/taskdefs/available.xml @@ -21,7 +21,7 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> <target name="test1"> @@ -37,91 +37,91 @@ </target> <target name="test4"> - <available property="test" + <available property="test" file="src/etc/testcases/taskdefs/this_file_does_not_exist"/> </target> <target name="test5"> - <available property="test" + <available property="test" file="available.xml"/> </target> <target name="test6"> - <available property="test" + <available property="test" resource="org/apache/tools/ant/taskdefs/this_resource_does_not_exist"/> </target> <target name="test7"> - <available property="test" + <available property="test" resource="org/apache/tools/ant/taskdefs/defaults.properties"/> </target> <target name="test8"> - <available property="test" + <available property="test" classname="org.apache.tools.ant.taskdefs.this_class_does_not_exist"/> </target> <target name="test9"> - <available property="test" + <available property="test" classname="org.apache.tools.ant.taskdefs.Ant"/> </target> <target name="test10"> - <available property="test" + <available property="test" file="available.xml" resource="org/apache/tools/ant/taskdefs/defaults.properties" classname="org.apache.tools.ant.taskdefs.Ant"/> </target> - + <target name="test11"> - <available property="test" + <available property="test" file="src/etc/testcases/taskdefs/available.xml" resource="org/apache/tools/ant/taskdefs/defaults.properties" classname="org.apache.tools.ant.taskdefs.this_class_does_not_exist"/> - </target> - + </target> + <target name="test12"> - <available property="" + <available property="" file="available.xml"/> </target> <target name="test13"> - <available property="test" - file="" type="file"/> + <available property="test" + file="" type="file" /> </target> <target name="test13b"> - <available property="test" + <available property="test" file=""/> </target> <target name="test14"> - <available property="test" + <available property="test" resource=""/> </target> <target name="test15"> - <available property="test" + <available property="test" classname="org.apache.tools.ant.taskdefs.this_class_does_not_exist"/> </target> <target name="test16"> - <available property="test" + <available property="test" file="" type="dir"/> </target> <target name="test17"> - <available property="test" + <available property="test" file="../taskdefs" type="dir"/> </target> <target name="test18"> - <available property="test" + <available property="test" file="../this_dir_should_never_exist" type="dir"/> </target> <target name="test19"> - <available property="test" + <available property="test" file="available.xml" type="Foo"/> </target> @@ -134,7 +134,7 @@ <available property="test" ignoresystemclasses="true" classname="org.apache.tools.ant.launch.AntMain"> <classpath> - <pathelement location="${ant.home}/lib/ant-launcher.jar"/> + <pathelement location="${ant.home}/lib/ant-launcher.jar" /> </classpath> </available> </target> @@ -161,29 +161,29 @@ <target name="searchInPathNotThere"> <available file="not_there" filepath="..:optional" - property="test"/> + property="test" /> </target> <target name="searchInPathIsThere"> <available file="pvcs.xml" filepath="..:optional" - property="test"/> + property="test" /> </target> <target name="testDoubleBasedir"> <echo>testing ${basedir}${file.separator}${ant.file}</echo> <fail> <condition> - <available file="${basedir}${file.separator}${ant.file}"/> + <available file="${basedir}${file.separator}${ant.file}" /> </condition> </fail> </target> <target name="prep.parents"> - <mkdir dir="${output}/greatgrandparent/grandparent/parent/dir"/> - <touch file="${output}/greatgrandparent/a.txt"/> - <touch file="${output}/greatgrandparent/grandparent/b.txt"/> - <touch file="${output}/greatgrandparent/grandparent/parent/c.txt"/> - <touch file="${output}/greatgrandparent/grandparent/parent/dir/d.txt"/> + <mkdir dir="${output}/greatgrandparent/grandparent/parent/dir"/> + <touch file="${output}/greatgrandparent/a.txt"/> + <touch file="${output}/greatgrandparent/grandparent/b.txt"/> + <touch file="${output}/greatgrandparent/grandparent/parent/c.txt"/> + <touch file="${output}/greatgrandparent/grandparent/parent/dir/d.txt"/> <property name="available.test.dir" value="${output}/greatgrandparent/grandparent/parent/dir"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/basename.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/basename.xml b/src/etc/testcases/taskdefs/basename.xml index b3f1f26..c5fd2ab 100644 --- a/src/etc/testcases/taskdefs/basename.xml +++ b/src/etc/testcases/taskdefs/basename.xml @@ -45,7 +45,7 @@ <target name="testNoDots"> <basename property="file.wo.suf" file="foo.bartxt" suffix="txt"/> </target> - + <target name="testValueEqualsSuffixWithDot"> <basename property="file.wo.suf" file=".txt" suffix=".txt"/> </target> @@ -53,5 +53,5 @@ <target name="testValueEqualsSuffixWithoutDot"> <basename property="file.wo.suf" file=".txt" suffix="txt"/> </target> - + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/bunzip2.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/bunzip2.xml b/src/etc/testcases/taskdefs/bunzip2.xml index 8f69aeb..8ae1758 100644 --- a/src/etc/testcases/taskdefs/bunzip2.xml +++ b/src/etc/testcases/taskdefs/bunzip2.xml @@ -27,7 +27,7 @@ </target> <target name="realTest"> - <bunzip2 src="expected/asf-logo-huge.tar.bz2" dest="${output}/asf-logo-huge.tar"/> + <bunzip2 src="expected/asf-logo-huge.tar.bz2" dest="${output}/asf-logo-huge.tar" /> </target> <target name="realTestWithResource"> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/bzip2.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/bzip2.xml b/src/etc/testcases/taskdefs/bzip2.xml index 857b27a..e133dae 100644 --- a/src/etc/testcases/taskdefs/bzip2.xml +++ b/src/etc/testcases/taskdefs/bzip2.xml @@ -22,7 +22,7 @@ <target name="realTest"> <bzip2 src="${output}/asf-logo-huge-from-gzip.tar" - zipfile="${output}/asf-logo-huge.tar.bz2"/> + zipfile="${output}/asf-logo-huge.tar.bz2" /> </target> <target name="realTestWithResource"> @@ -33,7 +33,7 @@ <target name="testDateCheck"> <touch file="${output}/asf-logo.gif.bz2"/> - <bzip2 src="../asf-logo.gif" zipfile="${output}/asf-logo.gif.bz2"/> + <bzip2 src="../asf-logo.gif" zipfile="${output}/asf-logo.gif.bz2" /> </target> <target name="prepare"> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/checksum.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/checksum.xml b/src/etc/testcases/taskdefs/checksum.xml index 78f6f6f..e82fb69 100644 --- a/src/etc/testcases/taskdefs/checksum.xml +++ b/src/etc/testcases/taskdefs/checksum.xml @@ -18,19 +18,19 @@ <project default="cleanup" basedir="."> <macrodef name="compare"> - <attribute name="expected"/> - <attribute name="output"/> + <attribute name="expected" /> + <attribute name="output" /> <sequential> <loadfile property="expected" srcfile="@{expected}"> - <filterchain><striplinebreaks/></filterchain> + <filterchain><striplinebreaks /></filterchain> </loadfile> <loadfile property="output" srcfile="@{output}"> - <filterchain><striplinebreaks/></filterchain> + <filterchain><striplinebreaks /></filterchain> </loadfile> <fail message="${output} not = ${expected}"> <condition> <not> - <equals arg1="${output}" arg2="${expected}"/> + <equals arg1="${output}" arg2="${expected}" /> </not> </condition> </fail> @@ -38,31 +38,31 @@ </macrodef> <macrodef name="testverify"> - <attribute name="checknologo" default="false"/> - <element name="stuff" implicit="true"/> + <attribute name="checknologo" default="false" /> + <element name="stuff" implicit="true" /> <sequential> <fail> <condition> <or> - <isset property="logo.MD5"/> - <isset property="no.logo.MD5"/> + <isset property="logo.MD5" /> + <isset property="no.logo.MD5" /> </or> </condition> </fail> - <stuff/> + <stuff /> <fail> <condition> <not> - <istrue value="${logo.MD5}"/> + <istrue value="${logo.MD5}" /> </not> </condition> </fail> <fail> <condition> <and> - <istrue value="@{checknologo}"/> + <istrue value="@{checknologo}" /> <not> - <isfalse value="${no.logo.MD5}"/> + <isfalse value="${no.logo.MD5}" /> </not> </and> </condition> @@ -70,8 +70,8 @@ <fail> <condition> <and> - <isfalse value="@{checknologo}"/> - <isset property="no.logo.MD5"/> + <isfalse value="@{checknologo}" /> + <isset property="no.logo.MD5" /> </and> </condition> </fail> @@ -79,52 +79,52 @@ </macrodef> <target name="cleanup"> - <delete file="../asf-logo.gif.MD5"/> - <delete file="../asf-logo.gif.md5"/> - <delete file="../asf-logo.gif.MD5SUM"/> - <delete file="../asf-logo.gif.md5sum"/> - <delete file="../asf-logo.gif.SVF"/> - <delete file="../asf-logo.gif.svf"/> - <delete file="../asf-logo.gif.pattern"/> - <delete file="../asf-logo.gif.PATTERN"/> + <delete file="../asf-logo.gif.MD5" /> + <delete file="../asf-logo.gif.md5" /> + <delete file="../asf-logo.gif.MD5SUM" /> + <delete file="../asf-logo.gif.md5sum" /> + <delete file="../asf-logo.gif.SVF" /> + <delete file="../asf-logo.gif.svf" /> + <delete file="../asf-logo.gif.pattern" /> + <delete file="../asf-logo.gif.PATTERN" /> <delete> <fileset dir="checksum"> <include name="**/*.MD5"/> </fileset> </delete> - <delete dir="checksum/checksums"/> + <delete dir="checksum/checksums" /> </target> <target name="createMd5"> - <checksum file="../asf-logo.gif" fileext=".MD5"/> - <compare expected="expected/asf-logo.gif.md5" output="../asf-logo.gif.MD5"/> + <checksum file="../asf-logo.gif" fileext=".MD5" /> + <compare expected="expected/asf-logo.gif.md5" output="../asf-logo.gif.MD5" /> </target> <target name="createMD5SUMformat"> - <checksum file="../asf-logo.gif" format="MD5SUM" fileext=".MD5SUM"/> - <compare expected="expected/asf-logo.gif.md5sum" output="../asf-logo.gif.MD5SUM"/> + <checksum file="../asf-logo.gif" format="MD5SUM" fileext=".MD5SUM" /> + <compare expected="expected/asf-logo.gif.md5sum" output="../asf-logo.gif.MD5SUM" /> </target> <target name="createSVFformat"> - <checksum file="../asf-logo.gif" format="SVF" fileext=".SVF"/> - <compare expected="expected/asf-logo.gif.svf" output="../asf-logo.gif.SVF"/> + <checksum file="../asf-logo.gif" format="SVF" fileext=".SVF" /> + <compare expected="expected/asf-logo.gif.svf" output="../asf-logo.gif.SVF" /> </target> <target name="createPattern"> - <checksum file="../asf-logo.gif" pattern="foo{0}bar" fileext=".PATTERN"/> - <compare expected="expected/asf-logo.gif.pattern" output="../asf-logo.gif.PATTERN"/> + <checksum file="../asf-logo.gif" pattern="foo{0}bar" fileext=".PATTERN" /> + <compare expected="expected/asf-logo.gif.pattern" output="../asf-logo.gif.PATTERN" /> </target> <target name="setProperty"> - <checksum file="../asf-logo.gif" property="logo.MD5"/> + <checksum file="../asf-logo.gif" property="logo.MD5" /> <fail> <condition> <or> <not> <equals arg1="0541d3df42520911f268abc730f3afe0" - arg2="${logo.MD5}"/> + arg2="${logo.MD5}" /> </not> - <available file="../asf-logo.gif.MD5"/> + <available file="../asf-logo.gif.MD5" /> </or> </condition> </fail> @@ -132,25 +132,25 @@ <target name="verifyAsTask"> <testverify checknologo="true"> - <copy file="expected/asf-logo.gif.md5" todir=".."/> + <copy file="expected/asf-logo.gif.md5" todir=".." /> <checksum file="../asf-logo.gif" fileext=".md5" - verifyproperty="logo.MD5"/> + verifyproperty="logo.MD5" /> <copy file="checksum.xml" tofile="../asf-logo.gif.MD5" - overwrite="true"/> + overwrite="true" /> <checksum file="../asf-logo.gif" fileext=".MD5" - verifyproperty="no.logo.MD5"/> + verifyproperty="no.logo.MD5" /> </testverify> </target> <target name="verifyMD5SUMAsTask"> <testverify checknologo="true"> - <copy file="expected/asf-logo.gif.md5sum" todir=".."/> + <copy file="expected/asf-logo.gif.md5sum" todir=".." /> <checksum file="../asf-logo.gif" fileext=".md5sum" verifyproperty="logo.MD5" format="MD5SUM"/> <copy file="checksum.xml" tofile="../asf-logo.gif.MD5SUM" - overwrite="true"/> + overwrite="true" /> <checksum file="../asf-logo.gif" fileext=".MD5SUM" verifyproperty="no.logo.MD5" format="MD5SUM"/> </testverify> @@ -158,15 +158,15 @@ <target name="verifyAsCondition"> <testverify> - <copy file="expected/asf-logo.gif.md5" todir=".."/> + <copy file="expected/asf-logo.gif.md5" todir=".." /> <condition property="logo.MD5"> - <checksum file="../asf-logo.gif" fileext=".md5"/> + <checksum file="../asf-logo.gif" fileext=".md5" /> </condition> <copy file="checksum.xml" tofile="../asf-logo.gif.MD5" - overwrite="true"/> + overwrite="true" /> <condition property="no.logo.MD5"> - <checksum file="../asf-logo.gif" fileext=".MD5"/> + <checksum file="../asf-logo.gif" fileext=".MD5" /> </condition> </testverify> </target> @@ -174,7 +174,7 @@ <target name="verifyFromProperty"> <fail> <condition> - <isset property="verify"/> + <isset property="verify" /> </condition> </fail> <checksum property="checksum" file="checksum.xml"/> @@ -183,7 +183,7 @@ <fail> <condition> <not> - <istrue value="${verify}"/> + <istrue value="${verify}" /> </not> </condition> </fail> @@ -198,7 +198,7 @@ <fail> <condition> <not> - <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}"/> + <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}" /> </not> </condition> </fail> @@ -215,7 +215,7 @@ <fail> <condition> <not> - <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}"/> + <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}" /> </not> </condition> </fail> @@ -230,26 +230,26 @@ <fail> <condition> <not> - <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}"/> + <equals arg1="ef8f1477fcc9bf93832c1a74f629c626" arg2="${total}" /> </not> </condition> </fail> <pathconvert property="srcdirfile"> - <file file="checksum/foo/zap/Eenie.MD5"/> + <file file="checksum/foo/zap/Eenie.MD5" /> </pathconvert> <pathconvert property="destdirfile"> - <file file="checksum/checksums/foo/zap/Eenie.MD5"/> + <file file="checksum/checksums/foo/zap/Eenie.MD5" /> </pathconvert> <fail message="Checksums should be written to ${destdirfile}"> <condition> <not> - <available file="${destdirfile}"/> + <available file="${destdirfile}" /> </not> </condition> </fail> <fail message="Checksums should not be written to ${srcdirfile}"> <condition> - <available file="${srcdirfile}"/> + <available file="${srcdirfile}" /> </condition> </fail> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/classloader.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/classloader.xml b/src/etc/testcases/taskdefs/classloader.xml index 21ecf0f..02e47ab 100644 --- a/src/etc/testcases/taskdefs/classloader.xml +++ b/src/etc/testcases/taskdefs/classloader.xml @@ -19,22 +19,22 @@ <target name="init"> - <path id="myJars"> + <path id="myJars" > <!-- both ant-junit.jar and junit.jar must be loaded from the same path --> - <pathelement path="${ant.home}/lib/ant-junit.jar"/> - <pathelement path="${junit.jar}"/> + <pathelement path="${ant.home}/lib/ant-junit.jar" /> + <pathelement path="${junit.jar}" /> </path> - <classloader classpathRef="myJars" - reverse="true"> - + <classloader classpathRef="myJars" + reverse="true" > + </classloader> - <junit/> - + <junit /> + </target> <target name="main" depends="init"> - <echo message="Found JUNIT"/> + <echo message="Found JUNIT" /> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/concat.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/concat.xml b/src/etc/testcases/taskdefs/concat.xml index 394cba0..235b152 100644 --- a/src/etc/testcases/taskdefs/concat.xml +++ b/src/etc/testcases/taskdefs/concat.xml @@ -18,10 +18,10 @@ <project name="concat-test" basedir="." default="test1"> - <property name="tmp.file" value="concat.tmp"/> - <property name="tmp.file.2" value="concat.tmp.2"/> + <property name="tmp.file" value="concat.tmp" /> + <property name="tmp.file.2" value="concat.tmp.2" /> - <property name="world" value="World"/> + <property name="world" value="World" /> <target name="cleanup"> <delete file="TESTDEST"/> @@ -49,8 +49,8 @@ <target name="test4"> <concat destfile="${tmp.file.2}"> - <fileset dir="${basedir}" includes="${tmp.file}"/> - <filelist dir="${basedir}" files="${tmp.file},${tmp.file}"/> + <fileset dir="${basedir}" includes="${tmp.file}" /> + <filelist dir="${basedir}" files="${tmp.file},${tmp.file}" /> </concat> </target> @@ -158,7 +158,7 @@ </filterchain> </concat> </target> - + <target name="testmultireader"> <concat destfile="${tmp.file}">Hello, World </concat> @@ -183,7 +183,7 @@ </filterchain> </concat> </target> - + <target name="create-noel"> <concat destfile="concat.noeol">This has no end of line</concat> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/condition.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/condition.xml b/src/etc/testcases/taskdefs/condition.xml index 416394a..81660ae 100644 --- a/src/etc/testcases/taskdefs/condition.xml +++ b/src/etc/testcases/taskdefs/condition.xml @@ -21,14 +21,14 @@ <target name="basic"> <condition property="basic"> - <equals arg1="a" arg2="a"/> + <equals arg1="a" arg2="a" /> </condition> <echo>${basic}</echo> </target> <target name="condition-incomplete"> - <condition> - <equals arg1="a" arg2="a"/> + <condition > + <equals arg1="a" arg2="a" /> </condition> </target> @@ -40,21 +40,21 @@ <target name="shortcut"> <property name="shortcut" value="set"/> <condition property="shortcut"> - <equals arg1="a" arg2="a"/> + <equals arg1="a" arg2="a" /> </condition> <echo>${shortcut}</echo> </target> <target name="dontset"> <condition property="dontset"> - <equals arg1="a" arg2="b"/> + <equals arg1="a" arg2="b" /> </condition> <echo>${dontset}</echo> </target> <target name="setvalue"> - <condition property="setvalue" value="woowoo"> - <equals arg1="a" arg2="a"/> + <condition property="setvalue" value="woowoo" > + <equals arg1="a" arg2="a" /> </condition> <echo>${setvalue}</echo> </target> @@ -62,7 +62,7 @@ <target name="negation"> <condition property="negation"> <not> - <equals arg1="a" arg2="B"/> + <equals arg1="a" arg2="B" /> </not> </condition> <echo>${negation}</echo> @@ -71,7 +71,7 @@ <target name="negationfalse"> <condition property="negationfalse"> <not> - <equals arg1="a" arg2="a"/> + <equals arg1="a" arg2="a" /> </not> </condition> <echo>${negationfalse}</echo> @@ -79,7 +79,7 @@ <target name="negationincomplete"> <condition property="negationincomplete"> - <not/> + <not /> </condition> <echo>${negationincomplete}</echo> </target> @@ -87,8 +87,8 @@ <target name="and"> <condition property="and"> <and> - <equals arg1="a" arg2="a"/> - <equals arg1="B" arg2="B"/> + <equals arg1="a" arg2="a" /> + <equals arg1="B" arg2="B" /> </and> </condition> <echo>${and}</echo> @@ -97,8 +97,8 @@ <target name="andfails"> <condition property="andfails"> <and> - <equals arg1="a" arg2="B"/> - <equals arg1="B" arg2="a"/> + <equals arg1="a" arg2="B" /> + <equals arg1="B" arg2="a" /> </and> </condition> <echo>${andfails}</echo> @@ -107,7 +107,7 @@ <target name="andincomplete"> <condition property="andincomplete"> <and> - <equals arg1="a" arg2="B"/> + <equals arg1="a" arg2="B" /> </and> </condition> <echo>${andincomplete}</echo> @@ -123,8 +123,8 @@ <target name="or"> <condition property="or"> <or> - <equals arg1="a" arg2="B"/> - <equals arg1="B" arg2="B"/> + <equals arg1="a" arg2="B" /> + <equals arg1="B" arg2="B" /> </or> </condition> <echo>${or}</echo> @@ -133,7 +133,7 @@ <target name="orincomplete"> <condition property="orincomplete"> <or> - <equals arg1="a" arg2="a"/> + <equals arg1="a" arg2="a" /> </or> </condition> <echo>${orincomplete}</echo> @@ -149,8 +149,8 @@ <target name="orfails"> <condition property="orfails"> <or> - <equals arg1="a" arg2="B"/> - <equals arg1="B" arg2="a"/> + <equals arg1="a" arg2="B" /> + <equals arg1="B" arg2="a" /> </or> </condition> <echo>${orfails}</echo> @@ -159,23 +159,23 @@ <target name="orboth"> <condition property="orboth"> <or> - <equals arg1="a" arg2="a"/> - <equals arg1="B" arg2="B"/> + <equals arg1="a" arg2="a" /> + <equals arg1="B" arg2="B" /> </or> </condition> <echo>${orboth}</echo> </target> - <target name="filesmatch-identical"> + <target name="filesmatch-identical" > <condition property="filesmatch-identical"> <filesmatch file1="condition.xml" - file2="condition.xml"/> + file2="condition.xml" /> </condition> <echo>${filesmatch-identical}</echo> </target> - <target name="filesmatch-incomplete"> + <target name="filesmatch-incomplete" > <condition property="filesmatch-incomplete"> <filesmatch file1="condition.xml"/> @@ -183,20 +183,20 @@ <echo>${filesmatch-incomplete}</echo> </target> - <target name="filesmatch-oddsizes"> + <target name="filesmatch-oddsizes" > <condition property="filesmatch-oddsizes"> <filesmatch file1="condition.xml" - file2="property.xml"/> + file2="property.xml" /> </condition> <echo>${filesmatch-oddsizes}</echo> </target> - <target name="filesmatch-existence"> + <target name="filesmatch-existence" > <condition property="filesmatch-existence"> <filesmatch file1="condition.xml" - file2="this-file-doesnt-exist.xml"/> + file2="this-file-doesnt-exist.xml" /> </condition> <echo>${filesmatch-existence}</echo> </target> @@ -205,67 +205,67 @@ <fail> <condition> <not> - <filesmatch file1="idonotexist" file2="andneitherdoi"/> + <filesmatch file1="idonotexist" file2="andneitherdoi" /> </not> </condition> </fail> </target> <target name="filesmatch-different"> - <echo file="match1.txt" message="012345676890"/> - <echo file="match2.txt" message="012345676889"/> + <echo file="match1.txt" message="012345676890" /> + <echo file="match2.txt" message="012345676889" /> <condition property="filesmatch-different"> <filesmatch file1="match1.txt" - file2="match2.txt"/> + file2="match2.txt" /> </condition> <echo>${filesmatch-different}</echo> </target> - <target name="filesmatch-match"> - <echo file="match3.txt" message="012345676890"/> - <echo file="match4.txt" message="012345676890"/> + <target name="filesmatch-match" > + <echo file="match3.txt" message="012345676890" /> + <echo file="match4.txt" message="012345676890" /> <condition property="filesmatch-match"> <filesmatch file1="match3.txt" - file2="match4.txt"/> + file2="match4.txt" /> </condition> <echo>${filesmatch-match}</echo> </target> - <target name="filesmatch-different-eol"> - <echo file="match7.txt" message="012345676890"/> - <echo file="match8.txt" message="012345676890"/> - <fixcrlf file="match7.txt" eol="cr" fixlast="true"/> - <fixcrlf file="match8.txt" eol="lf" fixlast="true"/> + <target name="filesmatch-different-eol" > + <echo file="match7.txt" message="012345676890" /> + <echo file="match8.txt" message="012345676890" /> + <fixcrlf file="match7.txt" eol="cr" fixlast="true" /> + <fixcrlf file="match8.txt" eol="lf" fixlast="true" /> <fail> <condition> - <filesmatch file1="match7.txt" file2="match8.txt"/> + <filesmatch file1="match7.txt" file2="match8.txt" /> </condition> </fail> </target> - <target name="filesmatch-same-eol"> - <echo file="match9.txt" message="012345676890"/> - <echo file="match10.txt" message="012345676890"/> - <fixcrlf file="match9.txt" eol="crlf" fixlast="true"/> - <fixcrlf file="match10.txt" eol="lf" fixlast="true"/> + <target name="filesmatch-same-eol" > + <echo file="match9.txt" message="012345676890" /> + <echo file="match10.txt" message="012345676890" /> + <fixcrlf file="match9.txt" eol="crlf" fixlast="true" /> + <fixcrlf file="match10.txt" eol="lf" fixlast="true" /> <fail> <condition> <not> - <filesmatch file1="match9.txt" file2="match10.txt" textfile="true"/> + <filesmatch file1="match9.txt" file2="match10.txt" textfile="true" /> </not> </condition> </fail> </target> <target name="filesmatch-different-sizes"> - <echo file="match5.txt" message="012345676890"/> - <echo file="match6.txt" message="0123456768"/> + <echo file="match5.txt" message="012345676890" /> + <echo file="match6.txt" message="0123456768" /> <condition property="filesmatch-different-sizes"> <filesmatch file1="match5.txt" - file2="match6.txt"/> + file2="match6.txt" /> </condition> <echo>${filesmatch-different-sizes}</echo> </target> @@ -274,146 +274,146 @@ <condition property="filesmatch-different-sizes"> <filesmatch file1="condition.xml" - file2="missing-file.txt"/> + file2="missing-file.txt" /> </condition> <echo>${filesmatch-different-onemissing}</echo> </target> - <target name="contains"> + <target name="contains" > <condition property="contains"> <contains string="abcd" - substring="cd"/> + substring="cd" /> </condition> <echo>${contains}</echo> </target> - <target name="contains-doesnt"> + <target name="contains-doesnt" > <condition property="contains-doesnt"> <contains string="abcd" - substring="CD"/> + substring="CD" /> </condition> <echo>${contains-doesnt}</echo> </target> - <target name="contains-anycase"> + <target name="contains-anycase" > <condition property="contains-anycase"> <contains casesensitive="false" string="abcd" - substring="CD"/> + substring="CD" /> </condition> <echo>${contains-anycase}</echo> </target> - <target name="contains-incomplete1"> + <target name="contains-incomplete1" > <condition property="contains-incomplete1"> <contains - string="abcd"/> + string="abcd" /> </condition> <echo>${contains-incomplete1}</echo> </target> - <target name="contains-incomplete2"> + <target name="contains-incomplete2" > <condition property="contains-incomplete2"> <contains - substring="CD"/> + substring="CD" /> </condition> <echo>${contains-incomplete2}</echo> </target> - <target name="istrue"> - <property name="t" value="true"/> - <property name="o" value="o"/> - <property name="n" value="n"/> + <target name="istrue" > + <property name="t" value="true" /> + <property name="o" value="o" /> + <property name="n" value="n" /> <condition property="istrue"> <and> - <istrue value="${t}"/> - <istrue value="TRUE"/> - <istrue value="yes"/> - <istrue value="YeS"/> - <istrue value="on"/> - <istrue value="${o}${n}"/> + <istrue value="${t}" /> + <istrue value="TRUE" /> + <istrue value="yes" /> + <istrue value="YeS" /> + <istrue value="on" /> + <istrue value="${o}${n}" /> </and> </condition> <echo>${istrue}</echo> </target> - <target name="istrue-not"> + <target name="istrue-not" > <condition property="istrue-not"> <istrue - value="this sentence is true"/> + value="this sentence is true" /> </condition> <echo>${istrue-not}</echo> </target> - <target name="istrue-false"> + <target name="istrue-false" > <condition property="istrue-false"> <or> - <istrue value="false"/> - <istrue value=""/> + <istrue value="false" /> + <istrue value="" /> </or> </condition> <echo>${istrue-false}</echo> </target> - <target name="istrue-incomplete"> + <target name="istrue-incomplete" > <condition property="istrue-incomplete"> - <istrue/> + <istrue /> </condition> <echo>${istrue-incomplete}</echo> </target> - <target name="isfalse-true"> - <property name="t" value="true"/> + <target name="isfalse-true" > + <property name="t" value="true" /> <condition property="isfalse-true"> <isfalse - value="${t}"/> + value="${t}" /> </condition> <echo>${isfalse-true}</echo> </target> - <target name="isfalse-not"> + <target name="isfalse-not" > <condition property="isfalse-not"> <isfalse - value="this sentence is true"/> + value="this sentence is true" /> </condition> <echo>${isfalse-not}</echo> </target> - <target name="isfalse-false"> + <target name="isfalse-false" > <condition property="isfalse-false"> <isfalse - value="false"/> + value="false" /> </condition> <echo>${isfalse-false}</echo> </target> - <target name="isfalse-incomplete"> + <target name="isfalse-incomplete" > <condition property="isfalse-incomplete"> - <isfalse/> + <isfalse /> </condition> <echo>${isfalse-incomplete}</echo> </target> <target name="testElse"> <condition property="unset" value="foo"> - <or/> + <or /> </condition> <condition property="value" value="foo" else="bar"> - <and/> + <and /> </condition> <condition property="else" value="foo" else="bar"> - <or/> + <or /> </condition> <fail> <condition> <or> - <isset property="unset"/> + <isset property="unset" /> <not> <and> - <equals arg1="${value}" arg2="foo"/> - <equals arg1="${else}" arg2="bar"/> + <equals arg1="${value}" arg2="foo" /> + <equals arg1="${else}" arg2="bar" /> </and> </not> </or> @@ -423,14 +423,14 @@ <target name="resourcesmatch-error"> <condition property="errorexpected"> - <resourcesmatch/> + <resourcesmatch /> </condition> </target> <target name="resourcesmatch-match-empty"> <condition property="errorexpected"> <resourcesmatch> - <resources/> + <resources /> </resourcesmatch> </condition> </target> @@ -438,7 +438,7 @@ <target name="resourcesmatch-match-one"> <condition property="errorexpected"> <resourcesmatch> - <string value="foo"/> + <string value="foo" /> </resourcesmatch> </condition> </target> @@ -448,8 +448,8 @@ <condition> <not> <resourcesmatch> - <string value="foo"/> - <string value="foo"/> + <string value="foo" /> + <string value="foo" /> </resourcesmatch> </not> </condition> @@ -461,9 +461,9 @@ <condition> <not> <resourcesmatch> - <string value="foo"/> - <string value="foo"/> - <string value="foo"/> + <string value="foo" /> + <string value="foo" /> + <string value="foo" /> </resourcesmatch> </not> </condition> @@ -471,27 +471,27 @@ </target> <target name="resourcesmatch-differ"> - <echo file="match11.txt" message="foo"/> - <fixcrlf file="match11.txt" eol="crlf" fixlast="true"/> + <echo file="match11.txt" message="foo" /> + <fixcrlf file="match11.txt" eol="crlf" fixlast="true" /> <fail> <condition> <resourcesmatch> - <file file="match11.txt"/> - <string value="foo"/> + <file file="match11.txt" /> + <string value="foo" /> </resourcesmatch> </condition> </fail> </target> <target name="resourcesmatch-match-text"> - <echo file="match11.txt" message="foo"/> - <fixcrlf file="match11.txt" eol="crlf"/> + <echo file="match11.txt" message="foo" /> + <fixcrlf file="match11.txt" eol="crlf" /> <fail> <condition> <not> <resourcesmatch astext="true"> - <file file="match11.txt"/> - <string value="foo"/> + <file file="match11.txt" /> + <string value="foo" /> </resourcesmatch> </not> </condition> @@ -503,18 +503,18 @@ <condition> <not> <resourcesmatch> - <resource name="foo" exists="false"/> - <resource name="bar" exists="false"/> - <resource name="baz" exists="false"/> + <resource name="foo" exists="false" /> + <resource name="bar" exists="false" /> + <resource name="baz" exists="false" /> </resourcesmatch> </not> </condition> </fail> </target> - <target name="cleanup"> + <target name="cleanup" > <delete> - <fileset dir="." includes="match?.txt,match??.txt"/> + <fileset dir="." includes="match?.txt,match??.txt" /> </delete> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/conditions/antversion.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/conditions/antversion.xml b/src/etc/testcases/taskdefs/conditions/antversion.xml index 9dbefc8..eb9d4b6 100644 --- a/src/etc/testcases/taskdefs/conditions/antversion.xml +++ b/src/etc/testcases/taskdefs/conditions/antversion.xml @@ -21,7 +21,7 @@ <fail> <condition> <not> - <antversion atleast="1.7"/> + <antversion atleast="1.7" /> </not> </condition> Should be at least 1.7 @@ -32,7 +32,7 @@ <fail> <condition> <not> - <antversion exactly="1.9.13"/> + <antversion exactly="1.9.13" /> </not> </condition> Should be exactly 1.9.13 @@ -41,11 +41,11 @@ </target> <target name="testatleastfail"> - <property name="version" value="1.8.9"/> + <property name="version" value="1.8.9" /> <fail> <condition> <not> - <antversion atleast="1.9.13"/> + <antversion atleast="1.9.13" /> </not> </condition> Should be at least 1.9.13 @@ -53,11 +53,11 @@ </target> <target name="testexactlyfail"> - <property name="version" value="1.8.0"/> + <property name="version" value="1.8.0" /> <fail> <condition> <not> - <antversion exactly="1.9.13"/> + <antversion exactly="1.9.13" /> </not> </condition> Should be exactly 1.9.13 http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/conditions/isfailure.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/conditions/isfailure.xml b/src/etc/testcases/taskdefs/conditions/isfailure.xml index 1dde9e7..b5d1a6a 100644 --- a/src/etc/testcases/taskdefs/conditions/isfailure.xml +++ b/src/etc/testcases/taskdefs/conditions/isfailure.xml @@ -22,37 +22,37 @@ <condition> <or> <and> - <os family="openvms"/> + <os family="openvms" /> <or> - <isfailure code="1"/> - <isfailure code="3"/> - <isfailure code="5"/> - <isfailure code="7"/> - <isfailure code="9"/> + <isfailure code="1" /> + <isfailure code="3" /> + <isfailure code="5" /> + <isfailure code="7" /> + <isfailure code="9" /> <not> <and> - <isfailure code="0"/> - <isfailure code="2"/> - <isfailure code="4"/> - <isfailure code="6"/> - <isfailure code="8"/> + <isfailure code="0" /> + <isfailure code="2" /> + <isfailure code="4" /> + <isfailure code="6" /> + <isfailure code="8" /> </and> </not> </or> </and> <and> <not> - <os family="openvms"/> + <os family="openvms" /> </not> <or> - <isfailure code="0"/> + <isfailure code="0" /> <not> <and> - <isfailure code="1"/> - <isfailure code="10"/> - <isfailure code="50"/> - <isfailure code="100"/> - <isfailure code="255"/> + <isfailure code="1" /> + <isfailure code="10" /> + <isfailure code="50" /> + <isfailure code="100" /> + <isfailure code="255" /> </and> </not> </or> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/conditions/issigned.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/conditions/issigned.xml b/src/etc/testcases/taskdefs/conditions/issigned.xml index f4906dc..7cbf328 100644 --- a/src/etc/testcases/taskdefs/conditions/issigned.xml +++ b/src/etc/testcases/taskdefs/conditions/issigned.xml @@ -16,7 +16,7 @@ limitations under the License. --> <project default="all"> - + <target name="pass" description="check if a name of pass is ok"> <fail message="name of pass not seen in the signed pass.jar"> <condition> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/conditions/parsersupports.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/conditions/parsersupports.xml b/src/etc/testcases/taskdefs/conditions/parsersupports.xml index 5bc5232..c80fd35 100644 --- a/src/etc/testcases/taskdefs/conditions/parsersupports.xml +++ b/src/etc/testcases/taskdefs/conditions/parsersupports.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<project name="parsersupports"> +<project name="parsersupports" > <!-- * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,7 +20,7 @@ <target name="testEmpty"> <condition property="empty"> - <parsersupports/> + <parsersupports /> </condition> <fail>Expected failure before here</fail> </target> @@ -34,7 +34,7 @@ <target name="testNamespaces"> <fail> - <condition> + <condition > <not> <parsersupports feature="http://xml.org/sax/features/namespaces"/> </not> @@ -61,13 +61,14 @@ <condition> <not> <parsersupports - property="http://xml.org/sax/properties/declaration-handler"/> + property="http://xml.org/sax/properties/declaration-handler"; + /> </not> </condition> Expected no property </fail> </target> - + <target name="testUnknownProperty"> <fail> <condition> @@ -77,7 +78,7 @@ Expected unsupported property. </fail> </target> - + <target name="testXercesProperty"> <fail> <condition> @@ -90,5 +91,5 @@ Expected XSD support on Xerces. </fail> </target> - -</project> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/conditions/typefound.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/conditions/typefound.xml b/src/etc/testcases/taskdefs/conditions/typefound.xml index 938f1f3..054ca67 100644 --- a/src/etc/testcases/taskdefs/conditions/typefound.xml +++ b/src/etc/testcases/taskdefs/conditions/typefound.xml @@ -27,7 +27,7 @@ <target name="testUndefined"> <condition property="testUndefined"> - <typefound/> + <typefound /> </condition> </target> @@ -72,4 +72,4 @@ </condition> </target> -</project> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/conditions/xor.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/conditions/xor.xml b/src/etc/testcases/taskdefs/conditions/xor.xml index 3ba32b3..895dccd 100644 --- a/src/etc/testcases/taskdefs/conditions/xor.xml +++ b/src/etc/testcases/taskdefs/conditions/xor.xml @@ -17,9 +17,9 @@ --> <project default="all"> -<!-- +<!-- Xor semantics - + in out == === 00 0 @@ -29,7 +29,7 @@ --> - <target name="testEmpty"> + <target name="testEmpty" > <fail message="empty test"> <condition> <xor/> @@ -37,76 +37,76 @@ </fail> </target> - <target name="test1"> + <target name="test1" > <fail message="testTrue"> <condition> <not> <xor> - <istrue value="true"/> + <istrue value="true" /> </xor> </not> </condition> </fail> </target> - - <target name="test0"> + + <target name="test0" > <fail message="testFalse"> <condition> <xor> - <istrue value=""/> + <istrue value="" /> </xor> </condition> </fail> </target> - - <target name="test10"> + + <target name="test10" > <fail message="test10"> <condition> <not> <xor> - <istrue value="true"/> - <istrue value=""/> + <istrue value="true" /> + <istrue value="" /> </xor> </not> </condition> </fail> </target> - <target name="test01"> + <target name="test01" > <fail message="test01"> <condition> <not> <xor> - <istrue value=""/> - <istrue value="true"/> + <istrue value="" /> + <istrue value="true" /> </xor> </not> </condition> </fail> </target> - - <target name="test00"> + + <target name="test00" > <fail message="test10"> <condition> <xor> - <istrue value=""/> - <istrue value=""/> + <istrue value="" /> + <istrue value="" /> </xor> </condition> </fail> </target> - - <target name="test11"> + + <target name="test11" > <fail message="test11"> <condition> <xor> - <istrue value=""/> - <istrue value=""/> + <istrue value="" /> + <istrue value="" /> </xor> </condition> </fail> </target> - + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/copy.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/copy.xml b/src/etc/testcases/taskdefs/copy.xml index 3b7f74a..2601556 100644 --- a/src/etc/testcases/taskdefs/copy.xml +++ b/src/etc/testcases/taskdefs/copy.xml @@ -21,11 +21,11 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> <target name="test1"> - <copy file="copy.xml" tofile="${output}/copytest1.tmp"/> + <copy file="copy.xml" tofile="${output}/copytest1.tmp" /> </target> <target name="test2"> @@ -42,7 +42,7 @@ PRODUCT_BUILD=6.5 (BLD_65036) </concat> <copy file="${output}/copy.filter.inp" tofile="${output}/copy.filter.out"> <filterset begintoken="6" endtoken="4"> - <filter token=".2.1." value="2.6.4"/> + <filter token=".2.1." value="2.6.4" /> </filterset> </copy> <concat><path path="${output}/copy.filter.out"/></concat> @@ -68,14 +68,14 @@ a=b= <copy file="copy.xml" tofile="${output}/copytest3b.tmp" overwrite="true"/> </target><target name="test3Part2"> <!-- copy an old file onto a newer file (should not work) --> - <copy file="${output}/copytest3.tmp" tofile="${output}/copytest3b.tmp"/> + <copy file="${output}/copytest3.tmp" tofile="${output}/copytest3b.tmp" /> <!-- copy an older file onto a new one, should succeed --> <copy file="${output}/copytest3.tmp" tofile="${output}/copytest3c.tmp" overwrite="true" - preservelastmodified="true"/> + preservelastmodified="true" /> <!-- copy a newer file onto an older one (should work) --> <copy file="${output}/copytest3a.tmp" tofile="${output}/copytest3.tmp" - preservelastmodified="true"/> + preservelastmodified="true" /> <!-- expected state : 3a.tmp==3.tmp==copy.xml timeof(3a.tmp)==timeof(3.tmp)==now()-4 @@ -219,46 +219,46 @@ a=b= <target name="prepareDirset"> <touch mkdirs="true"> <filelist dir="${from.dir}/dirset"> - <file name="a/x/foo"/> - <file name="a/y/foo"/> - <file name="a/z/foo"/> - <file name="b/x/foo"/> - <file name="b/y/foo"/> - <file name="b/z/foo"/> + <file name="a/x/foo" /> + <file name="a/y/foo" /> + <file name="a/z/foo" /> + <file name="b/x/foo" /> + <file name="b/y/foo" /> + <file name="b/z/foo" /> </filelist> </touch> <fail> <condition> <or> <resourcecount when="ne" count="9"> - <dirset id="dirset" dir="${from.dir}/dirset"/> + <dirset id="dirset" dir="${from.dir}/dirset" /> </resourcecount> <resourcecount when="ne" count="6"> - <fileset dir="${from.dir}/dirset"/> + <fileset dir="${from.dir}/dirset" /> </resourcecount> </or> </condition> </fail> - <delete dir="${to.dir}/dirset"/> + <delete dir="${to.dir}/dirset" /> <fail> <condition> - <available file="${to.dir}/dirset"/> + <available file="${to.dir}/dirset" /> </condition> </fail> </target> <target name="testDirset" depends="prepareDirset"> <copy todir="${to.dir}/dirset"> - <resources refid="dirset"/> + <resources refid="dirset" /> </copy> <fail> <condition> <or> <resourcecount when="ne" count="9"> - <dirset dir="${to.dir}/dirset"/> + <dirset dir="${to.dir}/dirset" /> </resourcecount> <resourcecount when="ne" count="0"> - <fileset dir="${to.dir}/dirset"/> + <fileset dir="${to.dir}/dirset" /> </resourcecount> </or> </condition> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/copydir.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/copydir.xml b/src/etc/testcases/taskdefs/copydir.xml index 7bacfd9..8a8abd3 100644 --- a/src/etc/testcases/taskdefs/copydir.xml +++ b/src/etc/testcases/taskdefs/copydir.xml @@ -21,7 +21,7 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> <target name="test1"> @@ -37,18 +37,18 @@ </target> <target name="test4"> - <copydir src="." + <copydir src="." dest="."/> </target> <target name="test5"> - <mkdir dir="${output}/taskdefs.tmp"/> - <copydir src="." + <mkdir dir="${output}/taskdefs.tmp" /> + <copydir src="." dest="${output}/taskdefs.tmp"/> </target> <target name="test6"> - <copydir src="." + <copydir src="." dest="template.xml"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/copyfile.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/copyfile.xml b/src/etc/testcases/taskdefs/copyfile.xml index 798b12d..0f8c9ab 100644 --- a/src/etc/testcases/taskdefs/copyfile.xml +++ b/src/etc/testcases/taskdefs/copyfile.xml @@ -21,7 +21,7 @@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> <target name="test1"> @@ -37,12 +37,12 @@ </target> <target name="test4"> - <copyfile src="template.xml" + <copyfile src="template.xml" dest="template.xml"/> </target> <target name="test5"> - <copyfile src="copyfile.xml" + <copyfile src="copyfile.xml" dest="${output}/copyfile.tmp"/> </target> @@ -50,7 +50,7 @@ <mkdir dir="${output}/testdir"/> <copyfile src="copyfile.xml" dest="${output}/testdir" - forceoverwrite="true"/> + forceoverwrite="true" /> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/cvspass.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/cvspass.xml b/src/etc/testcases/taskdefs/cvspass.xml index 0e102f5..bbca110 100644 --- a/src/etc/testcases/taskdefs/cvspass.xml +++ b/src/etc/testcases/taskdefs/cvspass.xml @@ -21,21 +21,23 @@ <taskdef name="cvspass" classname="org.apache.tools.ant.taskdefs.CVSPass"/> <target name="test1"> - <cvspass/> + <cvspass /> </target> - + <target name="test2"> <cvspass cvsroot=":pserver:[email protected]:/home/cvspublic" - passfile="testpassfile.tmp"/> + passfile="testpassfile.tmp" + /> </target> - + <!-- testPassFile --> <target name="test3"> <cvspass cvsroot=":pserver:[email protected]:/home/cvspublic" password="anoncvs" - passfile="testpassfile.tmp"/> + passfile="testpassfile.tmp" + /> </target> <!-- testPassFileDuplicateEntry --> @@ -43,15 +45,18 @@ <cvspass cvsroot=":pserver:[email protected]:/home/cvspublic" password="anoncvs" - passfile="testpassfile.tmp"/> + passfile="testpassfile.tmp" + /> <cvspass cvsroot=":pserver:[email protected]:/home/cvspublic" password="anoncvs" - passfile="testpassfile.tmp"/> + passfile="testpassfile.tmp" + /> <cvspass cvsroot=":pserver:[email protected]:/cvs" password="guest" - passfile="testpassfile.tmp"/> + passfile="testpassfile.tmp" + /> </target> <!-- testPassFileMultipleEntry --> @@ -59,18 +64,21 @@ <cvspass cvsroot=":pserver:[email protected]:/home/cvspublic" password="anoncvs" - passfile="testpassfile.tmp"/> + passfile="testpassfile.tmp" + /> <cvspass cvsroot=":pserver:[email protected]:/home/cvspublic" password="anoncvs" - passfile="testpassfile.tmp"/> + passfile="testpassfile.tmp" + /> <cvspass cvsroot=":pserver:[email protected]:/cvs" password="guest" - passfile="testpassfile.tmp"/> + passfile="testpassfile.tmp" + /> </target> - <target name="cleanup"> + <target name="cleanup"> <delete file="testpassfile.tmp"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/delete.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/delete.xml b/src/etc/testcases/taskdefs/delete.xml index ded8145..d74c8ba 100644 --- a/src/etc/testcases/taskdefs/delete.xml +++ b/src/etc/testcases/taskdefs/delete.xml @@ -20,7 +20,8 @@ <import file="../buildfiletest-base.xml"/> - <property name="dir" location="${output}"/> + + <property name="dir" location="${output}" /> <basename property="dirname" file="${output}"/> <macrodef name="expectabsent"> @@ -29,7 +30,7 @@ <fileset id="detritus" dir="@{target}" erroronmissingdir="false"/> <fail message="@{target} still has: ${toString:detritus}"> <condition> - <available file="@{target}"/> + <available file="@{target}" /> </condition> </fail> </sequential> @@ -41,11 +42,11 @@ <condition> <or> <resourcecount when="greater" count="0"> - <fileset dir="${dir}"/> + <fileset dir="${dir}" /> </resourcecount> <not> <resourcecount count="${srcdirs}"> - <dirset dir="${dir}"/> + <dirset dir="${dir}" /> </resourcecount> </not> </or> @@ -56,31 +57,31 @@ <target name="init"> <resourcecount property="srcdirs"> - <dirset dir="${basedir}"/> + <dirset dir="${basedir}" /> </resourcecount> <resourcecount property="srcsize"> - <files includes="${basedir}/"/> + <files includes="${basedir}/" /> </resourcecount> - <mkdir dir="${dir}"/> + <mkdir dir="${dir}" /> <copy todir="${dir}"> - <fileset dir="${basedir}" excludes="${dirname},${dirname}/**"/> + <fileset dir="${basedir}" excludes="${dirname},${dirname}/**" /> </copy> </target> <target name="test1"> - <delete/> + <delete /> </target> <target name="test2" depends="init"> - <delete file="${dir}"/> + <delete file="${dir}" /> <fail> <condition> <not> <resourcecount count="${srcsize}"> - <files includes="${dir}/"/> + <files includes="${dir}/" /> </resourcecount> </not> </condition> @@ -88,81 +89,81 @@ </target> <target name="test4" depends="init"> - <delete dir="${dir}"/> - <expectabsent/> + <delete dir="${dir}" /> + <expectabsent /> </target> <target name="test5" depends="init"> - <delete dir="${dir}" includes="**"/> - <expectdirsonly/> + <delete dir="${dir}" includes="**" /> + <expectdirsonly /> </target> <target name="test6" depends="init"> - <delete dir="${dir}" includes="**" includeemptydirs="true"/> - <expectabsent/> + <delete dir="${dir}" includes="**" includeemptydirs="true" /> + <expectabsent /> </target> <target name="test7" depends="init"> <delete> - <fileset id="fs" dir="${dir}"/> + <fileset id="fs" dir="${dir}" /> </delete> - <expectdirsonly/> + <expectdirsonly /> </target> <target name="test8" depends="init"> <delete includeemptydirs="true"> - <fileset dir="${dir}"/> + <fileset dir="${dir}" /> </delete> - <expectabsent/> + <expectabsent /> </target> <target name="test9" depends="init"> <delete> <files> - <include name="${dir}/**"/> + <include name="${dir}/**"/> </files> </delete> - <expectabsent/> + <expectabsent /> </target> <target name="test10"> <delete> - <filelist dir="${dir}" files="test10absentfile"/> + <filelist dir="${dir}" files="test10absentfile" /> </delete> </target> <target name="test11"> <delete failonerror="false"> - <fileset dir="thisdenotesadirectorythatwillneverexistblah"/> + <fileset dir="thisdenotesadirectorythatwillneverexistblah" /> </delete> </target> <target name="test12"> <delete failonerror="false" includeemptydirs="true"> - <fileset dir="thisdenotesadirectorythatwillneverexistblah"/> + <fileset dir="thisdenotesadirectorythatwillneverexistblah" /> </delete> </target> <target name="test13" depends="init"> <delete includeemptydirs="true"> - <fileset dir="${dir}"/> - <fileset dir="${dir}"/> + <fileset dir="${dir}" /> + <fileset dir="${dir}" /> </delete> - <expectabsent/> + <expectabsent /> </target> <target name="test14" depends="init"> - <delete quiet="false"> - <fileset dir="${dir}"/> - <fileset dir="${dir}"/> - </delete> + <delete quiet="false"> + <fileset dir="${dir}" /> + <fileset dir="${dir}" /> + </delete> </target> <target name="test15" depends="init"> - <delete quiet="true"> - <fileset dir="${dir}"/> - <fileset dir="${dir}"/> - </delete> + <delete quiet="true"> + <fileset dir="${dir}" /> + <fileset dir="${dir}" /> + </delete> </target> <!-- Bugzilla 40313 --> <target name="test16.init"> @@ -188,4 +189,6 @@ <expectabsent target="${dir}/subdir"/> </target> + + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/dynamictask.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/dynamictask.xml b/src/etc/testcases/taskdefs/dynamictask.xml index 409c7d7..307181f 100644 --- a/src/etc/testcases/taskdefs/dynamictask.xml +++ b/src/etc/testcases/taskdefs/dynamictask.xml @@ -19,14 +19,14 @@ <project name="dynamic-test" default="simple"> <path id="testclasses"> - <pathelement location="../../../../build/testcases"/> - <pathelement path="${java.class.path}"/> + <pathelement location="../../../../build/testcases" /> + <pathelement path="${java.class.path}" /> </path> <target name="simple"> <taskdef name="dyna" classname="org.apache.tools.ant.taskdefs.DynamicTask"> - <classpath refid="testclasses"/> + <classpath refid="testclasses" /> </taskdef> <dyna prop1="1" prop2="2"> <sub prop3="3"/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/echoxml.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/echoxml.xml b/src/etc/testcases/taskdefs/echoxml.xml index 0c107c4..ec53abb 100644 --- a/src/etc/testcases/taskdefs/echoxml.xml +++ b/src/etc/testcases/taskdefs/echoxml.xml @@ -16,31 +16,31 @@ limitations under the License. --> <project> - <property name="file" location="echoed.xml"/> + <property name="file" location="echoed.xml" /> <target name="init"> <echoxml file="${file}"> <project> - <property name="foo" value="bar"/> + <property name="foo" value="bar" /> <fail message="$$$${foo}=$${foo}"> <condition> - <istrue value="${mustfail}"/> + <istrue value="${mustfail}" /> </condition> </fail> </project> </echoxml> </target> <target name="tearDown"> - <delete file="${file}"/> + <delete file="${file}" /> </target> <target name="testPass" depends="init"> - <ant antfile="${file}"/> + <ant antfile="${file}" /> </target> <target name="testFail" depends="init"> <ant antfile="${file}"> - <property name="mustfail" value="true"/> + <property name="mustfail" value="true" /> </ant> </target> <target name="testEmpty"> - <echoxml/> + <echoxml /> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/email/mail.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/email/mail.xml b/src/etc/testcases/taskdefs/email/mail.xml index 8f07635..c56fd40 100644 --- a/src/etc/testcases/taskdefs/email/mail.xml +++ b/src/etc/testcases/taskdefs/email/mail.xml @@ -21,18 +21,20 @@ <target name="test1"> <!-- this test is supposed to bring a build exception because user and password is not allowed with plain encoding --> <mail host="localhost" port="25" from="[email protected]" to="[email protected]" subject="hello" encoding="plain" user="joe" password="secret"> - <message> + <message> Hi Laura, how are you doing ? - </message> + </message> </mail> </target> <target name="test2"> - <!-- this test is supposed to bring a build exception because SSL is not allowed with plain encoding --> - <mail host="localhost" port="465" from="[email protected]" to="[email protected]" subject="hello" encoding="plain" ssl="true"> - <message> + <!-- this test is supposed to bring a build exception because SSL is not allowed with plain encoding --> + <mail host="localhost" port="465" from="[email protected]" to="[email protected]" subject="hello" encoding="plain" ssl="true"> + <message> Hi Laura, how are you doing ? - </message> - </mail> - </target> + </message> + </mail> + </target> + + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/etc/testcases/taskdefs/exec/blabla.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/exec/blabla.xml b/src/etc/testcases/taskdefs/exec/blabla.xml index b7a6dca..3b13195 100644 --- a/src/etc/testcases/taskdefs/exec/blabla.xml +++ b/src/etc/testcases/taskdefs/exec/blabla.xml @@ -1,7 +1,7 @@ <project name="blabla" default="doit"> <target name="blabla"> <exec executable="sh"> - <arg value="blabla.sh"/> + <arg value="blabla.sh" /> </exec> </target> <target name="doit">
