Repository: ant Updated Branches: refs/heads/master 4ce54bf3b -> 995b518ab
http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/resources/selectors/test-componentdef.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/selectors/test-componentdef.xml b/src/tests/antunit/types/resources/selectors/test-componentdef.xml index 71de167..187412e 100644 --- a/src/tests/antunit/types/resources/selectors/test-componentdef.xml +++ b/src/tests/antunit/types/resources/selectors/test-componentdef.xml @@ -17,27 +17,27 @@ --> <project default="all" xmlns:au="antlib:org.apache.ant.antunit"> - <available property="jdk1.4+" classname="java.lang.CharSequence"/> + <available property="jdk1.4+" classname="java.lang.CharSequence"/> <condition property="some.regexp.support"> <or> <isset property="jdk1.4+"/> <isset property="apache.regexp.present"/> <isset property="apache.oro.present"/> </or> - </condition> - + </condition> + <target name="testname1"> <au:assertTrue> <resourcecount when="equal" count="2"> <restrict> <resources> - <resource name="foo"/> - <resource name="bar"/> - <resource name="baz"/> - <resource name="boo"/> - <resource name="bang"/> + <resource name="foo" /> + <resource name="bar" /> + <resource name="baz" /> + <resource name="boo" /> + <resource name="bang" /> </resources> - <name name="ba?"/> + <name name="ba?" /> </restrict> </resourcecount> </au:assertTrue> @@ -48,28 +48,28 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <file file="foo"/> - <resource name="foo"/> - <file file="foo" basedir="${basedir}"/> + <file file="foo" /> + <resource name="foo" /> + <file file="foo" basedir="${basedir}" /> </resources> - <name name="foo"/> + <name name="foo" /> </restrict> </resourcecount> </au:assertTrue> </target> - <target name="name" depends="testname1,testname2"/> + <target name="name" depends="testname1,testname2" /> <target name="testexists"> <au:assertTrue> <resourcecount when="equal" count="1"> <restrict> <resources> - <file file="idonotexist"/> - <resource name="foo"/> - <resource name="foo" exists="false"/> + <file file="idonotexist" /> + <resource name="foo" /> + <resource name="foo" exists="false" /> </resources> - <exists/> + <exists /> </restrict> </resourcecount> </au:assertTrue> @@ -80,13 +80,13 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <file file="foo"/> - <url url="http://ant.apache.org/index.html"/> - <resource name="foo"/> - <string value="foo"/> - <file file="bar"/> + <file file="foo" /> + <url url="http://ant.apache.org/index.html"; /> + <resource name="foo" /> + <string value="foo" /> + <file file="bar" /> </resources> - <instanceof type="file"/> + <instanceof type="file" /> </restrict> </resourcecount> </au:assertTrue> @@ -94,15 +94,15 @@ <target name="testinstanceoftype2"> <typedef name="file" uri="test" - classname="org.apache.tools.ant.types.resources.FileResource"/> + classname="org.apache.tools.ant.types.resources.FileResource" /> <au:assertTrue> <resourcecount when="equal" count="1"> <restrict> <resources> - <url file="foo"/> - <file file="bar" xmlns="test"/> + <url file="foo" /> + <file file="bar" xmlns="test" /> </resources> - <instanceof type="test:file"/> + <instanceof type="test:file" /> </restrict> </resourcecount> </au:assertTrue> @@ -110,49 +110,49 @@ <target name="testinstanceoftype3"> <typedef name="file" uri="test" - classname="org.apache.tools.ant.types.resources.FileResource"/> + classname="org.apache.tools.ant.types.resources.FileResource" /> <au:assertTrue> <resourcecount when="equal" count="1"> <restrict> <resources> - <url file="foo"/> - <file file="bar" xmlns="test"/> + <url file="foo" /> + <file file="bar" xmlns="test" /> </resources> - <instanceof type="file" uri="test"/> + <instanceof type="file" uri="test" /> </restrict> </resourcecount> </au:assertTrue> </target> <target name="instanceoftype" - depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3"/> + depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3" /> <target name="testinstanceofclass"> <au:assertTrue> <resourcecount when="equal" count="7"> <restrict> <resources> - <filelist dir="${basedir}" files="a,b,c,d,e,f,g"/> + <filelist dir="${basedir}" files="a,b,c,d,e,f,g" /> </resources> - <instanceof class="org.apache.tools.ant.types.Resource"/> + <instanceof class="org.apache.tools.ant.types.Resource" /> </restrict> </resourcecount> </au:assertTrue> </target> - <target name="instanceof" depends="instanceoftype,testinstanceofclass"/> + <target name="instanceof" depends="instanceoftype,testinstanceofclass" /> <target name="testtype"> <au:assertTrue> <resourcecount when="equal" count="2"> <restrict> <resources> - <file file="${basedir}"/> - <file file="${ant.file}"/> - <resource directory="true"/> - <resource directory="false"/> + <file file="${basedir}" /> + <file file="${ant.file}" /> + <resource directory="true" /> + <resource directory="false" /> </resources> - <type type="dir"/> + <type type="dir" /> </restrict> </resourcecount> </au:assertTrue> @@ -163,13 +163,13 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <resource lastmodified="4"/> - <resource lastmodified="5"/> - <resource lastmodified="6"/> - <resource lastmodified="7"/> - <resource lastmodified="8"/> + <resource lastmodified="4" /> + <resource lastmodified="5" /> + <resource lastmodified="6" /> + <resource lastmodified="7" /> + <resource lastmodified="8" /> </resources> - <date when="after" millis="5" granularity="0"/> + <date when="after" millis="5" granularity="0" /> </restrict> </resourcecount> </au:assertTrue> @@ -180,13 +180,13 @@ <resourcecount when="equal" count="4"> <restrict> <resources> - <resource size="4"/> - <resource size="5"/> - <resource size="6"/> - <resource size="7"/> - <resource size="8"/> + <resource size="4" /> + <resource size="5" /> + <resource size="6" /> + <resource size="7" /> + <resource size="8" /> </resources> - <size when="le" size="7"/> + <size when="le" size="7" /> </restrict> </resourcecount> </au:assertTrue> @@ -197,14 +197,14 @@ <resourcecount when="equal" count="1"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <and xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> + <name name="f?" /> + <size size="3" /> </and> </restrict> </resourcecount> @@ -216,14 +216,14 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <or xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> + <name name="f?" /> + <size size="3" /> </or> </restrict> </resourcecount> @@ -235,13 +235,13 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <not xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <size size="3"/> + <size size="3" /> </not> </restrict> </resourcecount> @@ -253,14 +253,14 @@ <resourcecount when="equal" count="1"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <none xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> + <name name="f?" /> + <size size="3" /> </none> </restrict> </resourcecount> @@ -272,15 +272,15 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <majority xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> - <instanceof type="string"/> + <name name="f?" /> + <size size="3" /> + <instanceof type="string" /> </majority> </restrict> </resourcecount> @@ -292,15 +292,15 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <majority> - <name name="f?"/> - <size size="3"/> - <instanceof type="resource"/> + <name name="f?" /> + <size size="3" /> + <instanceof type="resource" /> </majority> </restrict> </resourcecount> @@ -312,16 +312,16 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <majority allowtie="true"> - <name name="f?"/> - <size size="3"/> - <instanceof type="string"/> - <exists/> + <name name="f?" /> + <size size="3" /> + <instanceof type="string" /> + <exists /> </majority> </restrict> </resourcecount> @@ -333,16 +333,16 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <majority allowtie="false"> - <name name="f?"/> - <size size="3"/> - <instanceof type="string"/> - <exists/> + <name name="f?" /> + <size size="3" /> + <instanceof type="string" /> + <exists /> </majority> </restrict> </resourcecount> @@ -354,9 +354,9 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="foo"/> - <string value="bar"/> - <string value="baz"/> + <string value="foo" /> + <string value="bar" /> + <string value="baz" /> </resources> <contains text="b"/> </restrict> @@ -369,9 +369,9 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="foo"/> - <string value="bar"/> - <string value="baz"/> + <string value="foo" /> + <string value="bar" /> + <string value="baz" /> </resources> <containsregexp expression="^b..$"/> </restrict> @@ -386,14 +386,14 @@ <resourcecount count="3"> <restrict> <compare when="greater" against="each"> - <control><string value="b"/></control> + <control><string value="b" /></control> </compare> <resources> - <string value="a"/> - <string value="b"/> - <string value="c"/> - <string value="d"/> - <string value="e"/> + <string value="a" /> + <string value="b" /> + <string value="c" /> + <string value="d" /> + <string value="e" /> </resources> </restrict> </resourcecount> @@ -401,15 +401,15 @@ <resourcecount count="5"> <restrict> <compare> - <control><string value="."/></control> - <size/> + <control><string value="." /></control> + <size /> </compare> <resources> - <string value="a"/> - <string value="b"/> - <string value="c"/> - <string value="d"/> - <string value="e"/> + <string value="a" /> + <string value="b" /> + <string value="c" /> + <string value="d" /> + <string value="e" /> </resources> </restrict> </resourcecount> @@ -418,22 +418,22 @@ <restrict> <compare when="greater" against="each"> <control> - <string value="a"/> - <string value="b"/> - <string value="bb"/> - <string value="c"/> - <string value="ccc"/> + <string value="a" /> + <string value="b" /> + <string value="bb" /> + <string value="c" /> + <string value="ccc" /> </control> - <name/> - <size/> + <name /> + <size /> </compare> <resources> - <string value="a"/> - <string value="bbbb"/> - <string value="ccc"/> - <string value="cccc"/> - <string value="d"/> - <string value="e"/> + <string value="a" /> + <string value="bbbb" /> + <string value="ccc" /> + <string value="cccc" /> + <string value="d" /> + <string value="e" /> </resources> </restrict> </resourcecount> @@ -442,17 +442,17 @@ </target> <target name="majority" - depends="testmajority1,testmajority2,testmajority3,testmajority4"/> + depends="testmajority1,testmajority2,testmajority3,testmajority4" /> <target name="logical" - depends="testand,testor,testnone,testnot,majority"/> + depends="testand,testor,testnone,testnot,majority" /> <target name="all" - depends="name,testexists,instanceof,testtype,testdate,testsize,testcontains,testcontainsregexp,logical,testcompare"/> + depends="name,testexists,instanceof,testtype,testdate,testsize,testcontains,testcontainsregexp,logical,testcompare" /> - <!-- - The tests for oata.types.selectors.ModifiedSelectorTest as - ResourceSelector are in its test-buildfile src\etc\testcases\types\selectors.xml. + <!-- + The tests for oata.types.selectors.ModifiedSelectorTest as + ResourceSelector are in its test-buildfile src\etc\testcases\types\selectors.xml. --> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/resources/selectors/test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/selectors/test.xml b/src/tests/antunit/types/resources/selectors/test.xml index fb022ba..24b804a 100644 --- a/src/tests/antunit/types/resources/selectors/test.xml +++ b/src/tests/antunit/types/resources/selectors/test.xml @@ -19,29 +19,29 @@ xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors" xmlns:rcmp="antlib:org.apache.tools.ant.types.resources.comparators"> - <import file="../../../antunit-base.xml"/> + <import file="../../../antunit-base.xml" /> - <available property="jdk1.4+" classname="java.lang.CharSequence"/> + <available property="jdk1.4+" classname="java.lang.CharSequence"/> <condition property="some.regexp.support"> <or> <isset property="jdk1.4+"/> <isset property="apache.regexp.present"/> <isset property="apache.oro.present"/> </or> - </condition> - + </condition> + <target name="testname1"> <au:assertTrue> <resourcecount when="equal" count="2"> <restrict> <resources> - <resource name="foo"/> - <resource name="bar"/> - <resource name="baz"/> - <resource name="boo"/> - <resource name="bang"/> + <resource name="foo" /> + <resource name="bar" /> + <resource name="baz" /> + <resource name="boo" /> + <resource name="bang" /> </resources> - <rsel:name name="ba?"/> + <rsel:name name="ba?" /> </restrict> </resourcecount> </au:assertTrue> @@ -52,28 +52,28 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <file file="foo"/> - <resource name="foo"/> - <file file="foo" basedir="${basedir}"/> + <file file="foo" /> + <resource name="foo" /> + <file file="foo" basedir="${basedir}" /> </resources> - <rsel:name name="foo"/> + <rsel:name name="foo" /> </restrict> </resourcecount> </au:assertTrue> </target> - <target name="name" depends="testname1,testname2"/> + <target name="name" depends="testname1,testname2" /> <target name="testexists"> <au:assertTrue> <resourcecount when="equal" count="1"> <restrict> <resources> - <file file="idonotexist"/> - <resource name="foo"/> - <resource name="foo" exists="false"/> + <file file="idonotexist" /> + <resource name="foo" /> + <resource name="foo" exists="false" /> </resources> - <rsel:exists/> + <rsel:exists /> </restrict> </resourcecount> </au:assertTrue> @@ -84,13 +84,13 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <file file="foo"/> - <url url="http://ant.apache.org/index.html"/> - <resource name="foo"/> - <string value="foo"/> - <file file="bar"/> + <file file="foo" /> + <url url="http://ant.apache.org/index.html"; /> + <resource name="foo" /> + <string value="foo" /> + <file file="bar" /> </resources> - <rsel:instanceof type="file"/> + <rsel:instanceof type="file" /> </restrict> </resourcecount> </au:assertTrue> @@ -98,15 +98,15 @@ <target name="testinstanceoftype2"> <typedef name="file" uri="test" - classname="org.apache.tools.ant.types.resources.FileResource"/> + classname="org.apache.tools.ant.types.resources.FileResource" /> <au:assertTrue> <resourcecount when="equal" count="1"> <restrict> <resources> - <url file="foo"/> - <file file="bar" xmlns="test"/> + <url file="foo" /> + <file file="bar" xmlns="test" /> </resources> - <rsel:instanceof type="test:file"/> + <rsel:instanceof type="test:file" /> </restrict> </resourcecount> </au:assertTrue> @@ -114,66 +114,66 @@ <target name="testinstanceoftype3"> <typedef name="file" uri="test" - classname="org.apache.tools.ant.types.resources.FileResource"/> + classname="org.apache.tools.ant.types.resources.FileResource" /> <au:assertTrue> <resourcecount when="equal" count="1"> <restrict> <resources> - <url file="foo"/> - <file file="bar" xmlns="test"/> + <url file="foo" /> + <file file="bar" xmlns="test" /> </resources> - <rsel:instanceof type="file" uri="test"/> + <rsel:instanceof type="file" uri="test" /> </restrict> </resourcecount> </au:assertTrue> </target> <target name="instanceoftype" - depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3"/> + depends="testinstanceoftype1,testinstanceoftype2,testinstanceoftype3" /> <target name="testinstanceofclass"> <au:assertTrue> <resourcecount when="equal" count="7"> <restrict> <resources> - <filelist dir="${basedir}" files="a,b,c,d,e,f,g"/> + <filelist dir="${basedir}" files="a,b,c,d,e,f,g" /> </resources> - <rsel:instanceof class="org.apache.tools.ant.types.Resource"/> + <rsel:instanceof class="org.apache.tools.ant.types.Resource" /> </restrict> </resourcecount> </au:assertTrue> </target> - <target name="instanceof" depends="instanceoftype,testinstanceofclass"/> + <target name="instanceof" depends="instanceoftype,testinstanceofclass" /> <target name="testtype"> <resources id="testtype"> - <file file="${basedir}"/> - <file file="${ant.file}"/> - <resource directory="true"/> - <resource directory="false"/> + <file file="${basedir}" /> + <file file="${ant.file}" /> + <resource directory="true" /> + <resource directory="false" /> </resources> <au:assertTrue> <resourcecount when="equal" count="2"> <restrict> - <resources refid="testtype"/> - <rsel:type type="dir"/> + <resources refid="testtype" /> + <rsel:type type="dir" /> </restrict> </resourcecount> </au:assertTrue> <au:assertTrue> <resourcecount when="equal" count="2"> <restrict> - <resources refid="testtype"/> - <rsel:type type="file"/> + <resources refid="testtype" /> + <rsel:type type="file" /> </restrict> </resourcecount> </au:assertTrue> <au:assertTrue> <resourcecount when="equal" count="4"> <restrict> - <resources refid="testtype"/> - <rsel:type type="any"/> + <resources refid="testtype" /> + <rsel:type type="any" /> </restrict> </resourcecount> </au:assertTrue> @@ -184,13 +184,13 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <resource lastmodified="4"/> - <resource lastmodified="5"/> - <resource lastmodified="6"/> - <resource lastmodified="7"/> - <resource lastmodified="8"/> + <resource lastmodified="4" /> + <resource lastmodified="5" /> + <resource lastmodified="6" /> + <resource lastmodified="7" /> + <resource lastmodified="8" /> </resources> - <rsel:date when="after" millis="5" granularity="0"/> + <rsel:date when="after" millis="5" granularity="0" /> </restrict> </resourcecount> </au:assertTrue> @@ -201,13 +201,13 @@ <resourcecount when="equal" count="4"> <restrict> <resources> - <resource size="4"/> - <resource size="5"/> - <resource size="6"/> - <resource size="7"/> - <resource size="8"/> + <resource size="4" /> + <resource size="5" /> + <resource size="6" /> + <resource size="7" /> + <resource size="8" /> </resources> - <rsel:size when="le" size="7"/> + <rsel:size when="le" size="7" /> </restrict> </resourcecount> </au:assertTrue> @@ -218,14 +218,14 @@ <resourcecount when="equal" count="1"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <and xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> + <name name="f?" /> + <size size="3" /> </and> </restrict> </resourcecount> @@ -237,14 +237,14 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <or xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> + <name name="f?" /> + <size size="3" /> </or> </restrict> </resourcecount> @@ -256,13 +256,13 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <not xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <size size="3"/> + <size size="3" /> </not> </restrict> </resourcecount> @@ -274,14 +274,14 @@ <resourcecount when="equal" count="1"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <none xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> + <name name="f?" /> + <size size="3" /> </none> </restrict> </resourcecount> @@ -293,15 +293,15 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <majority xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> - <instanceof type="string"/> + <name name="f?" /> + <size size="3" /> + <instanceof type="string" /> </majority> </restrict> </resourcecount> @@ -313,15 +313,15 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <majority xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> - <instanceof type="resource"/> + <name name="f?" /> + <size size="3" /> + <instanceof type="resource" /> </majority> </restrict> </resourcecount> @@ -333,17 +333,17 @@ <resourcecount when="equal" count="3"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <majority allowtie="true" xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> - <instanceof type="string"/> - <exists/> + <name name="f?" /> + <size size="3" /> + <instanceof type="string" /> + <exists /> </majority> </restrict> </resourcecount> @@ -355,17 +355,17 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="fee"/> - <resource name="fi" size="3"/> - <resource name="fo"/> - <resource name="fum"/> + <string value="fee" /> + <resource name="fi" size="3" /> + <resource name="fo" /> + <resource name="fum" /> </resources> <majority allowtie="false" xmlns="antlib:org.apache.tools.ant.types.resources.selectors"> - <name name="f?"/> - <size size="3"/> - <instanceof type="string"/> - <exists/> + <name name="f?" /> + <size size="3" /> + <instanceof type="string" /> + <exists /> </majority> </restrict> </resourcecount> @@ -377,12 +377,12 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="foo"/> - <string value="bar"/> - <string value="baz"/> + <string value="foo" /> + <string value="bar" /> + <string value="baz" /> </resources> <contains text="b" - xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/> + xmlns="antlib:org.apache.tools.ant.types.resources.selectors" /> </restrict> </resourcecount> </au:assertTrue> @@ -393,12 +393,12 @@ <resourcecount when="equal" count="2"> <restrict> <resources> - <string value="foo"/> - <string value="bar"/> - <string value="baz"/> + <string value="foo" /> + <string value="bar" /> + <string value="baz" /> </resources> <containsregexp expression="^b..$" - xmlns="antlib:org.apache.tools.ant.types.resources.selectors"/> + xmlns="antlib:org.apache.tools.ant.types.resources.selectors" /> </restrict> </resourcecount> </au:assertTrue> @@ -411,14 +411,14 @@ <resourcecount count="3"> <restrict> <rsel:compare when="greater" against="each"> - <control><string value="b"/></control> + <control><string value="b" /></control> </rsel:compare> <resources> - <string value="a"/> - <string value="b"/> - <string value="c"/> - <string value="d"/> - <string value="e"/> + <string value="a" /> + <string value="b" /> + <string value="c" /> + <string value="d" /> + <string value="e" /> </resources> </restrict> </resourcecount> @@ -426,15 +426,15 @@ <resourcecount count="5"> <restrict> <rsel:compare> - <control><string value="."/></control> - <rcmp:size/> + <control><string value="." /></control> + <rcmp:size /> </rsel:compare> <resources> - <string value="a"/> - <string value="b"/> - <string value="c"/> - <string value="d"/> - <string value="e"/> + <string value="a" /> + <string value="b" /> + <string value="c" /> + <string value="d" /> + <string value="e" /> </resources> </restrict> </resourcecount> @@ -443,22 +443,22 @@ <restrict> <rsel:compare when="greater" against="each"> <control> - <string value="a"/> - <string value="b"/> - <string value="bb"/> - <string value="c"/> - <string value="ccc"/> + <string value="a" /> + <string value="b" /> + <string value="bb" /> + <string value="c" /> + <string value="ccc" /> </control> - <rcmp:name/> - <rcmp:size/> + <rcmp:name /> + <rcmp:size /> </rsel:compare> <resources> - <string value="a"/> - <string value="bbbb"/> - <string value="ccc"/> - <string value="cccc"/> - <string value="d"/> - <string value="e"/> + <string value="a" /> + <string value="bbbb" /> + <string value="ccc" /> + <string value="cccc" /> + <string value="d" /> + <string value="e" /> </resources> </restrict> </resourcecount> @@ -467,17 +467,17 @@ </target> <target name="majority" - depends="testmajority1,testmajority2,testmajority3,testmajority4"/> + depends="testmajority1,testmajority2,testmajority3,testmajority4" /> <target name="logical" - depends="testand,testor,testnone,testnot,majority"/> + depends="testand,testor,testnone,testnot,majority" /> <target name="all" - depends="name,testexists,instanceof,testtype,testdate,testsize,testcontains,testcontainsregexp,logical,testcompare"/> + depends="name,testexists,instanceof,testtype,testdate,testsize,testcontains,testcontainsregexp,logical,testcompare" /> - <!-- - The tests for oata.types.selectors.ModifiedSelectorTest as - ResourceSelector are in its test-buildfile src\etc\testcases\types\selectors.xml. + <!-- + The tests for oata.types.selectors.ModifiedSelectorTest as + ResourceSelector are in its test-buildfile src\etc\testcases\types\selectors.xml. --> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/resources/test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/test.xml b/src/tests/antunit/types/resources/test.xml index 22a00e9..5af37b9 100644 --- a/src/tests/antunit/types/resources/test.xml +++ b/src/tests/antunit/types/resources/test.xml @@ -17,14 +17,14 @@ --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../../antunit-base.xml"/> - - <property name="dirname" value="work"/> - <property name="dir" location="${output}/${dirname}"/> - <property name="zip" location="${output}/${dirname}.zip"/> - <property name="jar" location="${antunit.tmpdir}/${dirname}.jar"/> - <property name="file" location="${output}/${dirname}/file.txt"/> - + <import file="../../antunit-base.xml" /> + + <property name="dirname" value="work" /> + <property name="dir" location="${output}/${dirname}" /> + <property name="zip" location="${output}/${dirname}.zip" /> + <property name="jar" location="${antunit.tmpdir}/${dirname}.jar" /> + <property name="file" location="${output}/${dirname}/file.txt" /> + <condition property="offline"> <not> <or> @@ -37,45 +37,45 @@ <target name="setUp"> <touch mkdirs="true"> - <filelist dir="${dir}/foo/a" files="x,y,z"/> + <filelist dir="${dir}/foo/a" files="x,y,z" /> </touch> <copy todir="${dir}/foo" enablemultiplemappings="true"> - <fileset dir="${dir}/foo"/> + <fileset dir="${dir}/foo" /> <mapper> - <globmapper handledirsep="true" from="a/*" to="b/*"/> - <globmapper handledirsep="true" from="a/*" to="c/*"/> + <globmapper handledirsep="true" from="a/*" to="b/*" /> + <globmapper handledirsep="true" from="a/*" to="c/*" /> </mapper> </copy> <copy todir="${dir}/bar"> - <fileset dir="${dir}/foo"/> + <fileset dir="${dir}/foo" /> </copy> - <property name="foo" location="${dir}/foo"/> - <property name="foo.a" location="${dir}/foo/a"/> - <property name="foo.b" location="${dir}/foo/b"/> - <property name="foo.c" location="${dir}/foo/c"/> + <property name="foo" location="${dir}/foo" /> + <property name="foo.a" location="${dir}/foo/a" /> + <property name="foo.b" location="${dir}/foo/b" /> + <property name="foo.c" location="${dir}/foo/c" /> - <property name="bar" location="${dir}/bar"/> - <property name="bar.a" location="${dir}/bar/a"/> - <property name="bar.b" location="${dir}/bar/b"/> - <property name="bar.c" location="${dir}/bar/c"/> + <property name="bar" location="${dir}/bar" /> + <property name="bar.a" location="${dir}/bar/a" /> + <property name="bar.b" location="${dir}/bar/b" /> + <property name="bar.c" location="${dir}/bar/c" /> </target> <target name="tearDown"> - <delete dir="${dir}"/> - <delete file="${zip}"/> - <delete file="${jar}" deleteonexit="true"/> - <delete file="${file}"/> + <delete dir="${dir}" /> + <delete file="${zip}" /> + <delete file="${jar}" deleteonexit="true" /> + <delete file="${file}" /> </target> <target name="testfiles1" depends="setUp"> <au:assertTrue> <resourcecount count="26"> <files> - <include name="${dir}/foo/"/> - <include name="${dir}/bar/"/> + <include name="${dir}/foo/" /> + <include name="${dir}/bar/" /> </files> </resourcecount> </au:assertTrue> @@ -85,9 +85,9 @@ <au:assertTrue> <resourcecount count="8"> <files> - <include name="${dir}/foo/"/> - <include name="${dir}/bar/"/> - <type type="dir"/> + <include name="${dir}/foo/" /> + <include name="${dir}/bar/" /> + <type type="dir" /> </files> </resourcecount> </au:assertTrue> @@ -97,9 +97,9 @@ <au:assertTrue> <resourcecount count="18"> <files> - <include name="${dir}/foo/"/> - <include name="${dir}/bar/"/> - <type type="file"/> + <include name="${dir}/foo/" /> + <include name="${dir}/bar/" /> + <type type="file" /> </files> </resourcecount> </au:assertTrue> @@ -110,13 +110,13 @@ <resourcecount count="27"><!-- include duplicates! --> <resources> <files> - <include name="${dir}/foo/"/> - <include name="${dir}/bar/"/> - <type type="file"/> + <include name="${dir}/foo/" /> + <include name="${dir}/bar/" /> + <type type="file" /> </files> <files> - <include name="${dir}/foo/"/> - <type type="file"/> + <include name="${dir}/foo/" /> + <type type="file" /> </files> </resources> </resourcecount> @@ -125,13 +125,13 @@ <target name="testresourcesref" depends="setUp"> <files id="files"> - <include name="${dir}/foo/"/> - <include name="${dir}/bar/"/> - <type type="file"/> + <include name="${dir}/foo/" /> + <include name="${dir}/bar/" /> + <type type="file" /> </files> <au:assertTrue> <resourcecount count="18"> - <resources refid="files"/> + <resources refid="files" /> </resourcecount> </au:assertTrue> </target> @@ -139,7 +139,7 @@ <target name="testfileset" depends="setUp"> <au:assertTrue> <resourcecount count="9"> - <fileset dir="${dir}/foo"/> + <fileset dir="${dir}/foo" /> </resourcecount> </au:assertTrue> </target> @@ -147,7 +147,7 @@ <target name="testdirset" depends="setUp"> <au:assertTrue> <resourcecount count="4"> - <dirset dir="${dir}/foo"/> + <dirset dir="${dir}/foo" /> </resourcecount> </au:assertTrue> </target> @@ -155,7 +155,7 @@ <target name="testfilelist"> <au:assertTrue> <resourcecount count="5"> - <filelist dir="${dir}/foo" files="1,2,3,4,5"/> + <filelist dir="${dir}/foo" files="1,2,3,4,5" /> </resourcecount> </au:assertTrue> </target> @@ -165,11 +165,11 @@ <resourcecount count="24"> <path> <path id="p"> - <fileset id="fs" dir="${foo.a}"/> <!-- 3 --> - <dirset id="ds" dir="${foo}"/> <!-- 4 --> + <fileset id="fs" dir="${foo.a}" /> <!-- 3 --> + <dirset id="ds" dir="${foo}" /> <!-- 4 --> </path> - <pathelement id="pe" location="${dir}"/> <!-- 1 --> - <filelist id="fl" dir="${bar}" files="1,2,3,a,b,c"/> <!-- 6 --> + <pathelement id="pe" location="${dir}" /> <!-- 1 --> + <filelist id="fl" dir="${bar}" files="1,2,3,a,b,c" /> <!-- 6 --> <files id="f"> <!-- 13; 3 overlap fl --> <include name="${bar}/"/> </files> @@ -179,31 +179,31 @@ </target> <target name="createzip" depends="setUp"> - <zip destfile="${zip}" basedir="${dir}"/> + <zip destfile="${zip}" basedir="${dir}" /> </target> <target name="testzipfileset" depends="createzip"> <au:assertTrue> <resourcecount count="9"> - <zipfileset src="${zip}" includes="foo/"/> + <zipfileset src="${zip}" includes="foo/" /> </resourcecount> </au:assertTrue> </target> <target name="testpropertyset"> - <property name="testpropertyset.a" value="a"/> - <property name="testpropertyset.aa" value="aa"/> - <property name="testpropertyset.aaa" value="aaa"/> + <property name="testpropertyset.a" value="a" /> + <property name="testpropertyset.aa" value="aa" /> + <property name="testpropertyset.aaa" value="aaa" /> <propertyset id="testpropertyset"> - <propertyref prefix="testpropertyset."/> + <propertyref prefix="testpropertyset." /> </propertyset> <au:assertTrue> <and> - <resourcecount refid="testpropertyset" count="3"/> + <resourcecount refid="testpropertyset" count="3" /> <length length="12"> <resources> - <resources refid="testpropertyset"/> - <propertyset refid="testpropertyset"/> + <resources refid="testpropertyset" /> + <propertyset refid="testpropertyset" /> </resources> </length> </and> @@ -218,8 +218,8 @@ <include name="${foo.a}/w"/> <include name="${foo.a}/x"/> </files> - <fileset dir="${foo.a}" includes="x,y"/> <!-- 2; net 1 --> - <filelist dir="${foo.a}" files="v"/> <!-- 1 --> + <fileset dir="${foo.a}" includes="x,y" /> <!-- 2; net 1 --> + <filelist dir="${foo.a}" files="v" /> <!-- 1 --> <files> <!-- 2; net 1 --> <include name="${foo.a}/y"/> <include name="${foo.a}/z"/> @@ -233,9 +233,9 @@ <au:assertTrue> <resourcecount count="3"> <intersect> - <filelist dir="${dir}" files="1,2,3,4,5"/> - <filelist dir="${dir}" files="2,3,4,5,6"/> - <filelist dir="${dir}" files="3,4,5,6,7"/> + <filelist dir="${dir}" files="1,2,3,4,5" /> + <filelist dir="${dir}" files="2,3,4,5,6" /> + <filelist dir="${dir}" files="3,4,5,6,7" /> </intersect> </resourcecount> </au:assertTrue> @@ -245,9 +245,9 @@ <au:assertTrue> <resourcecount count="2"> <difference id="diff"> - <filelist dir="${dir}" files="1,2,3,4,5"/> - <filelist dir="${dir}" files="2,3,4,5,6"/> - <filelist dir="${dir}" files="3,4,5,6,7"/> + <filelist dir="${dir}" files="1,2,3,4,5" /> + <filelist dir="${dir}" files="2,3,4,5,6" /> + <filelist dir="${dir}" files="3,4,5,6,7" /> </difference> </resourcecount> </au:assertTrue> @@ -256,16 +256,16 @@ <target name="testfileurl"> <au:assertTrue> <length when="greater" length="0"> - <url file="${ant.file}"/> + <url file="${ant.file}" /> </length> </au:assertTrue> </target> <target name="testfileurlref"> - <url id="fileurl" file="${ant.file}"/> + <url id="fileurl" file="${ant.file}" /> <au:assertTrue> <length when="greater" length="0"> - <url refid="fileurl"/> + <url refid="fileurl" /> </length> </au:assertTrue> </target> @@ -273,38 +273,38 @@ <target name="testhttpurl1" unless="offline"> <au:assertTrue> <length when="greater" length="0"> - <url url="http://www.w3.org/MarkUp/"/> + <url url="http://www.w3.org/MarkUp/"; /> </length> </au:assertTrue> </target> <target name="testhttpurl2" unless="offline"> <concat destfile="${file}" force="true" append="false"> - <url id="httpurl" url="http://ant.apache.org/index.html"/> - <url refid="httpurl"/> + <url id="httpurl" url="http://ant.apache.org/index.html"; /> + <url refid="httpurl" /> </concat> <length property="httpurl.length"> - <url refid="httpurl"/> + <url refid="httpurl" /> </length> <length property="file.length"> <file file="${file}"/> </length> <au:assertTrue message="length of url ${httpurl.length} length of file ${file.length} file should be twice as big"> - <length file="${file}" when="greater" length="${httpurl.length}"/> + <length file="${file}" when="greater" length="${httpurl.length}" /> </au:assertTrue> </target> <target name="createjar" depends="setUp"> - <jar destfile="${jar}" basedir="${dir}"/> + <jar destfile="${jar}" basedir="${dir}" /> </target> <target name="testjarurl" depends="createjar"> <pathconvert property="jarurl"> - <url file="${jar}"/> + <url file="${jar}" /> </pathconvert> <au:assertTrue> <length when="greater" length="0"> - <url url="jar:${jarurl}!/META-INF/MANIFEST.MF"/> + <url url="jar:${jarurl}!/META-INF/MANIFEST.MF" /> </length> </au:assertTrue> </target> @@ -313,7 +313,7 @@ <echo file="${file}">This is a test.</echo> <au:assertTrue> <length length="15"> - <file file="${file}"/> + <file file="${file}" /> </length> </au:assertTrue> </target> @@ -321,7 +321,7 @@ <target name="testzipentry" depends="createjar"> <au:assertTrue> <length when="greater" length="0"> - <zipentry zipfile="${jar}" name="META-INF/MANIFEST.MF"/> + <zipentry zipfile="${jar}" name="META-INF/MANIFEST.MF" /> </length> </au:assertTrue> </target> @@ -329,16 +329,16 @@ <target name="teststring1"> <au:assertTrue> <length length="15"> - <string value="This is a test."/> + <string value="This is a test." /> </length> </au:assertTrue> </target> <target name="teststring2"> - <property name="test" value="foo"/> + <property name="test" value="foo" /> <au:assertTrue> <length length="14"> - <string value="This is a ${test}."/> + <string value="This is a ${test}." /> </length> </au:assertTrue> </target> @@ -346,26 +346,26 @@ <target name="testresource"> <au:assertTrue> <length length="4096"> - <resource size="4096"/> + <resource size="4096" /> </length> </au:assertTrue> </target> <target name="testproperty"> - <property name="testproperty" value="abcdefghij"/> + <property name="testproperty" value="abcdefghij" /> <au:assertTrue> <length length="10"> - <propertyresource name="testproperty"/> + <propertyresource name="testproperty" /> </length> </au:assertTrue> </target> <target name="testPropertyResolvedAsResource"> - <string id="s" value="abcdefghij"/> + <string id="s" value="abcdefghij" /> <au:assertTrue> <resourcesmatch> - <resource refid="s"/> - <propertyresource name="ant.refid:s"/> + <resource refid="s" /> + <propertyresource name="ant.refid:s" /> </resourcesmatch> </au:assertTrue> </target> @@ -374,7 +374,7 @@ <au:assertTrue> <resourcecount count="0"> <first count="0"> - <filelist dir="${dir}" files="1,2,3,4,5"/> + <filelist dir="${dir}" files="1,2,3,4,5" /> </first> </resourcecount> </au:assertTrue> @@ -384,7 +384,7 @@ <au:assertTrue> <resourcecount count="1"> <first> - <filelist dir="${dir}" files="1,2,3,4,5"/> + <filelist dir="${dir}" files="1,2,3,4,5" /> </first> </resourcecount> </au:assertTrue> @@ -394,7 +394,7 @@ <au:assertTrue> <resourcecount count="2"> <first count="2"> - <filelist dir="${dir}" files="1,2,3,4,5"/> + <filelist dir="${dir}" files="1,2,3,4,5" /> </first> </resourcecount> </au:assertTrue> @@ -418,11 +418,11 @@ <loadresource property="actual"> <javaconstant name="org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME"/> </loadresource> - <au:assertEquals message="could not read java constant" expected="build.xml" actual="${actual}"/> + <au:assertEquals message="could not read java constant" expected="build.xml" actual="${actual}" /> - <!-- - We can't test for special error messages using built-in tasks - because they catch these messages + <!-- + We can't test for special error messages using built-in tasks + because they catch these messages --> <au:expectfailure> <loadresource property="p"> @@ -453,7 +453,7 @@ <javaconstant name="SomeClass.NOT_STATIC"/> </loadresource> </au:expectfailure> - + <delete dir="${test.tmp.dir}"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/resources/tokens-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/tokens-test.xml b/src/tests/antunit/types/resources/tokens-test.xml index 47840ff..26a300d 100644 --- a/src/tests/antunit/types/resources/tokens-test.xml +++ b/src/tests/antunit/types/resources/tokens-test.xml @@ -18,12 +18,12 @@ <project name="test-tokens" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <property name="eol" value="${line.separator}"/> + <property name="eol" value="${line.separator}" /> <target name="antunit"> <au:antunit> - <au:plainlistener/> - <file file="${ant.file}"/> + <au:plainlistener /> + <file file="${ant.file}" /> </au:antunit> </target> @@ -32,12 +32,12 @@ <resourcecount count="0"> <difference> <tokens> - <string value="foo${eol}bar${eol}baz"/> + <string value="foo${eol}bar${eol}baz" /> </tokens> <resources> - <string value="foo"/> - <string value="bar"/> - <string value="baz"/> + <string value="foo" /> + <string value="bar" /> + <string value="baz" /> </resources> </difference> </resourcecount> @@ -53,7 +53,7 @@ <string>one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}</string> </tokens> <resources> - <string value="one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}"/> + <string value="one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}" /> </resources> </difference> </resourcecount> @@ -65,13 +65,13 @@ <resourcecount count="0"> <difference> <tokens> - <string value="foo${eol}bar${eol}baz"/> - <linetokenizer/> + <string value="foo${eol}bar${eol}baz" /> + <linetokenizer /> </tokens> <resources> - <string value="foo"/> - <string value="bar"/> - <string value="baz"/> + <string value="foo" /> + <string value="bar" /> + <string value="baz" /> </resources> </difference> </resourcecount> @@ -83,10 +83,10 @@ <resourcecount count="1"> <tokens> <resources> - <string value="foo${eol}bar${eol}baz"/> - <file file="${ant.file}"/> + <string value="foo${eol}bar${eol}baz" /> + <file file="${ant.file}" /> </resources> - <filetokenizer/> + <filetokenizer /> </tokens> </resourcecount> </au:assertTrue> @@ -97,13 +97,13 @@ <resourcecount count="0"> <difference> <tokens> - <string value="foo bar baz "/> - <stringtokenizer/> + <string value="foo bar baz " /> + <stringtokenizer /> </tokens> <resources> - <string value="foo"/> - <string value="bar"/> - <string value="baz"/> + <string value="foo" /> + <string value="bar" /> + <string value="baz" /> </resources> </difference> </resourcecount> @@ -115,12 +115,12 @@ <resourcecount count="0"> <difference> <tokens encoding="utf-16"> - <file file="utf-16.in"/> + <file file="utf-16.in" /> </tokens> <resources> - <string value="foo"/> - <string value="bar"/> - <string value="baz"/> + <string value="foo" /> + <string value="bar" /> + <string value="baz" /> </resources> </difference> </resourcecount> @@ -131,13 +131,13 @@ <pathconvert property="sorted" pathsep="${eol}"> <sort> <tokens> - <string value="foo bar etc baz"/> - <stringtokenizer/> + <string value="foo bar etc baz" /> + <stringtokenizer /> </tokens> </sort> </pathconvert> <au:assertTrue> - <equals arg1="bar${eol}baz${eol}etc${eol}foo" arg2="${sorted}"/> + <equals arg1="bar${eol}baz${eol}etc${eol}foo" arg2="${sorted}" /> </au:assertTrue> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/selectors/depend-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/selectors/depend-test.xml b/src/tests/antunit/types/selectors/depend-test.xml index a1aa813..e868f6a 100644 --- a/src/tests/antunit/types/selectors/depend-test.xml +++ b/src/tests/antunit/types/selectors/depend-test.xml @@ -17,17 +17,17 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml"/> + <import file="../../antunit-base.xml" /> - <property name="output.dir" location="output"/> - <property name="foo.file" location="${output.dir}/foo"/> + <property name="output.dir" location="output" /> + <property name="foo.file" location="${output.dir}/foo" /> <target name="setUp"> - <touch file="${foo.file}" mkdirs="true"/> + <touch file="${foo.file}" mkdirs="true" /> </target> <target name="tearDown"> - <delete dir="${output.dir}"/> + <delete dir="${output.dir}" /> </target> <target name="testMapperByTypedef" depends="setUp"> @@ -35,7 +35,7 @@ <resourcecount count="1"> <fileset file="${foo.file}"> <depend targetdir="${basedir}"><!-- dummy targetdir --> - <mergemapper to="${ant.file}"/> + <mergemapper to="${ant.file}" /> </depend> </fileset> </resourcecount> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/selectors/different-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/selectors/different-test.xml b/src/tests/antunit/types/selectors/different-test.xml index d032cf4..c2542d2 100644 --- a/src/tests/antunit/types/selectors/different-test.xml +++ b/src/tests/antunit/types/selectors/different-test.xml @@ -17,10 +17,10 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml"/> + <import file="../../antunit-base.xml" /> - <property name="output.dir" location="output"/> - <property name="foo.file" location="${output.dir}/foo"/> + <property name="output.dir" location="output" /> + <property name="foo.file" location="${output.dir}/foo" /> <target name="setUp"> <mkdir dir="${output.dir}"/> @@ -28,7 +28,7 @@ </target> <target name="tearDown"> - <delete dir="${output.dir}"/> + <delete dir="${output.dir}" /> </target> <target name="testMapperByTypedef" depends="setUp"> @@ -36,7 +36,7 @@ <resourcecount count="1"> <fileset file="${foo.file}"> <different targetdir="${basedir}"><!-- dummy targetdir --> - <mergemapper to="${ant.file}"/> + <mergemapper to="${ant.file}" /> </different> </fileset> </resourcecount> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/selectors/filename-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/selectors/filename-test.xml b/src/tests/antunit/types/selectors/filename-test.xml index 6ea9f97..3f28e11 100644 --- a/src/tests/antunit/types/selectors/filename-test.xml +++ b/src/tests/antunit/types/selectors/filename-test.xml @@ -17,7 +17,7 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml"/> + <import file="../../antunit-base.xml" /> <property name="file" value="testfile"/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/selectors/modified-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/selectors/modified-test.xml b/src/tests/antunit/types/selectors/modified-test.xml index b1fc237..a4c43e0 100644 --- a/src/tests/antunit/types/selectors/modified-test.xml +++ b/src/tests/antunit/types/selectors/modified-test.xml @@ -17,7 +17,7 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml"/> + <import file="../../antunit-base.xml" /> <target name="tearDown" depends="antunit-base.tearDown"> <delete file="cache.properties" quiet="true"/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/selectors/present-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/selectors/present-test.xml b/src/tests/antunit/types/selectors/present-test.xml index 4c3021b..e31c722 100644 --- a/src/tests/antunit/types/selectors/present-test.xml +++ b/src/tests/antunit/types/selectors/present-test.xml @@ -17,17 +17,17 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml"/> + <import file="../../antunit-base.xml" /> - <property name="output.dir" location="output"/> - <property name="foo.file" location="${output.dir}/foo"/> + <property name="output.dir" location="output" /> + <property name="foo.file" location="${output.dir}/foo" /> <target name="setUp"> - <touch file="${foo.file}" mkdirs="true"/> + <touch file="${foo.file}" mkdirs="true" /> </target> <target name="tearDown"> - <delete dir="${output.dir}"/> + <delete dir="${output.dir}" /> </target> <target name="testMapperByTypedef" depends="setUp"> @@ -35,7 +35,7 @@ <resourcecount count="1"> <fileset file="${foo.file}"> <present targetdir="${basedir}"><!-- dummy targetdir --> - <mergemapper to="${ant.file}"/> + <mergemapper to="${ant.file}" /> </present> </fileset> </resourcecount> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/selectors/readwrite-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/selectors/readwrite-test.xml b/src/tests/antunit/types/selectors/readwrite-test.xml index 9132229..bd4ac8d 100644 --- a/src/tests/antunit/types/selectors/readwrite-test.xml +++ b/src/tests/antunit/types/selectors/readwrite-test.xml @@ -17,7 +17,7 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml"/> + <import file="../../antunit-base.xml" /> <property name="file" value="testfile"/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/selectors/select-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/selectors/select-test.xml b/src/tests/antunit/types/selectors/select-test.xml index 0c825f1..f5f5b99 100644 --- a/src/tests/antunit/types/selectors/select-test.xml +++ b/src/tests/antunit/types/selectors/select-test.xml @@ -17,7 +17,7 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml"/> + <import file="../../antunit-base.xml" /> <target name="setUp"> <mkdir dir="${input}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/antunit/types/zipfileset-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/zipfileset-test.xml b/src/tests/antunit/types/zipfileset-test.xml index 9ed815a..c8bb022 100644 --- a/src/tests/antunit/types/zipfileset-test.xml +++ b/src/tests/antunit/types/zipfileset-test.xml @@ -21,7 +21,8 @@ <target name="test-refid-modify"> <fileset id="modify-refid-1" dir="${basedir}" - includes="*.xml"/> + includes="*.xml" + /> <zipfileset id="modify-refid-2" refid="modify-refid-1" prefix="WEB-INF/lib/"/> http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/junit/org/example/tasks/antlib.xml ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/example/tasks/antlib.xml b/src/tests/junit/org/example/tasks/antlib.xml index d1c286f..b920da7 100644 --- a/src/tests/junit/org/example/tasks/antlib.xml +++ b/src/tests/junit/org/example/tasks/antlib.xml @@ -23,3 +23,4 @@ </sequential> </macrodef> </antlib> + http://git-wip-us.apache.org/repos/asf/ant/blob/9b1b8dbb/src/tests/junit/org/example/tasks/antlib2.xml ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/example/tasks/antlib2.xml b/src/tests/junit/org/example/tasks/antlib2.xml index d1c286f..b920da7 100644 --- a/src/tests/junit/org/example/tasks/antlib2.xml +++ b/src/tests/junit/org/example/tasks/antlib2.xml @@ -23,3 +23,4 @@ </sequential> </macrodef> </antlib> +
