http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/tstamp-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/tstamp-test.xml b/src/tests/antunit/taskdefs/tstamp-test.xml index c358262..da3b383 100644 --- a/src/tests/antunit/taskdefs/tstamp-test.xml +++ b/src/tests/antunit/taskdefs/tstamp-test.xml @@ -16,7 +16,7 @@ limitations under the License. --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="testMagicProperty"> <local name="ant.tstamp.now"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/untar-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/untar-test.xml b/src/tests/antunit/taskdefs/untar-test.xml index 4c04bfe..8b3d441 100644 --- a/src/tests/antunit/taskdefs/untar-test.xml +++ b/src/tests/antunit/taskdefs/untar-test.xml @@ -18,12 +18,12 @@ <project name="untar-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="setUp"> <mkdir dir="${input}"/> - <mkdir dir="${output}/expected" /> - <mkdir dir="${output}/actual" /> + <mkdir dir="${output}/expected"/> + <mkdir dir="${output}/actual"/> <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/unzip-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/unzip-test.xml b/src/tests/antunit/taskdefs/unzip-test.xml index bdf5f61..fcb16a9 100644 --- a/src/tests/antunit/taskdefs/unzip-test.xml +++ b/src/tests/antunit/taskdefs/unzip-test.xml @@ -18,10 +18,10 @@ <project name="unzip-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="setUp"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> </target> <target name="tearDown" depends="antunit-base.tearDown"> @@ -49,8 +49,7 @@ </target> <target name="testTwoByteExtraFieldInLFH" - description="https://issues.apache.org/bugzilla/show_bug.cgi?id=42940"; - > + description="https://issues.apache.org/bugzilla/show_bug.cgi?id=42940";> <mkdir dir="${input}"/> <mkdir dir="${output}"/> <copy file="zip/Bugzilla-42940.zip" tofile="${input}/test.zip"/> @@ -59,8 +58,7 @@ </target> <target name="testArchiveIsClosedForInvalidZips" - description="https://issues.apache.org/bugzilla/show_bug.cgi?id=46559"; - > + description="https://issues.apache.org/bugzilla/show_bug.cgi?id=46559";> <mkdir dir="${input}"/> <mkdir dir="${output}"/> <copy file="broken_cd.zip" tofile="${input}/test.zip"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/uptodate-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/uptodate-test.xml b/src/tests/antunit/taskdefs/uptodate-test.xml index e477803..3851f69 100644 --- a/src/tests/antunit/taskdefs/uptodate-test.xml +++ b/src/tests/antunit/taskdefs/uptodate-test.xml @@ -16,7 +16,7 @@ limitations under the License. --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="testModifiedDirectories" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=39122 http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/war-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/war-test.xml b/src/tests/antunit/taskdefs/war-test.xml index e264ebd..6c2437f 100644 --- a/src/tests/antunit/taskdefs/war-test.xml +++ b/src/tests/antunit/taskdefs/war-test.xml @@ -19,7 +19,7 @@ <project name="war-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="setUp"> <mkdir dir="${input}"/> @@ -43,10 +43,10 @@ <lib refid="test"/> </mkwar> <expandwar/> - <au:assertFileExists file="${webxml.generated}" /> + <au:assertFileExists file="${webxml.generated}"/> </target> - <!-- + <!-- This checks that as of Java EE 5, the web.xml attr is optional. Here there is a web.xml, in the webinf fileset, rather than a fileset --> @@ -55,62 +55,62 @@ <webinf dir="." includes="web.xml"/> </mkwar> <expandwar/> - <au:assertFileExists file="${webxml.generated}" /> + <au:assertFileExists file="${webxml.generated}"/> </target> <target name="testWebXmlMissingFromUpdate" depends="setUp"> - <mkwar webxml="${web.xml}" /> + <mkwar webxml="${web.xml}"/> <!-- there is no web.xml file, but that is ok, as we are updating --> <mkwar update="true"> <classes dir="." includes="web.xml"/> </mkwar> <expandwar/> - <au:assertFileExists file="${webxml.generated}" /> + <au:assertFileExists file="${webxml.generated}"/> </target> <target name="testWebXmlInImplicitUpdate" depends="setUp"> - <mkwar webxml="${web.xml}" /> + <mkwar webxml="${web.xml}"/> <!-- when we are implicitly updating, the web.xml file does not get pulled in, but the command still succeeds.--> - <mkwar webxml="${web.xml}" > + <mkwar webxml="${web.xml}"> <classes dir="." includes="web.xml"/> </mkwar> <expandwar/> - <au:assertFileExists file="${webxml.generated}" /> + <au:assertFileExists file="${webxml.generated}"/> </target> <target name="NotestWebXmlFilesetInImplicitUpdate" depends="setUp"> - <mkwar webxml="${web.xml}" /> + <mkwar webxml="${web.xml}"/> <!-- when we are implicitly updating, the web.xml file does not get pulled in, but the command still succeeds.--> - <mkwar > + <mkwar> <webinf dir="." includes="web.xml"/> </mkwar> <expandwar/> - <au:assertFileExists file="${webxml.generated}" /> + <au:assertFileExists file="${webxml.generated}"/> </target> <target name="testDuplicateWebXml" depends="setUp"> - <mkwar webxml="${web.xml}" > + <mkwar webxml="${web.xml}"> <webinf dir="." includes="web.xml"/> <webinf file="${web.xml}"/> <zipfileset file="${web.xml}" prefix="WEB-INF"/> </mkwar> <expandwar/> - <au:assertFileExists file="${webxml.generated}" /> + <au:assertFileExists file="${webxml.generated}"/> </target> <target name="testDifferentDuplicateWebXml" depends="setUp"> - <copy file="${web.xml}" todir="${input}" /> - <mkwar webxml="${web.xml}" > + <copy file="${web.xml}" todir="${input}"/> + <mkwar webxml="${web.xml}"> <webinf dir="${input}" includes="web.xml"/> <webinf file="${web.xml}"/> <zipfileset file="${web.xml}" prefix="WEB-INF"/> </mkwar> <expandwar/> - <au:assertFileExists file="${webxml.generated}" /> + <au:assertFileExists file="${webxml.generated}"/> <au:assertLogContains text="The duplicate entry is"/> </target> @@ -124,15 +124,15 @@ <classes dir="." includes="web.xml"/> </mkwar> <expandwar/> - <au:assertFileExists file="${input}/WEB-INF/classes/web.xml" /> + <au:assertFileExists file="${input}/WEB-INF/classes/web.xml"/> <au:assertFalse> - <available file="${webxml.generated}" /> + <available file="${webxml.generated}"/> </au:assertFalse> </target> <target name="testWebXmlOptionalFailure" depends="setUp"> <au:expectfailure> - <mkwar > + <mkwar> <classes dir="." includes="web.xml"/> </mkwar> </au:expectfailure> @@ -151,7 +151,7 @@ <classes dir="." includes="web.xml"/> </mkwar> <expandwar/> - <au:assertFileExists file="${input}/WEB-INF/classes/web.xml" /> + <au:assertFileExists file="${input}/WEB-INF/classes/web.xml"/> </target> <target name="testLibElement" depends="setUp"> @@ -159,7 +159,7 @@ <lib dir="." includes="web.xml"/> </mkwar> <expandwar/> - <au:assertFileExists file="${input}/WEB-INF/lib/web.xml" /> + <au:assertFileExists file="${input}/WEB-INF/lib/web.xml"/> </target> <target name="testMappedClasspathFromManual"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/whichresource-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/whichresource-test.xml b/src/tests/antunit/taskdefs/whichresource-test.xml index 6bf5a88..c78d405 100644 --- a/src/tests/antunit/taskdefs/whichresource-test.xml +++ b/src/tests/antunit/taskdefs/whichresource-test.xml @@ -16,7 +16,7 @@ limitations under the License. --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="init"> <delete quiet="yes" dir="${output}"/> @@ -24,7 +24,7 @@ <javac srcdir="javac-dir/good-src" destdir="${output}"/> <path id="whichresource-build" path="${output}"/> </target> - + <target name="test-reference" depends="init"> <whichresource property="whichresource.prop" @@ -47,5 +47,5 @@ <isset property="whichresource.prop2"/> </au:assertFalse> </target> - + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/xmlproperty-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/xmlproperty-test.xml b/src/tests/antunit/taskdefs/xmlproperty-test.xml index 5be0420..1afd0ba 100644 --- a/src/tests/antunit/taskdefs/xmlproperty-test.xml +++ b/src/tests/antunit/taskdefs/xmlproperty-test.xml @@ -18,7 +18,7 @@ <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> <description/> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="test-empty"> <xmlproperty file="xmlproperty-test.xml"/> @@ -141,4 +141,3 @@ value="${b.c.loc}${path.separator}${glob.dot.jar}"/> </target> </project> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/xmlproperty.multi.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/xmlproperty.multi.xml b/src/tests/antunit/taskdefs/xmlproperty.multi.xml index 9899c58..b0d56eb 100644 --- a/src/tests/antunit/taskdefs/xmlproperty.multi.xml +++ b/src/tests/antunit/taskdefs/xmlproperty.multi.xml @@ -16,6 +16,6 @@ limitations under the License. --> <root> - <element value="a" /> - <element value="b" /> + <element value="a"/> + <element value="b"/> </root> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/xslt-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/xslt-test.xml b/src/tests/antunit/taskdefs/xslt-test.xml index b327c7b..e65854a 100644 --- a/src/tests/antunit/taskdefs/xslt-test.xml +++ b/src/tests/antunit/taskdefs/xslt-test.xml @@ -16,7 +16,7 @@ limitations under the License. --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="setUp"> <mkdir dir="${output}"/> @@ -34,20 +34,20 @@ resource="${output}/out.xml" value="set='myvalue'"/> </target> - + <target name="testParameterTypes" depends="setUp" description="parameters of various data types and XPath expressions"> <property name="antProperty1" value="ANT_PROPERTY_1"/> <property name="antProperty2" value="ANT_PROPERTY_2"/> <property name="antProperty3" value="3"/> <property name="antProperty4" value="substring-before"/> - + <xslt in="${legacy.dir}/data.xml" out="${output}/out.xml"> <param name="p1" expression="123" type="INT"/> <param name="p2" expression="64 * 64 div 128 + 10" type="XPATH_NUMBER"/> <param name="p3" expression="${antProperty4}($antProperty2, '_')" type="XPATH_STRING"/> - + <style> <string><![CDATA[<xsl:stylesheet version="1.0" @@ -135,8 +135,7 @@ undefined='<xsl:value-of select="$undefined"/>' <au:expectfailure expectedmessage="Fatal error during transformation"> <xslt in="${legacy.dir}/data.xml" out="${output}/out.xml" - style="xslt/printParams-invalid.xsl" - /> + style="xslt/printParams-invalid.xsl"/> </au:expectfailure> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/zip-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/zip-test.xml b/src/tests/antunit/taskdefs/zip-test.xml index 7ff45c1..c377519 100644 --- a/src/tests/antunit/taskdefs/zip-test.xml +++ b/src/tests/antunit/taskdefs/zip-test.xml @@ -16,7 +16,7 @@ limitations under the License. --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="testEmptyDirs"> <mkdir dir="${input}/foo"/> @@ -176,8 +176,8 @@ <touch file="${input}/test1.txt"/> <mkdir dir="${output}"/> <zip destfile="${output}/test.zip" basedir="${input}"> - <fileset dir="${input}"/> - </zip> + <fileset dir="${input}"/> + </zip> <zip destfile="${output}/test.zip" update="true"> <fileset dir="${basedir}" includes="zip-test.xml"/> </zip> @@ -189,17 +189,17 @@ <touch file="${input}/test1.txt"/> <touch file="${input}/subdir/test2.txt"/> <mkdir dir="${output}"/> - <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00" /> - <checksum file="${output}/test.zip" property="testSetZipModTime_hash" /> - <delete file="${output}/test.zip" /> + <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00"/> + <checksum file="${output}/test.zip" property="testSetZipModTime_hash"/> + <delete file="${output}/test.zip"/> - <sleep seconds="4" /> <!-- Necessary to ensure zips would have normally differed in timestamp --> + <sleep seconds="4"/> <!-- Necessary to ensure zips would have normally differed in timestamp --> <touch file="${input}/test1.txt"/> <touch file="${input}/subdir/test2.txt"/> - <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00" /> - <checksum file="${output}/test.zip" property="${testSetZipModTime_hash}" verifyproperty="testSetZipModTime_okay" /> + <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00"/> + <checksum file="${output}/test.zip" property="${testSetZipModTime_hash}" verifyproperty="testSetZipModTime_okay"/> <au:assertTrue> - <equals arg1="${testSetZipModTime_okay}" arg2="true" /> + <equals arg1="${testSetZipModTime_okay}" arg2="true"/> </au:assertTrue> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/conditions/isreference-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/conditions/isreference-test.xml b/src/tests/antunit/types/conditions/isreference-test.xml index 8929e90..5be8007 100644 --- a/src/tests/antunit/types/conditions/isreference-test.xml +++ b/src/tests/antunit/types/conditions/isreference-test.xml @@ -18,7 +18,7 @@ <project name="isreference-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> <target name="out-of-band"> <path id="out-of-band" path="."/> @@ -37,4 +37,3 @@ </au:assertTrue> </target> </project> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/conditions/matches-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/conditions/matches-test.xml b/src/tests/antunit/types/conditions/matches-test.xml index 5d17461..c3c1f23 100644 --- a/src/tests/antunit/types/conditions/matches-test.xml +++ b/src/tests/antunit/types/conditions/matches-test.xml @@ -20,7 +20,7 @@ <property name="NL" value=" "/> <regexp id="myid" pattern="^[a-z]{3,4}$"/> - <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+"/> @@ -28,7 +28,7 @@ <isset property="apache.oro.present"/> </or> </condition> - + <target name="test-refid" if="some.regexp.support"> <au:assertTrue> <matches string="abc"> @@ -45,7 +45,7 @@ <target name="test-nomatch" if="some.regexp.support"> <au:assertFalse> - <matches string="abc" pattern="^b.*" /> + <matches string="abc" pattern="^b.*"/> </au:assertFalse> </target> @@ -55,7 +55,7 @@ </tstamp> <au:assertTrue> <matches string="${today}"> - <regexp pattern="^[0123]\d-[01]\d-[12]\d\d\d$" /> + <regexp pattern="^[0123]\d-[01]\d-[12]\d\d\d$"/> </matches> </au:assertTrue> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/cutdirs-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/cutdirs-test.xml b/src/tests/antunit/types/cutdirs-test.xml index 64f0652..67be37b 100644 --- a/src/tests/antunit/types/cutdirs-test.xml +++ b/src/tests/antunit/types/cutdirs-test.xml @@ -19,7 +19,7 @@ name="firstmatch-test" default="antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="setUp"> <mkdir dir="${input}"/> @@ -53,4 +53,4 @@ </au:assertTrue> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/defer-reference-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/defer-reference-test.xml b/src/tests/antunit/types/defer-reference-test.xml index a67ad3b..83f2173 100644 --- a/src/tests/antunit/types/defer-reference-test.xml +++ b/src/tests/antunit/types/defer-reference-test.xml @@ -17,9 +17,9 @@ --> <project default="all" xmlns:au="antlib:org.apache.ant.antunit"> <target name="notcalled"> - <filelist id="ref1" dir="${basedir}" files="xxx" /> + <filelist id="ref1" dir="${basedir}" files="xxx"/> </target> - + <target name="test-macrodef-embedded-ref"> <!-- bug 34458 --> <macrodef name="foo"> @@ -36,20 +36,20 @@ <condition property="allow.script"> <and> - <available classname="org.apache.bsf.BSFManager" /> - <available classname="bsh.StringUtil" /> + <available classname="org.apache.bsf.BSFManager"/> + <available classname="bsh.StringUtil"/> </and> </condition> <target name="test-script" if="allow.script"> <!-- bugzilla: 37688 --> - <macrodef name="compileMapper" > - <attribute name="objDir" /> - <attribute name="id" default="compileMapperID" /> + <macrodef name="compileMapper"> + <attribute name="objDir"/> + <attribute name="id" default="compileMapperID"/> <sequential> <mkdir dir="@{objDir}"/> <mapper id="@{id}"> - <chainedmapper > + <chainedmapper> <flattenmapper/> <globmapper from="*" to="@{objDir}/*.o"/> </chainedmapper> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/fileset-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/fileset-test.xml b/src/tests/antunit/types/fileset-test.xml index ea39dec..31389bc 100644 --- a/src/tests/antunit/types/fileset-test.xml +++ b/src/tests/antunit/types/fileset-test.xml @@ -27,7 +27,7 @@ <au:assertTrue> <and> <equals arg1="" arg2="${toString:missing.path.id}"/> - <resourcecount count="0" refid="missing.dir.fs" /> + <resourcecount count="0" refid="missing.dir.fs"/> </and> </au:assertTrue> </target> @@ -36,7 +36,7 @@ <mkdir dir="${output}"/> <au:expectfailure expectedmessage="not present does not exist"> <copy todir="${output}"> - <fileset dir="not present" /> + <fileset dir="not present"/> </copy> </au:expectfailure> </target> @@ -68,7 +68,7 @@ <mkdir dir="${output}"/> <au:expectfailure expectedmessage="you can only specify one of the dir and file attributes"> <copy todir="${output}"> - <fileset dir="foo" file="bar" /> + <fileset dir="foo" file="bar"/> </copy> </au:expectfailure> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/filterset-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/filterset-test.xml b/src/tests/antunit/types/filterset-test.xml index f1654f6..e02a82f 100644 --- a/src/tests/antunit/types/filterset-test.xml +++ b/src/tests/antunit/types/filterset-test.xml @@ -17,20 +17,20 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> - <property name="br" value="${line.separator}" /> + <property name="br" value="${line.separator}"/> <target name="testRecursionRegression"> <mkdir dir="${output}"/> <copy todir="${output}"> - <string value="@a@${br}@b@${br}@c@${br}@d@${br}" /> - <mergemapper to="filterset-output.txt" /> + <string value="@a@${br}@b@${br}@c@${br}@d@${br}"/> + <mergemapper to="filterset-output.txt"/> <filterset> - <filter token="a" value="aaa" /> - <filter token="b" value="bbb" /> - <filter token="c" value="@a@:@b@" /> - <filter token="d" value="@c@:@c@" /> + <filter token="a" value="aaa"/> + <filter token="b" value="bbb"/> + <filter token="c" value="@a@:@b@"/> + <filter token="d" value="@c@:@c@"/> </filterset> </copy> @@ -45,11 +45,11 @@ <target name="testOverlappingMulticharToken"> <mkdir dir="${output}"/> <copy todir="${output}"> - <string value="@@USER@@@@@HOST@@" /> - <mergemapper to="filterset-output.txt" /> + <string value="@@USER@@@@@HOST@@"/> + <mergemapper to="filterset-output.txt"/> <filterset begintoken="@@" endtoken="@@"> - <filter token="USER" value="user" /> - <filter token="HOST" value="host" /> + <filter token="USER" value="user"/> + <filter token="HOST" value="host"/> </filterset> </copy> @@ -77,20 +77,19 @@ Filter with property set test @bar.x@ - should not change @cccc@ - should not change </echo> - <property name="foo.x" value="1111" /> - <property name="foo.y" value="2222" /> + <property name="foo.x" value="1111"/> + <property name="foo.y" value="2222"/> <copy todir="${output}"> <fileset dir="${input}"/> <filterset> <propertyset> - <propertyref prefix="foo." /> + <propertyref prefix="foo."/> </propertyset> </filterset> </copy> <au:assertFilesMatch actual="${output}/src.txt" - expected="${output}/expected.txt" - /> + expected="${output}/expected.txt"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/firstmatch-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/firstmatch-test.xml b/src/tests/antunit/types/firstmatch-test.xml index 68c332b..44d1ab8 100644 --- a/src/tests/antunit/types/firstmatch-test.xml +++ b/src/tests/antunit/types/firstmatch-test.xml @@ -19,7 +19,7 @@ name="firstmatch-test" default="antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="testMatch"> <mkdir dir="${input}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/javaresource-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/javaresource-test.xml b/src/tests/antunit/types/javaresource-test.xml index d0e99e0..ccebc50 100644 --- a/src/tests/antunit/types/javaresource-test.xml +++ b/src/tests/antunit/types/javaresource-test.xml @@ -16,7 +16,7 @@ limitations under the License. --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="setUp"> <mkdir dir="${resources}"/> @@ -58,5 +58,3 @@ <au:assertPropertyEquals name="a" value="b"/> </target> </project> - - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/mapper-ref.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/mapper-ref.xml b/src/tests/antunit/types/mapper-ref.xml index 3ada7f3..947d01e 100644 --- a/src/tests/antunit/types/mapper-ref.xml +++ b/src/tests/antunit/types/mapper-ref.xml @@ -23,33 +23,33 @@ <macrodef name="test"> <sequential> <pathconvert property="dest"> - <string value="foo" /> - <mapper refid="mapper" /> + <string value="foo"/> + <mapper refid="mapper"/> </pathconvert> <au:assertTrue> - <equals arg1="${dest}" arg2="bar" /> + <equals arg1="${dest}" arg2="bar"/> </au:assertTrue> </sequential> </macrodef> <target name="testBasic" description="success"> - <mapper id="mapper" type="merge" to="bar" /> - <test /> + <mapper id="mapper" type="merge" to="bar"/> + <test/> </target> <target name="testFileNameMapper" description="success"> - <mergemapper id="mapper" to="bar" /> - <test /> + <mergemapper id="mapper" to="bar"/> + <test/> </target> <target name="testWrongType" description="failure"> - <path id="mapper" path="whocares" /> - <au:expectfailure + <path id="mapper" path="whocares"/> + <au:expectfailure expectedMessage="org.apache.tools.ant.types.Path at reference 'mapper' is not a valid mapper reference."> - <test /> + <test/> </au:expectfailure> </target> - <target name="all" depends="testBasic,testFileNameMapper,testWrongType" /> + <target name="all" depends="testBasic,testFileNameMapper,testWrongType"/> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/mappers/glob-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/mappers/glob-test.xml b/src/tests/antunit/types/mappers/glob-test.xml index c4d92da..0ea5020 100644 --- a/src/tests/antunit/types/mappers/glob-test.xml +++ b/src/tests/antunit/types/mappers/glob-test.xml @@ -20,7 +20,7 @@ name="glob-test" 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/2f64e0b5/src/tests/antunit/types/mappers/packagemapper-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/mappers/packagemapper-test.xml b/src/tests/antunit/types/mappers/packagemapper-test.xml index cad0146..1da18bc 100644 --- a/src/tests/antunit/types/mappers/packagemapper-test.xml +++ b/src/tests/antunit/types/mappers/packagemapper-test.xml @@ -18,7 +18,7 @@ <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> <target name="testHandleDirSep" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=51086";> @@ -47,4 +47,4 @@ </pathconvert> <au:assertPropertyEquals name="p2" value="foo.bar"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/optional/xz/xzresource-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/optional/xz/xzresource-test.xml b/src/tests/antunit/types/optional/xz/xzresource-test.xml index 56fe66d..add17b9 100644 --- a/src/tests/antunit/types/optional/xz/xzresource-test.xml +++ b/src/tests/antunit/types/optional/xz/xzresource-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="${output}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/path-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/path-test.xml b/src/tests/antunit/types/path-test.xml index 4f4be9a..3b6af64 100644 --- a/src/tests/antunit/types/path-test.xml +++ b/src/tests/antunit/types/path-test.xml @@ -17,25 +17,25 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> - <property name="existingFile" value="${basedir}/build.xml" /> + <property name="existingFile" value="${basedir}/build.xml"/> <files id="files"> - <include name="${existingFile}" /> + <include name="${existingFile}"/> </files> - + <target name="test-directUse" description="Bug 42397 - works fine"> <path id="path"> <files> - <include name="${existingFile}" /> + <include name="${existingFile}"/> </files> </path> </target> <target name="test-refid" description="Bug 42397"> <path id="path"> - <files refid="files" /> + <files refid="files"/> </path> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/patternset-invert-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/patternset-invert-test.xml b/src/tests/antunit/types/patternset-invert-test.xml index 7c0912e..42b00ea 100644 --- a/src/tests/antunit/types/patternset-invert-test.xml +++ b/src/tests/antunit/types/patternset-invert-test.xml @@ -23,10 +23,10 @@ <resourcecount count="0"> <intersect> <fileset dir="${basedir}"> - <patternset refid="plus" /> + <patternset refid="plus"/> </fileset> <fileset dir="${basedir}"> - <patternset refid="minus" /> + <patternset refid="minus"/> </fileset> </intersect> </resourcecount> @@ -35,31 +35,31 @@ </macrodef> <target name="testInvertNested"> - <basename property="basename" file="${ant.file}" /> + <basename property="basename" file="${ant.file}"/> <echo>$${basename}=${basename}</echo> - <patternset id="plus" includes="${basename}" /> + <patternset id="plus" includes="${basename}"/> <patternset id="minus"> <invert> - <patternset refid="plus" /> + <patternset refid="plus"/> </invert> </patternset> - <test /> + <test/> </target> <target name="testInvertRefid"> - <basename property="basename" file="${ant.file}" /> + <basename property="basename" file="${ant.file}"/> <echo>$${basename}=${basename}</echo> - <patternset id="plus" includes="${basename}" /> + <patternset id="plus" includes="${basename}"/> <patternset id="minus"> - <invert refid="plus" /> + <invert refid="plus"/> </patternset> - <test /> + <test/> </target> <target name="all"> <au:antunit> <fileset file="${ant.file}"/> - <au:plainlistener /> + <au:plainlistener/> </au:antunit> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/patternset-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/patternset-test.xml b/src/tests/antunit/types/patternset-test.xml index 60690d4..ed08244 100644 --- a/src/tests/antunit/types/patternset-test.xml +++ b/src/tests/antunit/types/patternset-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/2f64e0b5/src/tests/antunit/types/propertyset-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/propertyset-test.xml b/src/tests/antunit/types/propertyset-test.xml index 0b7e236..6543df4 100644 --- a/src/tests/antunit/types/propertyset-test.xml +++ b/src/tests/antunit/types/propertyset-test.xml @@ -20,7 +20,7 @@ <project name="test-propertyset" basedir="." default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <property name="fooA" value="FooA"/> <property name="barB" value="BarB"/> @@ -35,7 +35,7 @@ <propertyset refid="properties-starting-with-foo"/> <propertyset refid="properties-starting-with-bar"/> </propertyset> - + <macrodef name="expect.equals"> <attribute name="test"/> <attribute name="exp"/> @@ -63,11 +63,11 @@ <propertyset id="nested-mapped"> <propertyset> <propertyset refid="properties-starting-with-foo"/> - <globmapper from="foo*" to="boo*" /> + <globmapper from="foo*" to="boo*"/> </propertyset> <propertyset> <propertyset refid="properties-starting-with-bar"/> - <globmapper from="bar*" to="far*" /> + <globmapper from="bar*" to="far*"/> </propertyset> </propertyset> <expect.equals @@ -80,15 +80,15 @@ <propertyset id="nested-mapped-mapped"> <propertyset> <propertyset refid="properties-starting-with-foo"/> - <globmapper from="foo*" to="boo*" /> + <globmapper from="foo*" to="boo*"/> </propertyset> <propertyset> <propertyset refid="properties-starting-with-bar"/> - <globmapper from="bar*" to="far*" /> + <globmapper from="bar*" to="far*"/> </propertyset> <mapper> - <globmapper from="boo*" to="hoo*" /> - <globmapper from="far*" to="near*" /> + <globmapper from="boo*" to="hoo*"/> + <globmapper from="far*" to="near*"/> </mapper> </propertyset> <expect.equals @@ -101,8 +101,8 @@ <au:assertTrue> <resourcecount count="2"> <restrict> - <exists /> - <resources refid="my-set" /> + <exists/> + <resources refid="my-set"/> </restrict> </resourcecount> </au:assertTrue> @@ -112,10 +112,10 @@ <au:assertTrue> <resourcecount count="2"> <restrict> - <exists /> + <exists/> <propertyset> - <propertyset refid="my-set" /> - <globmapper from="bar*" to="far*" /> + <propertyset refid="my-set"/> + <globmapper from="bar*" to="far*"/> </propertyset> </restrict> </resourcecount> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/resources/archives-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/archives-test.xml b/src/tests/antunit/types/resources/archives-test.xml index 961effc..903de06 100644 --- a/src/tests/antunit/types/resources/archives-test.xml +++ b/src/tests/antunit/types/resources/archives-test.xml @@ -91,7 +91,7 @@ <archives refid="ref"/> </copy> </au:expectfailure> - </target> + </target> <!-- works but takes a veeeeeery long time --> <target name="XtestResourcesManualExample"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/resources/comparators/test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/comparators/test.xml b/src/tests/antunit/types/resources/comparators/test.xml index 524f67a..ffdee5d 100644 --- a/src/tests/antunit/types/resources/comparators/test.xml +++ b/src/tests/antunit/types/resources/comparators/test.xml @@ -19,46 +19,46 @@ xmlns:au="antlib:org.apache.ant.antunit" xmlns:rcmp="antlib:org.apache.tools.ant.types.resources.comparators"> - <import file="../../../antunit-base.xml" /> + <import file="../../../antunit-base.xml"/> - <property name="dirname" value="work" /> - <property name="dir" location="${output}/${dirname}" /> - <property name="echolevel" value="debug" /> + <property name="dirname" value="work"/> + <property name="dir" location="${output}/${dirname}"/> + <property name="echolevel" value="debug"/> <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="setUp"> - <mkdir dir="${dir}" /> + <mkdir dir="${dir}"/> - <echo file="${dir}/b" message="yyy" /> - <echo file="${dir}/e" message="aaa" /> - <sleep seconds="2" /> - <echo file="${dir}/c" message="x" /> - <echo file="${dir}/d" message="x" /> - <sleep seconds="2" /> - <echo file="${dir}/a" message="zz" /> - <echo file="${dir}/f" message="zz" /> + <echo file="${dir}/b" message="yyy"/> + <echo file="${dir}/e" message="aaa"/> + <sleep seconds="2"/> + <echo file="${dir}/c" message="x"/> + <echo file="${dir}/d" message="x"/> + <sleep seconds="2"/> + <echo file="${dir}/a" message="zz"/> + <echo file="${dir}/f" message="zz"/> - <mkdir dir="${dir}/a.dir" /> - <mkdir dir="${dir}/b.dir" /> - <mkdir dir="${dir}/c.dir" /> + <mkdir dir="${dir}/a.dir"/> + <mkdir dir="${dir}/b.dir"/> + <mkdir dir="${dir}/c.dir"/> <macrodef name="mysort"> - <attribute name="property" /> - <attribute name="separator" default="," /> - <element name="cmp" optional="true" implicit="true" /> + <attribute name="property"/> + <attribute name="separator" default=","/> + <element name="cmp" optional="true" implicit="true"/> <sequential> <pathconvert property="@{property}" pathsep="@{separator}"> <sort> - <fileset dir="${dir}" includes="a,b,c" /> - <cmp /> + <fileset dir="${dir}" includes="a,b,c"/> + <cmp/> </sort> - <flattenmapper /> + <flattenmapper/> </pathconvert> <echo level="${echolevel}">@{property}=${@{property}}</echo> </sequential> @@ -66,98 +66,98 @@ </target> <target name="testsortdefault" depends="setUp"> - <mysort property="sortdf" /> + <mysort property="sortdf"/> <au:assertTrue> - <equals arg1="${sortdf}" arg2="a,b,c" /> + <equals arg1="${sortdf}" arg2="a,b,c"/> </au:assertTrue> </target> <target name="testrvdefault" depends="setUp"> <mysort property="sortdf-rev"> - <rcmp:reverse /> + <rcmp:reverse/> </mysort> <au:assertTrue> - <equals arg1="${sortdf-rev}" arg2="c,b,a" /> + <equals arg1="${sortdf-rev}" arg2="c,b,a"/> </au:assertTrue> </target> <target name="testname" depends="setUp"> <mysort property="sortnm"> - <rcmp:name /> + <rcmp:name/> </mysort> <au:assertTrue> - <equals arg1="${sortnm}" arg2="a,b,c" /> + <equals arg1="${sortnm}" arg2="a,b,c"/> </au:assertTrue> </target> <target name="testrvname" depends="setUp"> <mysort property="sortnm-rev"> <rcmp:reverse> - <rcmp:name /> + <rcmp:name/> </rcmp:reverse> </mysort> <au:assertTrue> - <equals arg1="${sortnm-rev}" arg2="c,b,a" /> + <equals arg1="${sortnm-rev}" arg2="c,b,a"/> </au:assertTrue> </target> <target name="testdate" depends="setUp"> <mysort property="sortlm"> - <rcmp:date /> + <rcmp:date/> </mysort> <au:assertTrue> - <equals arg1="${sortlm}" arg2="b,c,a" /> + <equals arg1="${sortlm}" arg2="b,c,a"/> </au:assertTrue> </target> <target name="testrvdate" depends="setUp"> <mysort property="sortlm-rev"> <rcmp:reverse> - <rcmp:date /> + <rcmp:date/> </rcmp:reverse> </mysort> <au:assertTrue> - <equals arg1="${sortlm-rev}" arg2="a,c,b" /> + <equals arg1="${sortlm-rev}" arg2="a,c,b"/> </au:assertTrue> </target> <target name="testsize" depends="setUp"> <mysort property="sortsz"> - <rcmp:size /> + <rcmp:size/> </mysort> <au:assertTrue> - <equals arg1="${sortsz}" arg2="c,a,b" /> + <equals arg1="${sortsz}" arg2="c,a,b"/> </au:assertTrue> </target> <target name="testrvsize" depends="setUp"> <mysort property="sortsz-rev"> <rcmp:reverse> - <rcmp:size /> + <rcmp:size/> </rcmp:reverse> </mysort> <au:assertTrue> - <equals arg1="${sortsz-rev}" arg2="b,a,c" /> + <equals arg1="${sortsz-rev}" arg2="b,a,c"/> </au:assertTrue> </target> <target name="testcontent" depends="setUp"> <mysort property="sortct"> - <rcmp:content /> + <rcmp:content/> </mysort> <au:assertTrue> - <equals arg1="${sortct}" arg2="c,b,a" /> + <equals arg1="${sortct}" arg2="c,b,a"/> </au:assertTrue> </target> <target name="testrvcontent" depends="setUp"> <mysort property="sortct-rev"> <rcmp:reverse> - <rcmp:content /> + <rcmp:content/> </rcmp:reverse> </mysort> <au:assertTrue> - <equals arg1="${sortct-rev}" arg2="a,b,c" /> + <equals arg1="${sortct-rev}" arg2="a,b,c"/> </au:assertTrue> </target> @@ -165,15 +165,15 @@ <pathconvert property="sortex" pathsep=","> <sort> <resources> - <file file="${dir}/a" /> - <resource name="redherring" exists="false" /> + <file file="${dir}/a"/> + <resource name="redherring" exists="false"/> </resources> - <rcmp:exists /> + <rcmp:exists/> </sort> - <flattenmapper /> + <flattenmapper/> </pathconvert> <au:assertTrue> - <equals arg1="${sortex}" arg2="redherring,a" /> + <equals arg1="${sortex}" arg2="redherring,a"/> </au:assertTrue> </target> @@ -181,17 +181,17 @@ <pathconvert property="sortex-rev" pathsep=","> <sort> <resources> - <file file="${dir}/a" /> - <resource name="redherring" exists="false" /> + <file file="${dir}/a"/> + <resource name="redherring" exists="false"/> </resources> <rcmp:reverse> - <rcmp:exists /> + <rcmp:exists/> </rcmp:reverse> </sort> - <flattenmapper /> + <flattenmapper/> </pathconvert> <au:assertTrue> - <equals arg1="${sortex-rev}" arg2="a,redherring" /> + <equals arg1="${sortex-rev}" arg2="a,redherring"/> </au:assertTrue> </target> @@ -199,79 +199,79 @@ <pathconvert property="sorttp" pathsep=","> <sort> <resources> - <file file="${dir}/a" /> - <file file="${dir}/a.dir" /> + <file file="${dir}/a"/> + <file file="${dir}/a.dir"/> </resources> - <rcmp:type /> + <rcmp:type/> </sort> - <flattenmapper /> + <flattenmapper/> </pathconvert> - <au:assertPropertyEquals name="sorttp" value="a,a.dir" /> + <au:assertPropertyEquals name="sorttp" value="a,a.dir"/> </target> <target name="testrvtype" depends="setUp"> <pathconvert property="sorttp-rev" pathsep=","> <sort> <resources> - <file file="${dir}/a" /> - <file file="${dir}/a.dir" /> + <file file="${dir}/a"/> + <file file="${dir}/a.dir"/> </resources> <rcmp:reverse> - <rcmp:type /> + <rcmp:type/> </rcmp:reverse> </sort> - <flattenmapper /> + <flattenmapper/> </pathconvert> <au:assertTrue> - <equals arg1="${sorttp-rev}" arg2="a.dir,a" /> + <equals arg1="${sorttp-rev}" arg2="a.dir,a"/> </au:assertTrue> </target> <target name="forwardsort" - depends="testsortdefault,testname,testdate,testsize,testcontent,testexists,testtype" /> + depends="testsortdefault,testname,testdate,testsize,testcontent,testexists,testtype"/> <target name="reversesort" - depends="testrvdefault,testrvname,testrvdate,testrvsize,testrvcontent,testrvexists,testrvtype" /> + depends="testrvdefault,testrvname,testrvdate,testrvsize,testrvcontent,testrvexists,testrvtype"/> <target name="testcompoundsort1" depends="setUp"> <pathconvert property="sortcmp1" pathsep=","> <sort> <resources> - <file file="${dir}/c" /> - <file file="${dir}/b.dir" /> - <file file="${dir}/a" /> - <file file="${dir}/c.dir" /> - <file file="${dir}/b" /> - <file file="${dir}/a.dir" /> + <file file="${dir}/c"/> + <file file="${dir}/b.dir"/> + <file file="${dir}/a"/> + <file file="${dir}/c.dir"/> + <file file="${dir}/b"/> + <file file="${dir}/a.dir"/> </resources> <rcmp:reverse> - <rcmp:type /> + <rcmp:type/> </rcmp:reverse> - <rcmp:name /> + <rcmp:name/> </sort> - <flattenmapper /> + <flattenmapper/> </pathconvert> - <au:assertPropertyEquals name="sortcmp1" value="a.dir,b.dir,c.dir,a,b,c" /> + <au:assertPropertyEquals name="sortcmp1" value="a.dir,b.dir,c.dir,a,b,c"/> </target> <target name="testcompoundsort2" depends="setUp"> <pathconvert property="sortcmp2" pathsep=","> <sort> <fileset dir="${dir}" includes="?"/> - <rcmp:size /> - <rcmp:content /> + <rcmp:size/> + <rcmp:content/> <rcmp:reverse> - <rcmp:name /> + <rcmp:name/> </rcmp:reverse> </sort> - <flattenmapper /> + <flattenmapper/> </pathconvert> - <au:assertPropertyEquals name="sortcmp2" value="d,c,f,a,e,b" /> + <au:assertPropertyEquals name="sortcmp2" value="d,c,f,a,e,b"/> </target> - <target name="compoundsort" depends="testcompoundsort1,testcompoundsort2" /> + <target name="compoundsort" depends="testcompoundsort1,testcompoundsort2"/> - <target name="sort" depends="forwardsort,reversesort,compoundsort" /> + <target name="sort" depends="forwardsort,reversesort,compoundsort"/> <target name="testEquals"> <!-- test for PR 46527 --> @@ -284,15 +284,15 @@ </sort> <au:assertTrue> - <resourcecount refid="testEquals" count="3" /> + <resourcecount refid="testEquals" count="3"/> </au:assertTrue> <pathconvert refid="testEquals" property="testEquals" pathsep="" preserveduplicates="true"> - <mergemapper to="X" /> + <mergemapper to="X"/> </pathconvert> <au:assertTrue> - <length string="${testEquals}" length="3" /> + <length string="${testEquals}" length="3"/> </au:assertTrue> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/resources/concat-resource-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/concat-resource-test.xml b/src/tests/antunit/types/resources/concat-resource-test.xml index 554c13d..9154301 100644 --- a/src/tests/antunit/types/resources/concat-resource-test.xml +++ b/src/tests/antunit/types/resources/concat-resource-test.xml @@ -19,10 +19,10 @@ <project name="test-concat" basedir="." default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> - <property name="br" value="${line.separator}" /> - <property name="world" value="World" /> + <property name="br" value="${line.separator}"/> + <property name="world" value="World"/> <target name="testCountEquals1"> <au:assertTrue> @@ -46,9 +46,9 @@ <resourcesmatch> <string>foobarbaz</string> <concat> - <string value="foo" /> - <string value="bar" /> - <string value="baz" /> + <string value="foo"/> + <string value="bar"/> + <string value="baz"/> </concat> </resourcesmatch> </au:assertTrue> @@ -59,9 +59,9 @@ <resourcesmatch> <string>foo${line.separator}bar${line.separator}baz${line.separator}</string> <concat fixlastline="true"> - <string value="foo" /> - <string value="bar" /> - <string value="baz" /> + <string value="foo"/> + <string value="bar"/> + <string value="baz"/> </concat> </resourcesmatch> </au:assertTrue> @@ -76,12 +76,12 @@ </copy> <au:assertTrue> <resourcesmatch astext="true"> - <file file="${output}/utf-16.in" /> + <file file="${output}/utf-16.in"/> <concat outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat> <concat outputEncoding="utf-16" fixlastline="true"> - <string value="foo" /> - <string value="bar" /> - <string value="baz" /> + <string value="foo"/> + <string value="bar"/> + <string value="baz"/> </concat> </resourcesmatch> </au:assertTrue> @@ -100,9 +100,9 @@ baz #comment 3 <filterchain> <striplinecomments> - <comment value="#" /> + <comment value="#"/> </striplinecomments> - <ignoreblank /> + <ignoreblank/> </filterchain> </concat> </resourcesmatch> @@ -115,12 +115,12 @@ baz </resources> <au:assertTrue> <and> - <resourcecount count="1" refid="concat" /> + <resourcecount count="1" refid="concat"/> <resourcesmatch> <string>foo</string> - <resources refid="concat" /> + <resources refid="concat"/> <!-- purposely hit it twice to see what happens --> - <resources refid="concat" /> + <resources refid="concat"/> </resourcesmatch> </and> </au:assertTrue> @@ -132,7 +132,7 @@ baz <string>foobar</string> <concat> <string>foo</string> - <propertyresource name="someunsetproperty" /> + <propertyresource name="someunsetproperty"/> <string>bar</string> </concat> </resourcesmatch> @@ -143,7 +143,7 @@ baz <au:assertTrue> <resourcecount count="1"> <restrict> - <name name="snicklefritz" /> + <name name="snicklefritz"/> <resources> <concat resourceName="snicklefritz"> whatever http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/resources/fileresource-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/fileresource-test.xml b/src/tests/antunit/types/resources/fileresource-test.xml index 7114119..e81f92f 100644 --- a/src/tests/antunit/types/resources/fileresource-test.xml +++ b/src/tests/antunit/types/resources/fileresource-test.xml @@ -17,7 +17,7 @@ --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> <!-- using restrict/exists to force getFile() to be called --> @@ -25,8 +25,8 @@ <au:assertTrue> <resourcecount when="ge" count="0"> <restrict> - <exists /> - <file name="foo" /> + <exists/> + <file name="foo"/> </restrict> </resourcecount> </au:assertTrue> @@ -36,8 +36,8 @@ <au:assertTrue> <resourcecount when="ge" count="0"> <restrict> - <exists /> - <file name="foo" /> + <exists/> + <file name="foo"/> </restrict> </resourcecount> </au:assertTrue> @@ -47,8 +47,8 @@ <au:assertTrue> <resourcecount when="ge" count="0"> <restrict> - <exists /> - <file basedir="${basedir}" name="foo" /> + <exists/> + <file basedir="${basedir}" name="foo"/> </restrict> </resourcecount> </au:assertTrue> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/resources/first-last-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/first-last-test.xml b/src/tests/antunit/types/resources/first-last-test.xml index e7fc831..3670a11 100644 --- a/src/tests/antunit/types/resources/first-last-test.xml +++ b/src/tests/antunit/types/resources/first-last-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"/> <tokens id="testrc"> - <string value="1,2,3,4,5" /> - <stringtokenizer delims="," /> + <string value="1,2,3,4,5"/> + <stringtokenizer delims=","/> </tokens> <target name="testfirst0"> <au:assertTrue> <resourcecount count="0"> - <first count="0"><resources refid="testrc" /></first> + <first count="0"><resources refid="testrc"/></first> </resourcecount> </au:assertTrue> </target> @@ -36,8 +36,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <first><resources refid="testrc" /></first> - <string value="1" /> + <first><resources refid="testrc"/></first> + <string value="1"/> </difference> </resourcecount> </au:assertTrue> @@ -47,10 +47,10 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <first count="2"><resources refid="testrc" /></first> + <first count="2"><resources refid="testrc"/></first> <resources> - <string value="1" /> - <string value="2" /> + <string value="1"/> + <string value="2"/> </resources> </difference> </resourcecount> @@ -61,8 +61,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <first count="5"><resources refid="testrc" /></first> - <resources refid="testrc" /> + <first count="5"><resources refid="testrc"/></first> + <resources refid="testrc"/> </difference> </resourcecount> </au:assertTrue> @@ -72,8 +72,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <first count="6"><resources refid="testrc" /></first> - <resources refid="testrc" /> + <first count="6"><resources refid="testrc"/></first> + <resources refid="testrc"/> </difference> </resourcecount> </au:assertTrue> @@ -82,7 +82,7 @@ <target name="testfirst-1"> <au:expectfailure expectedmessage="size-limited collection count should be set to an int >= 0"> <resourcecount> - <first count="-1"><resources refid="testrc" /></first> + <first count="-1"><resources refid="testrc"/></first> </resourcecount> </au:expectfailure> </target> @@ -90,7 +90,7 @@ <target name="testlast0"> <au:assertTrue> <resourcecount count="0"> - <last count="0"><resources refid="testrc" /></last> + <last count="0"><resources refid="testrc"/></last> </resourcecount> </au:assertTrue> </target> @@ -99,8 +99,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <last><resources refid="testrc" /></last> - <string value="5" /> + <last><resources refid="testrc"/></last> + <string value="5"/> </difference> </resourcecount> </au:assertTrue> @@ -110,10 +110,10 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <last count="2"><resources refid="testrc" /></last> + <last count="2"><resources refid="testrc"/></last> <resources> - <string value="4" /> - <string value="5" /> + <string value="4"/> + <string value="5"/> </resources> </difference> </resourcecount> @@ -124,8 +124,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <last count="5"><resources refid="testrc" /></last> - <resources refid="testrc" /> + <last count="5"><resources refid="testrc"/></last> + <resources refid="testrc"/> </difference> </resourcecount> </au:assertTrue> @@ -135,8 +135,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <last count="6"><resources refid="testrc" /></last> - <resources refid="testrc" /> + <last count="6"><resources refid="testrc"/></last> + <resources refid="testrc"/> </difference> </resourcecount> </au:assertTrue> @@ -145,7 +145,7 @@ <target name="testlast-1"> <au:expectfailure expectedmessage="size-limited collection count should be set to an int >= 0"> <resourcecount> - <last count="-1"><resources refid="testrc" /></last> + <last count="-1"><resources refid="testrc"/></last> </resourcecount> </au:expectfailure> </target> @@ -153,7 +153,7 @@ <target name="testallbutfirst5"> <au:assertTrue> <resourcecount count="0"> - <allbutfirst count="5"><resources refid="testrc" /></allbutfirst> + <allbutfirst count="5"><resources refid="testrc"/></allbutfirst> </resourcecount> </au:assertTrue> </target> @@ -162,8 +162,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <allbutfirst count="4"><resources refid="testrc" /></allbutfirst> - <string value="5" /> + <allbutfirst count="4"><resources refid="testrc"/></allbutfirst> + <string value="5"/> </difference> </resourcecount> </au:assertTrue> @@ -173,10 +173,10 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <allbutfirst count="3"><resources refid="testrc" /></allbutfirst> + <allbutfirst count="3"><resources refid="testrc"/></allbutfirst> <resources> - <string value="4" /> - <string value="5" /> + <string value="4"/> + <string value="5"/> </resources> </difference> </resourcecount> @@ -187,12 +187,12 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <allbutfirst><resources refid="testrc" /></allbutfirst> + <allbutfirst><resources refid="testrc"/></allbutfirst> <resources> - <string value="2" /> - <string value="3" /> - <string value="4" /> - <string value="5" /> + <string value="2"/> + <string value="3"/> + <string value="4"/> + <string value="5"/> </resources> </difference> </resourcecount> @@ -202,7 +202,7 @@ <target name="testallbutfirst6"> <au:assertTrue> <resourcecount count="0"> - <allbutfirst count="6"><resources refid="testrc" /></allbutfirst> + <allbutfirst count="6"><resources refid="testrc"/></allbutfirst> </resourcecount> </au:assertTrue> </target> @@ -210,7 +210,7 @@ <target name="testallbutfirst-1"> <au:expectfailure expectedmessage="size-limited collection count should be set to an int >= 0"> <resourcecount> - <allbutfirst count="-1"><resources refid="testrc" /></allbutfirst> + <allbutfirst count="-1"><resources refid="testrc"/></allbutfirst> </resourcecount> </au:expectfailure> </target> @@ -218,7 +218,7 @@ <target name="testallbutlast5"> <au:assertTrue> <resourcecount count="0"> - <allbutlast count="5"><resources refid="testrc" /></allbutlast> + <allbutlast count="5"><resources refid="testrc"/></allbutlast> </resourcecount> </au:assertTrue> </target> @@ -227,8 +227,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <allbutlast count="4"><resources refid="testrc" /></allbutlast> - <string value="1" /> + <allbutlast count="4"><resources refid="testrc"/></allbutlast> + <string value="1"/> </difference> </resourcecount> </au:assertTrue> @@ -238,12 +238,12 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <allbutlast><resources refid="testrc" /></allbutlast> + <allbutlast><resources refid="testrc"/></allbutlast> <resources> - <string value="1" /> - <string value="2" /> - <string value="3" /> - <string value="4" /> + <string value="1"/> + <string value="2"/> + <string value="3"/> + <string value="4"/> </resources> </difference> </resourcecount> @@ -254,8 +254,8 @@ <au:assertTrue> <resourcecount count="0"> <difference> - <allbutlast count="0"><resources refid="testrc" /></allbutlast> - <resources refid="testrc" /> + <allbutlast count="0"><resources refid="testrc"/></allbutlast> + <resources refid="testrc"/> </difference> </resourcecount> </au:assertTrue> @@ -264,7 +264,7 @@ <target name="testallbutlast6"> <au:assertTrue> <resourcecount count="0"> - <allbutlast count="6"><resources refid="testrc" /></allbutlast> + <allbutlast count="6"><resources refid="testrc"/></allbutlast> </resourcecount> </au:assertTrue> </target> @@ -272,7 +272,7 @@ <target name="testallbutlast-1"> <au:expectfailure expectedmessage="size-limited collection count should be set to an int >= 0"> <resourcecount> - <allbutlast count="-1"><resources refid="testrc" /></allbutlast> + <allbutlast count="-1"><resources refid="testrc"/></allbutlast> </resourcecount> </au:expectfailure> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/resources/latepath-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/latepath-test.xml b/src/tests/antunit/types/resources/latepath-test.xml index 5cafffd..475c007 100644 --- a/src/tests/antunit/types/resources/latepath-test.xml +++ b/src/tests/antunit/types/resources/latepath-test.xml @@ -19,16 +19,16 @@ <target name="testLatePath" depends="tearDown"> <path id="p"> - <fileset file="testLatePath" /> + <fileset file="testLatePath"/> </path> - <pathconvert refid="p" /> - <touch file="testLatePath" /> + <pathconvert refid="p"/> + <touch file="testLatePath"/> <au:assertTrue> - <resourcecount when="eq" count="1" refid="p" /> + <resourcecount when="eq" count="1" refid="p"/> </au:assertTrue> </target> <target name="tearDown"> - <delete file="testLatePath" /> + <delete file="testLatePath"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/resources/multirootfileset-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/multirootfileset-test.xml b/src/tests/antunit/types/resources/multirootfileset-test.xml index 27b6193..b6f01bb 100644 --- a/src/tests/antunit/types/resources/multirootfileset-test.xml +++ b/src/tests/antunit/types/resources/multirootfileset-test.xml @@ -159,7 +159,7 @@ </multirootfileset> <pathconvert property="dirs" pathsep=":" refid="the-one-dirs"/> <au:assertPropertyEquals value="${a}${file.separator}1" name="dirs"/> - <resourcecount property="dir-count" refid="the-one-dirs" /> + <resourcecount property="dir-count" refid="the-one-dirs"/> <au:assertPropertyEquals value="1" name="dir-count"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/types/resources/resourcelist-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/resourcelist-test.xml b/src/tests/antunit/types/resources/resourcelist-test.xml index 3357747..145c869 100644 --- a/src/tests/antunit/types/resources/resourcelist-test.xml +++ b/src/tests/antunit/types/resources/resourcelist-test.xml @@ -19,7 +19,7 @@ <project name="test-concat" basedir="." default="antunit" xmlns:au="antlib:org.apache.ant.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/2f64e0b5/src/tests/antunit/types/resources/selectors/name-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/selectors/name-test.xml b/src/tests/antunit/types/resources/selectors/name-test.xml index 84cbedb..c248f75 100644 --- a/src/tests/antunit/types/resources/selectors/name-test.xml +++ b/src/tests/antunit/types/resources/selectors/name-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/2f64e0b5/src/tests/antunit/types/resources/selectors/readwrite-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/selectors/readwrite-test.xml b/src/tests/antunit/types/resources/selectors/readwrite-test.xml index 4247875..3bdca79 100644 --- a/src/tests/antunit/types/resources/selectors/readwrite-test.xml +++ b/src/tests/antunit/types/resources/selectors/readwrite-test.xml @@ -18,7 +18,7 @@ <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit" xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors"> - <import file="../../../antunit-base.xml" /> + <import file="../../../antunit-base.xml"/> <property name="dir" location="testdir"/> <property name="file" value="testfile"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/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 187412e..71de167 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>
