http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/types/selectors/scriptselector.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/types/selectors/scriptselector.xml b/src/etc/testcases/types/selectors/scriptselector.xml index 80afe30..2405e33 100644 --- a/src/etc/testcases/types/selectors/scriptselector.xml +++ b/src/etc/testcases/types/selectors/scriptselector.xml @@ -17,8 +17,8 @@ --> <project name="scriptselector" default="def" basedir="."> - <property name="src.file" location="${ant.file}" /> - + <property name="src.file" location="${ant.file}"/> + <macrodef name="testselected"> <element name="selector" implicit="yes" optional="true"/> <attribute name="message"/> @@ -33,8 +33,8 @@ </condition> </fail> </sequential> - </macrodef> - + </macrodef> + <macrodef name="testnoselected"> <element name="selector" implicit="yes" optional="true"/> <attribute name="message"/> @@ -47,18 +47,18 @@ </condition> </fail> </sequential> - </macrodef> + </macrodef> <!-- this is here to test the macro is well coded --> <target name="testNoSelector"> - <testselected message="testNoSelector" > + <testselected message="testNoSelector"> </testselected> </target> <target name="testNolanguage"> - <testselected message="testNolanguage" > + <testselected message="testNolanguage"> <selector> - <scriptselector > + <scriptselector> self.setSelected(true); </scriptselector> </selector> @@ -66,7 +66,7 @@ </target> <target name="testSelectionSetByDefault"> - <testselected message="testSelectionSetByDefault" > + <testselected message="testSelectionSetByDefault"> <selector> <scriptselector language="javascript"> </scriptselector> @@ -76,7 +76,7 @@ <target name="testSelectionSetWorks"> - <testselected message="testSelectionSetWorks" > + <testselected message="testSelectionSetWorks"> <selector> <scriptselector language="javascript"> self.setSelected(false); @@ -95,29 +95,29 @@ </selector> </testnoselected> </target> - + <target name="testFileAttribute"> - <testselected message="testFileAttribute" > + <testselected message="testFileAttribute"> <selector> <scriptselector language="javascript"> self.setSelected(file.equals(self.getFile())); </scriptselector> </selector> </testselected> - </target> + </target> <target name="testFilenameAttribute"> - <testselected message="testFilenameAttribute" > + <testselected message="testFilenameAttribute"> <selector> <scriptselector language="javascript"> self.setSelected(filename.equals(self.getFilename())); </scriptselector> </selector> </testselected> - </target> - + </target> + <target name="testBasedirAttribute"> - <testselected message="testBasedirAttribute" > + <testselected message="testBasedirAttribute"> <selector> <scriptselector language="javascript"> self.setSelected(basedir.equals(self.getBasedir())); @@ -125,14 +125,14 @@ </selector> </testselected> </target> - + <target name="notestFilenameLength"> - <testselected message="notestFilenameLength" > + <testselected message="notestFilenameLength"> <selector> <scriptselector language="javascript"> self.setSelected((filename.length%2)==0); </scriptselector> </selector> </testselected> - </target> + </target> </project>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/types/selectors/signedselector.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/types/selectors/signedselector.xml b/src/etc/testcases/types/selectors/signedselector.xml index 60fe940..ea611e8 100644 --- a/src/etc/testcases/types/selectors/signedselector.xml +++ b/src/etc/testcases/types/selectors/signedselector.xml @@ -31,7 +31,7 @@ </macrodef> <property name="issigned.dir" location="../../taskdefs/conditions/jars"/> - + <target name="selectsigned"> <pass failmessage="apassword.jar should be a signed file"> <isfileselected file="${issigned.dir}/apassword.jar"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/types/xmlcatalog.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/types/xmlcatalog.xml b/src/etc/testcases/types/xmlcatalog.xml index 63269f7..0c53666 100644 --- a/src/etc/testcases/types/xmlcatalog.xml +++ b/src/etc/testcases/types/xmlcatalog.xml @@ -26,125 +26,120 @@ buildfile is called by org.apache.tools.ant.types.XMLCatalogBuildFileTest.java Alternatively, you may try it out by hand by first removing the - comment symbols around the echo statements and then calling + comment symbols around the echo statements and then calling ant -buildfile xmlcatalog.xml </description> - <property name="transformer" value = "xmlcatalog.xsl"/> + <property name="transformer" value="xmlcatalog.xsl"/> - <target - name = "all" - depends = "testentitynocatalog, testentitywithcatalog, - testdocumentnocatalog, testdocumentwithcatalog"/> + <target + name="all" + depends="testentitynocatalog, testentitywithcatalog, testdocumentnocatalog, testdocumentwithcatalog"/> - <target - name = "testentitynocatalog" - description = "Test external entity resolver for simple XML -document without using XMLCatalog"> + <target + name="testentitynocatalog" + description="Test external entity resolver for simple XML document without using XMLCatalog"> <delete - quiet = "yes" - file = "result.out"/> + quiet="yes" + file="result.out"/> <xslt - basedir = "${basedir}" - destdir = "${basedir}" - extension = ".text" - style = "${transformer}" - in = "xmlcatalog1.xml" - out = "result.out"> + basedir="${basedir}" + destdir="${basedir}" + extension=".text" + style="${transformer}" + in="xmlcatalog1.xml" + out="result.out"> <param - name = "outprop" - expression = "val1"/> + name="outprop" + expression="val1"/> </xslt> - <property file = "result.out"/> - <!-- <echo message = "${val1}"/> --> + <property file="result.out"/> + <!-- <echo message="${val1}"/> --> <delete - quiet = "yes" - file = "result.out"/> + quiet="yes" + file="result.out"/> </target> - <target - name = "testentitywithcatalog" - description = "Test external entity resolver for simple -XML document using XMLCatalog"> + <target + name="testentitywithcatalog" + description="Test external entity resolver for simple XML document using XMLCatalog"> <delete - quiet = "yes" - file = "result.out"/> + quiet="yes" + file="result.out"/> <xslt - basedir = "${basedir}" - destdir = "${basedir}" - extension = ".text" - style = "${transformer}" - in = "xmlcatalog1.xml" - out = "result.out"> + basedir="${basedir}" + destdir="${basedir}" + extension=".text" + style="${transformer}" + in="xmlcatalog1.xml" + out="result.out"> <param - name = "outprop" - expression = "val2"/> + name="outprop" + expression="val2"/> <xmlcatalog> - <entity - publicId = "myquote" - location = "quote2.xml"/> + <entity + publicId="myquote" + location="quote2.xml"/> </xmlcatalog> </xslt> - <property file = "result.out"/> - <!-- <echo message = "${val2}"/> --> + <property file="result.out"/> + <!-- <echo message="${val2}"/> --> <delete - quiet = "yes" - file = "result.out"/> + quiet="yes" + file="result.out"/> </target> - <target - name = "testdocumentnocatalog" - description = "Test entity resolution in XML document called -from XSLT document() function without using XMLCatalog"> + <target + name="testdocumentnocatalog" + description="Test entity resolution in XML document called from XSLT document() function without using XMLCatalog"> <delete - quiet = "yes" - file = "result.out"/> + quiet="yes" + file="result.out"/> <xslt - basedir = "${basedir}" - destdir = "${basedir}" - extension = ".text" - style = "${transformer}" - in = "xmlcatalog2.xml" - out = "result.out"> + basedir="${basedir}" + destdir="${basedir}" + extension=".text" + style="${transformer}" + in="xmlcatalog2.xml" + out="result.out"> <param - name = "outprop" - expression = "val3"/> + name="outprop" + expression="val3"/> </xslt> - <property file = "result.out"/> - <!-- <echo message = "${val3}"/> --> + <property file="result.out"/> + <!-- <echo message="${val3}"/> --> <delete - quiet = "yes" - file = "result.out"/> + quiet="yes" + file="result.out"/> </target> - <target - name = "testdocumentwithcatalog" - description = "Test entity resolution in XML document called -from XSLT document() function using XMLCatalog"> + <target + name="testdocumentwithcatalog" + description="Test entity resolution in XML document called from XSLT document() function using XMLCatalog"> <delete - quiet = "yes" - file = "result.out"/> + quiet="yes" + file="result.out"/> <xslt - basedir = "${basedir}" - destdir = "${basedir}" - extension = ".text" - style = "${transformer}" - in = "xmlcatalog2.xml" - out = "result.out"> + basedir="${basedir}" + destdir="${basedir}" + extension=".text" + style="${transformer}" + in="xmlcatalog2.xml" + out="result.out"> <param - name = "outprop" - expression = "val4"/> + name="outprop" + expression="val4"/> <xmlcatalog> - <entity - publicId = "myquote" - location = "quote2.xml"/> + <entity + publicId="myquote" + location="quote2.xml"/> </xmlcatalog> </xslt> - <property file = "result.out"/> - <!-- <echo message = "${val4}"/> --> + <property file="result.out"/> + <!-- <echo message="${val4}"/> --> <delete - quiet = "yes" - file = "result.out"/> + quiet="yes" + file="result.out"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/types/xmlcatalog.xsl ---------------------------------------------------------------------- diff --git a/src/etc/testcases/types/xmlcatalog.xsl b/src/etc/testcases/types/xmlcatalog.xsl index a2c839c..62621eb 100644 --- a/src/etc/testcases/types/xmlcatalog.xsl +++ b/src/etc/testcases/types/xmlcatalog.xsl @@ -15,12 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<xsl:stylesheet +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> <!-- I belong to: - org.apache.tools.ant.types.XMLCatalogBuildFileTest.java + org.apache.tools.ant.types.XMLCatalogBuildFileTest.java --> <xsl:output method="text"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/types/xmlcatalog1.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/types/xmlcatalog1.xml b/src/etc/testcases/types/xmlcatalog1.xml index d4b5461..e4d66e9 100644 --- a/src/etc/testcases/types/xmlcatalog1.xml +++ b/src/etc/testcases/types/xmlcatalog1.xml @@ -20,7 +20,7 @@ ]> <!-- I belong to: - org.apache.tools.ant.types.XMLCatalogBuildFileTest.java + org.apache.tools.ant.types.XMLCatalogBuildFileTest.java --> <fragment> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/types/xmlcatalog2.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/types/xmlcatalog2.xml b/src/etc/testcases/types/xmlcatalog2.xml index 9d2bed0..edf5d2d 100644 --- a/src/etc/testcases/types/xmlcatalog2.xml +++ b/src/etc/testcases/types/xmlcatalog2.xml @@ -17,7 +17,7 @@ --> <!-- I belong to: - org.apache.tools.ant.types.XMLCatalogBuildFileTest.java + org.apache.tools.ant.types.XMLCatalogBuildFileTest.java --> <fragment> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/main/org/apache/tools/ant/antlib.xml ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/antlib.xml b/src/main/org/apache/tools/ant/antlib.xml index 8ec6714..f9f219b 100644 --- a/src/main/org/apache/tools/ant/antlib.xml +++ b/src/main/org/apache/tools/ant/antlib.xml @@ -90,52 +90,52 @@ <!-- selectors --> <componentdef name="and" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.And" /> + classname="org.apache.tools.ant.types.resources.selectors.And"/> <componentdef name="compare" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Compare" /> + classname="org.apache.tools.ant.types.resources.selectors.Compare"/> <componentdef name="contains" onerror="ignore" - classname="org.apache.tools.ant.types.selectors.ContainsSelector" /> + classname="org.apache.tools.ant.types.selectors.ContainsSelector"/> <componentdef name="containsregexp" onerror="ignore" - classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector" /> + classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector"/> <componentdef name="date" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Date" /> + classname="org.apache.tools.ant.types.resources.selectors.Date"/> <componentdef name="exists" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Exists" /> + classname="org.apache.tools.ant.types.resources.selectors.Exists"/> <componentdef name="instanceof" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.InstanceOf" /> + classname="org.apache.tools.ant.types.resources.selectors.InstanceOf"/> <componentdef name="majority" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Majority" /> + classname="org.apache.tools.ant.types.resources.selectors.Majority"/> <componentdef name="modified" onerror="ignore" - classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector" /> + classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector"/> <componentdef name="name" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Name" /> + classname="org.apache.tools.ant.types.resources.selectors.Name"/> <componentdef name="none" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.None" /> + classname="org.apache.tools.ant.types.resources.selectors.None"/> <componentdef name="not" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Not" /> + classname="org.apache.tools.ant.types.resources.selectors.Not"/> <componentdef name="or" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Or" /> + classname="org.apache.tools.ant.types.resources.selectors.Or"/> <componentdef name="size" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Size" /> + classname="org.apache.tools.ant.types.resources.selectors.Size"/> <componentdef name="type" onerror="ignore" - classname="org.apache.tools.ant.types.resources.selectors.Type" /> + classname="org.apache.tools.ant.types.resources.selectors.Type"/> <!-- comparators --> <componentdef name="name" onerror="ignore" - classname="org.apache.tools.ant.types.resources.comparators.Name" /> + classname="org.apache.tools.ant.types.resources.comparators.Name"/> <componentdef name="size" onerror="ignore" - classname="org.apache.tools.ant.types.resources.comparators.Size" /> + classname="org.apache.tools.ant.types.resources.comparators.Size"/> <componentdef name="date" onerror="ignore" - classname="org.apache.tools.ant.types.resources.comparators.Date" /> + classname="org.apache.tools.ant.types.resources.comparators.Date"/> <componentdef name="exists" onerror="ignore" - classname="org.apache.tools.ant.types.resources.comparators.Exists" /> + classname="org.apache.tools.ant.types.resources.comparators.Exists"/> <componentdef name="type" onerror="ignore" - classname="org.apache.tools.ant.types.resources.comparators.Type" /> + classname="org.apache.tools.ant.types.resources.comparators.Type"/> <componentdef name="content" onerror="ignore" - classname="org.apache.tools.ant.types.resources.comparators.Content" /> + classname="org.apache.tools.ant.types.resources.comparators.Content"/> <componentdef name="reverse" onerror="ignore" - classname="org.apache.tools.ant.types.resources.comparators.Reverse" /> + classname="org.apache.tools.ant.types.resources.comparators.Reverse"/> <!-- filters --> <componentdef name="sortfilter" onerror="ignore" http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/main/org/apache/tools/ant/types/conditions/antlib.xml ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/types/conditions/antlib.xml b/src/main/org/apache/tools/ant/types/conditions/antlib.xml index 5643a2e..2bc6f68 100644 --- a/src/main/org/apache/tools/ant/types/conditions/antlib.xml +++ b/src/main/org/apache/tools/ant/types/conditions/antlib.xml @@ -64,7 +64,7 @@ classname="org.apache.tools.ant.taskdefs.condition.IsSet"/> <typedef name="issigned" onerror="ignore" classname="org.apache.tools.ant.taskdefs.condition.IsSigned"/> - <typedef name="istrue" onerror="ignore" + <typedef name="istrue" onerror="ignore" classname="org.apache.tools.ant.taskdefs.condition.IsTrue"/> <typedef name="javaversion" onerror="ignore" classname="org.apache.tools.ant.taskdefs.condition.JavaVersion"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml ---------------------------------------------------------------------- diff --git a/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml b/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml index ae61b9d..fd496af 100644 --- a/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml +++ b/src/resources/org/apache/tools/ant/types/resources/comparators/antlib.xml @@ -17,17 +17,17 @@ --> <antlib> <typedef name="name" - classname="org.apache.tools.ant.types.resources.comparators.Name" /> + classname="org.apache.tools.ant.types.resources.comparators.Name"/> <typedef name="size" - classname="org.apache.tools.ant.types.resources.comparators.Size" /> + classname="org.apache.tools.ant.types.resources.comparators.Size"/> <typedef name="date" - classname="org.apache.tools.ant.types.resources.comparators.Date" /> + classname="org.apache.tools.ant.types.resources.comparators.Date"/> <typedef name="exists" - classname="org.apache.tools.ant.types.resources.comparators.Exists" /> + classname="org.apache.tools.ant.types.resources.comparators.Exists"/> <typedef name="type" - classname="org.apache.tools.ant.types.resources.comparators.Type" /> + classname="org.apache.tools.ant.types.resources.comparators.Type"/> <typedef name="content" - classname="org.apache.tools.ant.types.resources.comparators.Content" /> + classname="org.apache.tools.ant.types.resources.comparators.Content"/> <typedef name="reverse" - classname="org.apache.tools.ant.types.resources.comparators.Reverse" /> + classname="org.apache.tools.ant.types.resources.comparators.Reverse"/> </antlib> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml ---------------------------------------------------------------------- diff --git a/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml b/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml index 0d0e502..45cd0f4 100644 --- a/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml +++ b/src/resources/org/apache/tools/ant/types/resources/selectors/antlib.xml @@ -17,37 +17,37 @@ --> <antlib> <typedef name="and" - classname="org.apache.tools.ant.types.resources.selectors.And" /> + classname="org.apache.tools.ant.types.resources.selectors.And"/> <typedef name="compare" - classname="org.apache.tools.ant.types.resources.selectors.Compare" /> + classname="org.apache.tools.ant.types.resources.selectors.Compare"/> <typedef name="contains" - classname="org.apache.tools.ant.types.selectors.ContainsSelector" /> + classname="org.apache.tools.ant.types.selectors.ContainsSelector"/> <typedef name="containsregexp" - classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector" /> + classname="org.apache.tools.ant.types.selectors.ContainsRegexpSelector"/> <typedef name="date" - classname="org.apache.tools.ant.types.resources.selectors.Date" /> + classname="org.apache.tools.ant.types.resources.selectors.Date"/> <typedef name="exists" - classname="org.apache.tools.ant.types.resources.selectors.Exists" /> + classname="org.apache.tools.ant.types.resources.selectors.Exists"/> <typedef name="instanceof" - classname="org.apache.tools.ant.types.resources.selectors.InstanceOf" /> + classname="org.apache.tools.ant.types.resources.selectors.InstanceOf"/> <typedef name="majority" - classname="org.apache.tools.ant.types.resources.selectors.Majority" /> + classname="org.apache.tools.ant.types.resources.selectors.Majority"/> <typedef name="modified" - classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector" /> + classname="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector"/> <typedef name="name" - classname="org.apache.tools.ant.types.resources.selectors.Name" /> + classname="org.apache.tools.ant.types.resources.selectors.Name"/> <typedef name="none" - classname="org.apache.tools.ant.types.resources.selectors.None" /> + classname="org.apache.tools.ant.types.resources.selectors.None"/> <typedef name="not" - classname="org.apache.tools.ant.types.resources.selectors.Not" /> + classname="org.apache.tools.ant.types.resources.selectors.Not"/> <typedef name="or" - classname="org.apache.tools.ant.types.resources.selectors.Or" /> + classname="org.apache.tools.ant.types.resources.selectors.Or"/> <typedef name="readable" - classname="org.apache.tools.ant.types.selectors.ReadableSelector" /> + classname="org.apache.tools.ant.types.selectors.ReadableSelector"/> <typedef name="size" - classname="org.apache.tools.ant.types.resources.selectors.Size" /> + classname="org.apache.tools.ant.types.resources.selectors.Size"/> <typedef name="type" - classname="org.apache.tools.ant.types.resources.selectors.Type" /> + classname="org.apache.tools.ant.types.resources.selectors.Type"/> <typedef name="writable" - classname="org.apache.tools.ant.types.selectors.WritableSelector" /> + classname="org.apache.tools.ant.types.selectors.WritableSelector"/> </antlib> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/antunit-base.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml index 30bb0ea..b51e105 100644 --- a/src/tests/antunit/antunit-base.xml +++ b/src/tests/antunit/antunit-base.xml @@ -49,8 +49,8 @@ <target name="antunit"> <antunit xmlns="antlib:org.apache.ant.antunit"> - <plainlistener /> - <file file="${ant.file}" xmlns="antlib:org.apache.tools.ant" /> + <plainlistener/> + <file file="${ant.file}" xmlns="antlib:org.apache.tools.ant"/> </antunit> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/bugfixes/br50866/br50866-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/bugfixes/br50866/br50866-test.xml b/src/tests/antunit/bugfixes/br50866/br50866-test.xml index 9e2d203..3e9ac95 100644 --- a/src/tests/antunit/bugfixes/br50866/br50866-test.xml +++ b/src/tests/antunit/bugfixes/br50866/br50866-test.xml @@ -1,8 +1,8 @@ <project name="br50866" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> - <include file="middle.xml" /> + <include file="middle.xml"/> <target name="testinclude" depends="middle.common,middle.middle"> <au:assertPropertyEquals name="prop-common-init" value="br50866"/> @@ -10,4 +10,4 @@ <au:assertPropertyEquals name="prop-middle" value="br50866"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/bugfixes/br50866/common.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/bugfixes/br50866/common.xml b/src/tests/antunit/bugfixes/br50866/common.xml index 7417c0d..c322db1 100644 --- a/src/tests/antunit/bugfixes/br50866/common.xml +++ b/src/tests/antunit/bugfixes/br50866/common.xml @@ -1,8 +1,8 @@ <project name="common" default="default"> <target name="common-init"> - <property name="prop-common-init" value="br50866" /> + <property name="prop-common-init" value="br50866"/> </target> <target name="common" depends="common-init"> - <property name="prop-common" value="br50866" /> + <property name="prop-common" value="br50866"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/bugfixes/br50866/middle.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/bugfixes/br50866/middle.xml b/src/tests/antunit/bugfixes/br50866/middle.xml index b387f93..1240050 100644 --- a/src/tests/antunit/bugfixes/br50866/middle.xml +++ b/src/tests/antunit/bugfixes/br50866/middle.xml @@ -1,7 +1,7 @@ <project name="middle" default="default"> - <import file="common.xml" optional="true" /> + <import file="common.xml" optional="true"/> <target name="middle" depends="common-init"> - <property name="prop-middle" value="br50866" /> + <property name="prop-middle" value="br50866"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml b/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml index d706b8f..97d0ec6 100644 --- a/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml +++ b/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml @@ -18,40 +18,40 @@ <project name="length-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="testnested"> <macrodef name="root-macro"> - <element name="sub-tasks" optional="false" /> + <element name="sub-tasks" optional="false"/> <sequential> <!-- do stuff --> - <sub-tasks /> + <sub-tasks/> </sequential> </macrodef> <macrodef name="used-macro-a"> - <element name="a-sub-tasks" optional="false" implicit="true" /> + <element name="a-sub-tasks" optional="false" implicit="true"/> <sequential> <root-macro> <sub-tasks> <!-- do stuff --> - <a-sub-tasks /> + <a-sub-tasks/> </sub-tasks> </root-macro> </sequential> </macrodef> <macrodef name="used-macro-b"> - <element name="b-sub-tasks" optional="false" implicit="true" /> + <element name="b-sub-tasks" optional="false" implicit="true"/> <sequential> <used-macro-a> <root-macro> <sub-tasks> <!-- do stuff --> - <b-sub-tasks /> + <b-sub-tasks/> </sub-tasks> </root-macro> </used-macro-a> @@ -59,7 +59,7 @@ </macrodef> <used-macro-b> - <echo message="Test B" /> + <echo message="Test B"/> </used-macro-b> <au:assertLogContains text="Test B"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/ant-attribute-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/ant-attribute-test.xml b/src/tests/antunit/core/ant-attribute-test.xml index 6f6dc51..d77e610 100644 --- a/src/tests/antunit/core/ant-attribute-test.xml +++ b/src/tests/antunit/core/ant-attribute-test.xml @@ -18,10 +18,9 @@ <project name="ant-attribute-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit" xmlns:if="ant:if" - xmlns:unless="ant:unless" - > + xmlns:unless="ant:unless"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="test-if-set"> <echo message="message1" if:set="not-set"/> @@ -67,7 +66,7 @@ <echo>hi</echo> </sequential> </macrodef> - <sayhi if:set="verbose" /> + <sayhi if:set="verbose"/> <au:assertLogContains text="hi"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/bindtargets-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/bindtargets-test.xml b/src/tests/antunit/core/bindtargets-test.xml index 0279a2c..7f57e02 100644 --- a/src/tests/antunit/core/bindtargets-test.xml +++ b/src/tests/antunit/core/bindtargets-test.xml @@ -20,16 +20,16 @@ <import file="../antunit-base.xml"/> <target name="bound"> - <property name="test-bound" value="ok" /> + <property name="test-bound" value="ok"/> </target> <target name="bound2"> - <property name="test-bound2" value="ok" /> + <property name="test-bound2" value="ok"/> </target> - <extension-point name="extension" /> + <extension-point name="extension"/> - <bindtargets targets="bound,bound2" extensionPoint="extension" /> + <bindtargets targets="bound,bound2" extensionPoint="extension"/> <target name="testBind" depends="extension"> <au:assertPropertyEquals name="test-bound" value="ok"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/dirscanner-symlinks-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/dirscanner-symlinks-test.xml b/src/tests/antunit/core/dirscanner-symlinks-test.xml index 0645946..a9ae66e 100644 --- a/src/tests/antunit/core/dirscanner-symlinks-test.xml +++ b/src/tests/antunit/core/dirscanner-symlinks-test.xml @@ -185,7 +185,7 @@ <mkdir dir="${input}/realdir"/> <touch file="${input}/realdir/file.txt"/> <symlink link="${base}" resource="${input}/realdir"/> - </target> + </target> <target name="-link-to-parent" if="unix"> <mkdir dir="${input}/B"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/extension-point-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/extension-point-test.xml b/src/tests/antunit/core/extension-point-test.xml index 95bac8b..3449e57 100644 --- a/src/tests/antunit/core/extension-point-test.xml +++ b/src/tests/antunit/core/extension-point-test.xml @@ -182,7 +182,7 @@ </project>]]></echo> <ant dir="${output}" target="bar"/> <au:assertLogContains level="warning" - text="can't add target bar to extension-point foo because the extension-point is unknown" /> + text="can't add target bar to extension-point foo because the extension-point is unknown"/> </target> <target name="testMissingExtensionPointIgnoredWhenConfigured"> @@ -193,7 +193,7 @@ </project>]]></echo> <ant dir="${output}" target="bar"/> <au:assertLogDoesntContain level="warning" - text="can't add target bar to extension-point foo because the extension-point is unknown" /> + text="can't add target bar to extension-point foo because the extension-point is unknown"/> </target> <target name="testOnlyAllowsExtensionPointMissingAttributeWhenExtensionOfPresent"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/extension/include-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/extension/include-test.xml b/src/tests/antunit/core/extension/include-test.xml index 4d3b674..57cec99 100644 --- a/src/tests/antunit/core/extension/include-test.xml +++ b/src/tests/antunit/core/extension/include-test.xml @@ -17,18 +17,18 @@ --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> <!-- declare a target that depends on the extension point --> - <target name="compile" depends="all.compile" /> + <target name="compile" depends="all.compile"/> <!-- declare our extension point --> - <extension-point name="all.compile" /> + <extension-point name="all.compile"/> <!-- import all our modules --> - <import file="module1.xml" as="module1" /> + <import file="module1.xml" as="module1"/> <target name="testImport" depends="compile"> - <au:assertLogContains text="In module1 compile. Yay!" /> + <au:assertLogContains text="In module1 compile. Yay!"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/location/location.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/location/location.xml b/src/tests/antunit/core/location/location.xml index bf37d9f..4be52d4 100644 --- a/src/tests/antunit/core/location/location.xml +++ b/src/tests/antunit/core/location/location.xml @@ -17,36 +17,36 @@ --> <project name="location-test" basedir="." default="all" xmlns:au="antlib:org.apache.ant.antunit"> - + <property name="ant.build.dir" location="../../../../../build"/> <property name="working.dir" location="${ant.build.dir}/antunit/location-dir"/> <property name="classes.dir" location="${working.dir}/classes"/> - + <target name="all"> <au:antunit> <fileset file="${ant.file}"/> <au:plainlistener/> </au:antunit> </target> - + <target name="setUp"> <mkdir dir="${classes.dir}"/> <javac srcdir="src" destdir="${classes.dir}" debug="yes"/> <taskdef name="echo-location" classname="task.EchoLocation" classpath="${classes.dir}"/> </target> - + <target name="define"> <taskdef name="echoloc" classname="task.EchoLocation"> <classpath> - <pathelement location="${classes.dir}" /> + <pathelement location="${classes.dir}"/> <pathelement path="${java.class.path}"/> </classpath> </taskdef> </target> - + <target name="macrodef" depends="define"> <macrodef name="echoloc2" backtrace="false"> <sequential> @@ -54,40 +54,40 @@ </sequential> </macrodef> </target> - + <target name="presetdef" depends="define"> <presetdef name="echoloc3"> <echoloc/> </presetdef> </target> - + <target name="tearDown"> <delete dir="${working.dir}"/> </target> - + <target name="test-plain-task"> <echo id="echo">Hello</echo> <au:assertLogContains text="Hello"/> </target> - + <target name="test-standalone-type"> <!-- TODO --> </target> - + <target name="test-condition-task"> <!-- TODO --> </target> - + <target name="test-macrodef-wrapped-task" depends="macrodef"> <echo id="echo3">Hello</echo> <echoloc2/> <au:assertLogContains text="Line: "/> </target> - + <target name="test-presetdef-wrapped-task" depends="presetdef"> <echo id="echo4">Hello</echo> <echoloc3/> <au:assertLogContains text="Line: "/> </target> - + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/magic-names-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/magic-names-test.xml b/src/tests/antunit/core/magic-names-test.xml index 54662da..461adfe 100644 --- a/src/tests/antunit/core/magic-names-test.xml +++ b/src/tests/antunit/core/magic-names-test.xml @@ -19,7 +19,7 @@ name="magicnames-test" default="antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> <target name="default target"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/nested-elements-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/nested-elements-test.xml b/src/tests/antunit/core/nested-elements-test.xml index e031c41..982d646 100644 --- a/src/tests/antunit/core/nested-elements-test.xml +++ b/src/tests/antunit/core/nested-elements-test.xml @@ -35,7 +35,7 @@ public class ConditionRun extends ConditionBase implements TaskContainer { } public void execute() { - for (Iterator iter = tasks.iterator(); iter.hasNext(); ) { + for (Iterator iter = tasks.iterator(); iter.hasNext();) { Task t = (Task) iter.next(); t.perform(); } @@ -67,7 +67,7 @@ public class Dynamic implements TaskContainer, DynamicElement { } public void execute() { - for (Iterator iter = tasks.iterator(); iter.hasNext(); ) { + for (Iterator iter = tasks.iterator(); iter.hasNext();) { Task t = (Task) iter.next(); t.perform(); } @@ -102,7 +102,7 @@ public class Dynamic implements TaskContainer, DynamicElementNS { } public void execute() { - for (Iterator iter = tasks.iterator(); iter.hasNext(); ) { + for (Iterator iter = tasks.iterator(); iter.hasNext();) { Task t = (Task) iter.next(); t.perform(); } http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/nested-text-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/nested-text-test.xml b/src/tests/antunit/core/nested-text-test.xml index 05fb4c8..5d7e566 100644 --- a/src/tests/antunit/core/nested-text-test.xml +++ b/src/tests/antunit/core/nested-text-test.xml @@ -24,7 +24,7 @@ </target> <target name="testRejectNested"> - <typedef name="object" classname="java.lang.Object" /> + <typedef name="object" classname="java.lang.Object"/> <au:expectfailure expectedMessage="The <object> type doesn't support nested text data ("foo")."> <object>foo</object> </au:expectfailure> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers-test.xml b/src/tests/antunit/core/projecthelpers-test.xml index 9e9000d..fde19c5 100644 --- a/src/tests/antunit/core/projecthelpers-test.xml +++ b/src/tests/antunit/core/projecthelpers-test.xml @@ -72,15 +72,15 @@ </target> <target name="testCrossTargets" depends="defineHelpers"> - <ant antfile="projecthelpers/build-cross-targets.xml" /> + <ant antfile="projecthelpers/build-cross-targets.xml"/> </target> <target name="testManyImport" depends="defineHelpers"> - <ant antfile="projecthelpers/build-many-import.xml" /> + <ant antfile="projecthelpers/build-many-import.xml"/> </target> <target name="testCrossExtension" depends="defineHelpers"> - <ant antfile="projecthelpers/build-cross-extension.xml" /> + <ant antfile="projecthelpers/build-cross-extension.xml"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml b/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml index 67837a0..64dd18b 100644 --- a/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml +++ b/src/tests/antunit/core/projecthelpers/build-cross-extension-ref.xml @@ -16,11 +16,11 @@ limitations under the License. --> <project> - <extension-point name="extension-ref" /> + <extension-point name="extension-ref"/> <target name="setbar" extensionOf="extension"> - <property name="bar" value="hello" /> + <property name="bar" value="hello"/> </target> <target name="setfoo" depends="init,extension-ref"> - <property name="foo" value="hello" /> + <property name="foo" value="hello"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-cross-extension.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-cross-extension.xml b/src/tests/antunit/core/projecthelpers/build-cross-extension.xml index f8f1220..77b4c77 100644 --- a/src/tests/antunit/core/projecthelpers/build-cross-extension.xml +++ b/src/tests/antunit/core/projecthelpers/build-cross-extension.xml @@ -16,21 +16,21 @@ limitations under the License. --> <project default="end" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="build-cross-extension-ref.xmlref" /> + <import file="build-cross-extension-ref.xmlref"/> <target name="init"> - <property name="start" value="true" /> + <property name="start" value="true"/> </target> <target name="setprop" extensionOf="extension-ref"> - <property name="prop" value="ok" /> + <property name="prop" value="ok"/> </target> - <extension-point name="extension" /> + <extension-point name="extension"/> <target name="end" depends="setfoo,extension"> - <au:assertPropertyEquals name="start" value="true" /> - <au:assertPropertyEquals name="foo" value="hello" /> - <au:assertPropertyEquals name="bar" value="hello" /> - <au:assertPropertyEquals name="prop" value="ok" /> + <au:assertPropertyEquals name="start" value="true"/> + <au:assertPropertyEquals name="foo" value="hello"/> + <au:assertPropertyEquals name="bar" value="hello"/> + <au:assertPropertyEquals name="prop" value="ok"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml b/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml index c16d989..ba7b849 100644 --- a/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml +++ b/src/tests/antunit/core/projecthelpers/build-cross-targets-ref.xml @@ -17,6 +17,6 @@ --> <project> <target name="setfoo" depends="init"> - <property name="foo" value="hello" /> + <property name="foo" value="hello"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-cross-targets.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-cross-targets.xml b/src/tests/antunit/core/projecthelpers/build-cross-targets.xml index c4c7ca7..ad87c7a 100644 --- a/src/tests/antunit/core/projecthelpers/build-cross-targets.xml +++ b/src/tests/antunit/core/projecthelpers/build-cross-targets.xml @@ -16,12 +16,12 @@ limitations under the License. --> <project default="end" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="build-cross-targets-ref.xmlref" /> + <import file="build-cross-targets-ref.xmlref"/> <target name="init"> - <property name="start" value="true" /> + <property name="start" value="true"/> </target> <target name="end" depends="setfoo"> - <au:assertPropertyEquals name="start" value="true" /> - <au:assertPropertyEquals name="foo" value="hello" /> + <au:assertPropertyEquals name="start" value="true"/> + <au:assertPropertyEquals name="foo" value="hello"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-many-import-common.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-many-import-common.xml b/src/tests/antunit/core/projecthelpers/build-many-import-common.xml index 243de8c..1acbce0 100644 --- a/src/tests/antunit/core/projecthelpers/build-many-import-common.xml +++ b/src/tests/antunit/core/projecthelpers/build-many-import-common.xml @@ -18,6 +18,6 @@ <project> <!-- build file imported by every other build --> <target name="common" depends="init"> - <property name="common" value="ok" /> + <property name="common" value="ok"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml b/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml index 38b50ad..0808884 100644 --- a/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml +++ b/src/tests/antunit/core/projecthelpers/build-many-import-commonref.xml @@ -18,6 +18,6 @@ <project> <!-- build file imported by bot referenced build --> <target name="commonref" depends="init"> - <property name="commonref" value="ok" /> + <property name="commonref" value="ok"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml b/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml index c9c02fe..6660663 100644 --- a/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml +++ b/src/tests/antunit/core/projecthelpers/build-many-import-ref.xml @@ -16,9 +16,9 @@ limitations under the License. --> <project> - <import file="build-many-import-common.xml" /> - <import file="build-many-import-commonref.xml" /> + <import file="build-many-import-common.xml"/> + <import file="build-many-import-commonref.xml"/> <target name="setfoo" depends="init"> - <property name="foo" value="hello" /> + <property name="foo" value="hello"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-many-import.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-many-import.xml b/src/tests/antunit/core/projecthelpers/build-many-import.xml index 792fb56..0dc7d22 100644 --- a/src/tests/antunit/core/projecthelpers/build-many-import.xml +++ b/src/tests/antunit/core/projecthelpers/build-many-import.xml @@ -16,17 +16,17 @@ limitations under the License. --> <project default="end" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="build-many-import-ref.xmlref" /> - <import file="build-many-import2-ref.xmlref" /> - <import file="build-many-import-common.xml" /> + <import file="build-many-import-ref.xmlref"/> + <import file="build-many-import2-ref.xmlref"/> + <import file="build-many-import-common.xml"/> <target name="init"> - <property name="start" value="true" /> + <property name="start" value="true"/> </target> <target name="end" depends="setfoo,setbar,common,commonref"> - <au:assertPropertyEquals name="start" value="true" /> - <au:assertPropertyEquals name="foo" value="hello" /> - <au:assertPropertyEquals name="bar" value="hello" /> - <au:assertPropertyEquals name="common" value="ok" /> - <au:assertPropertyEquals name="commonref" value="ok" /> + <au:assertPropertyEquals name="start" value="true"/> + <au:assertPropertyEquals name="foo" value="hello"/> + <au:assertPropertyEquals name="bar" value="hello"/> + <au:assertPropertyEquals name="common" value="ok"/> + <au:assertPropertyEquals name="commonref" value="ok"/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml b/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml index d32cf17..ac3e8e9 100644 --- a/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml +++ b/src/tests/antunit/core/projecthelpers/build-many-import2-ref.xml @@ -16,10 +16,10 @@ limitations under the License. --> <project> - <import file="build-many-import-ref.xmlref" /> - <import file="build-many-import-common.xml" /> - <import file="build-many-import-commonref.xml" /> + <import file="build-many-import-ref.xmlref"/> + <import file="build-many-import-common.xml"/> + <import file="build-many-import-commonref.xml"/> <target name="setbar" depends="init,common"> - <property name="bar" value="hello" /> + <property name="bar" value="hello"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/core/ref-psyntax-hint-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/core/ref-psyntax-hint-test.xml b/src/tests/antunit/core/ref-psyntax-hint-test.xml index de32411..25a4a47 100644 --- a/src/tests/antunit/core/ref-psyntax-hint-test.xml +++ b/src/tests/antunit/core/ref-psyntax-hint-test.xml @@ -20,9 +20,9 @@ <target name="testIt"> <au:expectfailure> - <pathconvert refid="${foo}" /> + <pathconvert refid="${foo}"/> </au:expectfailure> <au:assertLogContains level="warning" - text="Unresolvable reference $${foo} might be a misuse of property expansion syntax." /> + text="Unresolvable reference $${foo} might be a misuse of property expansion syntax."/> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/filters/expandproperties-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/filters/expandproperties-test.xml b/src/tests/antunit/filters/expandproperties-test.xml index 5dff832..6dcad87 100644 --- a/src/tests/antunit/filters/expandproperties-test.xml +++ b/src/tests/antunit/filters/expandproperties-test.xml @@ -16,20 +16,20 @@ limitations under the License. --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../antunit-base.xml" /> + <import file="../antunit-base.xml"/> - <property name="foo" value="FOO" /> - <property name="bar" value="BAR" /> - <property name="baz" value="BAZ" /> + <property name="foo" value="FOO"/> + <property name="bar" value="BAR"/> + <property name="baz" value="BAZ"/> <target name="testClassic"> <au:assertTrue> <resourcesmatch> - <string value="FOO BAR BAZ" /> + <string value="FOO BAR BAZ"/> <concat> - <string value="$${foo} $${bar} $${baz}" /> + <string value="$${foo} $${bar} $${baz}"/> <filterchain> - <expandproperties /> + <expandproperties/> </filterchain> </concat> </resourcesmatch> @@ -39,14 +39,14 @@ <target name="testSubset"> <au:assertTrue> <resourcesmatch> - <string value="FOO $${bar} BAZ" /> + <string value="FOO $${bar} BAZ"/> <concat> - <string value="$${foo} $${bar} $${baz}" /> + <string value="$${foo} $${bar} $${baz}"/> <filterchain> <expandproperties> <propertyset> - <propertyref name="foo" /> - <propertyref name="baz" /> + <propertyref name="foo"/> + <propertyref name="baz"/> </propertyset> </expandproperties> </filterchain> @@ -58,14 +58,14 @@ <target name="testMappedPropertySet"> <au:assertTrue> <resourcesmatch> - <string value="FOO BAR BAZ" /> + <string value="FOO BAR BAZ"/> <concat> - <string value="$${food} $${bard} $${bazd}" /> + <string value="$${food} $${bard} $${bazd}"/> <filterchain> <expandproperties> <propertyset> - <propertyref builtin="all" /> - <globmapper from="*" to="*d" /> + <propertyref builtin="all"/> + <globmapper from="*" to="*d"/> </propertyset> </expandproperties> </filterchain> @@ -78,11 +78,11 @@ description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53626";> <au:assertTrue> <resourcesmatch> - <string value="" /> + <string value=""/> <concat> - <string value="" /> + <string value=""/> <filterchain> - <expandproperties /> + <expandproperties/> </filterchain> </concat> </resourcesmatch> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/filters/native2ascii-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/filters/native2ascii-test.xml b/src/tests/antunit/filters/native2ascii-test.xml index 26fa0c7..0aee144 100644 --- a/src/tests/antunit/filters/native2ascii-test.xml +++ b/src/tests/antunit/filters/native2ascii-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="testForward"> <au:assertTrue> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/filters/replacetokens-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/filters/replacetokens-test.xml b/src/tests/antunit/filters/replacetokens-test.xml index c1f98ab..1707542 100644 --- a/src/tests/antunit/filters/replacetokens-test.xml +++ b/src/tests/antunit/filters/replacetokens-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"/> <import file="../propertyhelpers.xml" as="ph"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/filters/sort-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/filters/sort-test.xml b/src/tests/antunit/filters/sort-test.xml index 8c2a88b..dbd147a 100644 --- a/src/tests/antunit/filters/sort-test.xml +++ b/src/tests/antunit/filters/sort-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}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/filters/striplinecomments-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/filters/striplinecomments-test.xml b/src/tests/antunit/filters/striplinecomments-test.xml index 2af0f01..d184c37 100644 --- a/src/tests/antunit/filters/striplinecomments-test.xml +++ b/src/tests/antunit/filters/striplinecomments-test.xml @@ -16,9 +16,9 @@ limitations under the License. --> <project 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="br" value="${line.separator}"/> <string id="input">foo #pound @@ -29,19 +29,19 @@ REMark </string> <macrodef name="test"> - <attribute name="lines" /> - <element name="comments" implicit="true" /> + <attribute name="lines"/> + <element name="comments" implicit="true"/> <sequential> <au:assertTrue> <resourcecount count="@{lines}"> <tokens> <concat> - <resource refid="input" /> + <resource refid="input"/> <filterchain> <striplinecomments> - <comments /> + <comments/> </striplinecomments> - <ignoreblank /> + <ignoreblank/> </filterchain> </concat> </tokens> @@ -52,15 +52,15 @@ REMark <target name="testBasic"> <test lines="5"> - <comment value="#" /> + <comment value="#"/> </test> </target> <target name="testMultiple"> <test lines="3"> - <comment value="#" /> - <comment value="//" /> - <comment value="REM" /> + <comment value="#"/> + <comment value="//"/> + <comment value="REM"/> </test> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/filters/suffix-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/filters/suffix-test.xml b/src/tests/antunit/filters/suffix-test.xml index a0a9403..266e4c6 100644 --- a/src/tests/antunit/filters/suffix-test.xml +++ b/src/tests/antunit/filters/suffix-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="${input}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/filters/uniq-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/filters/uniq-test.xml b/src/tests/antunit/filters/uniq-test.xml index 832ec94..12c2590 100644 --- a/src/tests/antunit/filters/uniq-test.xml +++ b/src/tests/antunit/filters/uniq-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}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/junit-noframes.xsl ---------------------------------------------------------------------- diff --git a/src/tests/antunit/junit-noframes.xsl b/src/tests/antunit/junit-noframes.xsl index 255046a..272c8c9 100644 --- a/src/tests/antunit/junit-noframes.xsl +++ b/src/tests/antunit/junit-noframes.xsl @@ -3,8 +3,8 @@ xmlns:lxslt="http://xml.apache.org/xslt"; xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"> <xsl:output method="html" indent="yes" encoding="US-ASCII" - doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" /> -<xsl:decimal-format decimal-separator="." grouping-separator="," /> + doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/> +<xsl:decimal-format decimal-separator="." grouping-separator=","/> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/ant-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/ant-test.xml b/src/tests/antunit/taskdefs/ant-test.xml index c3ee56b..908a738 100644 --- a/src/tests/antunit/taskdefs/ant-test.xml +++ b/src/tests/antunit/taskdefs/ant-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="testLastPropertyWins"> <ant antfile="antcall-test.xml" target="checkB"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/antcall-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/antcall-test.xml b/src/tests/antunit/taskdefs/antcall-test.xml index 9767185..6eef71b 100644 --- a/src/tests/antunit/taskdefs/antcall-test.xml +++ b/src/tests/antunit/taskdefs/antcall-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="checkB"> <au:assertPropertyEquals name="b" value="${expected}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/augment-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/augment-test.xml b/src/tests/antunit/taskdefs/augment-test.xml index 2e6f335..656dbc2 100644 --- a/src/tests/antunit/taskdefs/augment-test.xml +++ b/src/tests/antunit/taskdefs/augment-test.xml @@ -19,54 +19,54 @@ <import file="../antunit-base.xml"/> <target name="setUp"> - <mkdir dir="${input}" /> + <mkdir dir="${input}"/> <touch> - <filelist id="filelist" dir="${input}" files="foo,bar,baz" /> + <filelist id="filelist" dir="${input}" files="foo,bar,baz"/> </touch> - <fileset id="input-fs" dir="${input}" /> + <fileset id="input-fs" dir="${input}"/> <au:assertTrue> - <resourcecount refid="input-fs" count="3" /> + <resourcecount refid="input-fs" count="3"/> </au:assertTrue> </target> <target name="test-augment-attribute" depends="setUp"> - <augment id="input-fs" excludes="foo" /> + <augment id="input-fs" excludes="foo"/> <au:assertTrue> - <resourcecount refid="input-fs" count="2" /> + <resourcecount refid="input-fs" count="2"/> </au:assertTrue> </target> <target name="test-augment-element" depends="setUp"> <augment id="input-fs"> - <filename name="bar" /> + <filename name="bar"/> </augment> <au:assertTrue> - <resourcecount refid="input-fs" count="1" /> + <resourcecount refid="input-fs" count="1"/> </au:assertTrue> </target> <target name="test-noref"> <au:expectfailure expectedMessage="Unknown reference "nosuchreference""> - <augment id="nosuchreference" /> + <augment id="nosuchreference"/> </au:expectfailure> </target> <target name="test-id-not-set"> <au:expectfailure expectedMessage="augment attribute 'id' unset"> - <augment foo="bar" /> + <augment foo="bar"/> </au:expectfailure> </target> <target name="test-illegal-attribute" depends="setUp"> <au:expectfailure expectedMessage="augmented reference "input-fs" doesn't support the "filesetwillmostlikelyneversupportthisattribute" attribute"> - <augment id="input-fs" filesetwillmostlikelyneversupportthisattribute="blah" /> + <augment id="input-fs" filesetwillmostlikelyneversupportthisattribute="blah"/> </au:expectfailure> </target> <target name="test-illegal-element" depends="setUp"> <au:expectfailure expectedMessage="augmented reference "input-fs" doesn't support the nested "filesetwillmostlikelyneversupportthiselement" element"> <augment id="input-fs"> - <filesetwillmostlikelyneversupportthiselement /> + <filesetwillmostlikelyneversupportthiselement/> </augment> </au:expectfailure> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/bunzip2-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/bunzip2-test.xml b/src/tests/antunit/taskdefs/bunzip2-test.xml index fcf05d9..21306c9 100644 --- a/src/tests/antunit/taskdefs/bunzip2-test.xml +++ b/src/tests/antunit/taskdefs/bunzip2-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}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/checksum-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/checksum-test.xml b/src/tests/antunit/taskdefs/checksum-test.xml index 8341f42..229aa1d 100644 --- a/src/tests/antunit/taskdefs/checksum-test.xml +++ b/src/tests/antunit/taskdefs/checksum-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="testChecksumConditionWithFileSet"> <mkdir dir="${output}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml b/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml index 49519bd..c53ad24 100644 --- a/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml +++ b/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml @@ -16,7 +16,7 @@ limitations under the License. --> <project xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> <target name="testCommandLauncherTask"> <echo message="${input}"/> @@ -61,7 +61,7 @@ public class MyJavaExecutable { srcdir="${input}"/> <typedef name="my-command-launcher" - classname="MyCommandLauncher" classpath="${output}"/> + classname="MyCommandLauncher" classpath="${output}"/> <commandlauncher vmlauncher="true"> <my-command-launcher/> @@ -83,5 +83,5 @@ public class MyJavaExecutable { <au:assertLogContains text="Hello World From CommandLauncher"/> </target> - + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/concat-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/concat-test.xml b/src/tests/antunit/taskdefs/concat-test.xml index 4b285e3..18c5fd9 100644 --- a/src/tests/antunit/taskdefs/concat-test.xml +++ b/src/tests/antunit/taskdefs/concat-test.xml @@ -16,53 +16,53 @@ 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="tearDown" depends="antunit-base.tearDown"> - <delete file="concat.resources" /> + <delete file="concat.resources"/> </target> - <property name="encodeStringDest" location="${output}/encodeStringDest" /> + <property name="encodeStringDest" location="${output}/encodeStringDest"/> <target name="testBinaryAppend"> - <property name="binaryAppendDest" location="${output}/binaryAppendDest" /> - <mkdir dir="${output}" /> + <property name="binaryAppendDest" location="${output}/binaryAppendDest"/> + <mkdir dir="${output}"/> <au:assertTrue message="prerequisite conditions unmet"> <length length="0"> <!-- allow for nonexistent OR zero-length: --> - <fileset file="${binaryAppendDest}" /> + <fileset file="${binaryAppendDest}"/> </length> </au:assertTrue> <echo file="${binaryAppendDest}">x</echo> <au:assertTrue message="destfile setup failed"> - <length length="1" file="${binaryAppendDest}" /> + <length length="1" file="${binaryAppendDest}"/> </au:assertTrue> <concat append="true" destfile="${binaryAppendDest}" binary="true"> - <string value="x" /> + <string value="x"/> </concat> <au:assertTrue message="expected length 2"> - <length file="${binaryAppendDest}" length="2" /> + <length file="${binaryAppendDest}" length="2"/> </au:assertTrue> </target> <target name="testStringEncoding" if="os.unix"> - <property name="br" value="${line.separator}" /> + <property name="br" value="${line.separator}"/> <concat destfile="${encodeStringDest}" outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat> <au:assertTrue> <resourcesmatch astext="true"> - <file file="utf-16.expected" /> - <file file="${encodeStringDest}" /> + <file file="utf-16.expected"/> + <file file="${encodeStringDest}"/> </resourcesmatch> </au:assertTrue> </target> <target name="testStringEncodingWindows" if="os.windows"> - <property name="br" value="${line.separator}" /> + <property name="br" value="${line.separator}"/> <concat destfile="${encodeStringDest}" outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat> <au:assertTrue> <resourcesmatch astext="true"> - <file file="utf-16.expected.windows" /> - <file file="${encodeStringDest}" /> + <file file="utf-16.expected.windows"/> + <file file="${encodeStringDest}"/> </resourcesmatch> </au:assertTrue> </target> @@ -119,45 +119,45 @@ </target> <target name="testIgnoreEmptyFalseFileIsCreated"> - <mkdir dir="${input}" /> - <mkdir dir="${output}" /> + <mkdir dir="${input}"/> + <mkdir dir="${output}"/> <concat destfile="${output}/TESTDEST" append="true" ignoreEmpty="false"> - <filelist dir="${input}" files="thisfiledoesnotexist" /> + <filelist dir="${input}" files="thisfiledoesnotexist"/> </concat> - <au:assertFileExists file="${output}/TESTDEST" /> + <au:assertFileExists file="${output}/TESTDEST"/> </target> <target name="testIgnoreEmptyTrueFileIsNotCreated"> - <mkdir dir="${input}" /> - <mkdir dir="${output}" /> + <mkdir dir="${input}"/> + <mkdir dir="${output}"/> <concat destfile="${output}/TESTDEST" append="true" ignoreEmpty="true"> - <filelist dir="${input}" files="thisfiledoesnotexist" /> + <filelist dir="${input}" files="thisfiledoesnotexist"/> </concat> - <au:assertFileDoesntExist file="${output}/TESTDEST" /> + <au:assertFileDoesntExist file="${output}/TESTDEST"/> </target> <target name="testIgnoreEmptyFalseFileIsCreatedIncludesHeader"> - <mkdir dir="${input}" /> - <mkdir dir="${output}" /> + <mkdir dir="${input}"/> + <mkdir dir="${output}"/> <concat destfile="${output}/TESTDEST" ignoreEmpty="false"> - <filelist dir="${input}" files="thisfiledoesnotexist" /> + <filelist dir="${input}" files="thisfiledoesnotexist"/> <header filtering="false" trim="yes"> header </header> </concat> - <au:assertFileExists file="${output}/TESTDEST" /> - <au:assertResourceContains resource="${output}/TESTDEST" value="header" /> + <au:assertFileExists file="${output}/TESTDEST"/> + <au:assertResourceContains resource="${output}/TESTDEST" value="header"/> </target> <target name="testIgnoreEmptyFalseFileIsCreatedIncludesFooter"> - <mkdir dir="${input}" /> - <mkdir dir="${output}" /> + <mkdir dir="${input}"/> + <mkdir dir="${output}"/> <concat destfile="${output}/TESTDEST" ignoreEmpty="false"> - <filelist dir="${input}" files="thisfiledoesnotexist" /> + <filelist dir="${input}" files="thisfiledoesnotexist"/> <footer filtering="no">footer</footer> </concat> - <au:assertFileExists file="${output}/TESTDEST" /> - <au:assertResourceContains resource="${output}/TESTDEST" value="footer" /> + <au:assertFileExists file="${output}/TESTDEST"/> + <au:assertResourceContains resource="${output}/TESTDEST" value="footer"/> </target> <target name="testResources"> @@ -165,24 +165,24 @@ <string id="s2">Jumped Over The Lazy Dog.</string> <concat destfile="concat.resources" binary="true"> - <resource refid="s1" /> - <resource refid="s2" /> + <resource refid="s1"/> + <resource refid="s2"/> </concat> <length property="expected"> <resources> - <resource refid="s1" /> - <resource refid="s2" /> + <resource refid="s1"/> + <resource refid="s2"/> </resources> </length> <length property="actual"> - <file file="concat.resources" /> + <file file="concat.resources"/> </length> <fail> <condition> <or> - <equals arg1="${actual}" arg2="0" /> + <equals arg1="${actual}" arg2="0"/> <not> - <equals arg1="${actual}" arg2="${expected}" /> + <equals arg1="${actual}" arg2="${expected}"/> </not> </or> </condition> @@ -191,11 +191,11 @@ <target name="testBug48816"> <concat> - <resources id="48816" /> - <string value="x" /> + <resources id="48816"/> + <string value="x"/> </concat> <au:assertTrue> - <resourcecount refid="48816" count="0" /> + <resourcecount refid="48816" count="0"/> </au:assertTrue> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/condition/antversion-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/condition/antversion-test.xml b/src/tests/antunit/taskdefs/condition/antversion-test.xml index 89c2d7e..8090c39 100644 --- a/src/tests/antunit/taskdefs/condition/antversion-test.xml +++ b/src/tests/antunit/taskdefs/condition/antversion-test.xml @@ -20,50 +20,50 @@ <target name="test-atleast"> <au:assertTrue message="Expected antversion of ${ant.version} to be at least 1.7.0"> <!-- AntVersion was introduced like AntUnit in 1.7 - so this must be true --> - <antversion atleast="1.7.0" /> + <antversion atleast="1.7.0"/> </au:assertTrue> </target> <target name="test-exactly"> - <antversion property="ant.actual.version" /> + <antversion property="ant.actual.version"/> <au:assertTrue message="Expected antversion of ${ant.actual.version}"> - <antversion exactly="${ant.actual.version}" /> + <antversion exactly="${ant.actual.version}"/> </au:assertTrue> </target> <target name="test-atleast-fail"> - <property name="version" value="1.8.9" /> + <property name="version" value="1.8.9"/> <au:assertFalse> - <antversion atleast="1.1000.0" /> + <antversion atleast="1.1000.0"/> </au:assertFalse> </target> <target name="test-task"> - <antversion property="antversion" /> - <au:assertPropertySet name="antversion" message="Property 'antversion' should be set." /> + <antversion property="antversion"/> + <au:assertPropertySet name="antversion" message="Property 'antversion' should be set."/> <echo>AntVersion=${antversion}</echo> </target> <target name="test-property-conditional1"> - <antversion property="antversion" atleast="2.0.0" /> + <antversion property="antversion" atleast="2.0.0"/> <au:assertTrue message="Property 'antversion' should not be set because this is not Ant 2.0.0+."> <not> - <isset property="antversion" /> + <isset property="antversion"/> </not> </au:assertTrue> </target> <target name="test-property-conditional2"> - <antversion property="antversion" atleast="1.7.0" /> + <antversion property="antversion" atleast="1.7.0"/> <au:assertTrue message="Property 'antversion' should be set because we should have Ant 1.7.0+ (${ant.version})."> - <isset property="antversion" /> + <isset property="antversion"/> </au:assertTrue> </target> <target name="all"> <au:antunit> - <fileset file="${ant.file}" /> - <au:plainlistener /> + <fileset file="${ant.file}"/> + <au:plainlistener/> </au:antunit> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/condition/equals-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/condition/equals-test.xml b/src/tests/antunit/taskdefs/condition/equals-test.xml index 8888d39..10bf357 100644 --- a/src/tests/antunit/taskdefs/condition/equals-test.xml +++ b/src/tests/antunit/taskdefs/condition/equals-test.xml @@ -18,62 +18,62 @@ <project name="equals-test" xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> <target name="test-noforcestring"> - <string id="s" value="foo" /> + <string id="s" value="foo"/> <au:assertFalse> - <equals arg1="foo" arg2="${ant.refid:s}" /> + <equals arg1="foo" arg2="${ant.refid:s}"/> </au:assertFalse> </target> <target name="test-forcestring"> - <string id="s" value="foo" /> + <string id="s" value="foo"/> <au:assertTrue> - <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" /> + <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true"/> </au:assertTrue> </target> <target name="test-forcestring-notrim"> - <string id="s" value=" foo " /> + <string id="s" value=" foo "/> <au:assertFalse> - <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" /> + <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true"/> </au:assertFalse> </target> <target name="test-forcestring-trim"> - <string id="s" value=" foo " /> + <string id="s" value=" foo "/> <au:assertTrue> - <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" trim="true" /> + <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" trim="true"/> </au:assertTrue> </target> <target name="test-forcestring-cs"> - <string id="s" value="Foo" /> + <string id="s" value="Foo"/> <au:assertFalse> - <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" /> + <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true"/> </au:assertFalse> </target> <target name="test-forcestring-nocs"> - <string id="s" value="Foo" /> + <string id="s" value="Foo"/> <au:assertTrue> - <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" casesensitive="false" /> + <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" casesensitive="false"/> </au:assertTrue> </target> <target name="test-forcestring-trim-cs"> - <string id="s" value=" Foo " /> + <string id="s" value=" Foo "/> <au:assertFalse> - <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" trim="true" /> + <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" trim="true"/> </au:assertFalse> </target> <target name="test-forcestring-trim-nocs"> - <string id="s" value=" Foo " /> + <string id="s" value=" Foo "/> <au:assertTrue> <equals arg1="foo" arg2="${ant.refid:s}" forcestring="true" - trim="true" casesensitive="false" /> + trim="true" casesensitive="false"/> </au:assertTrue> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/condition/filesmatch-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/condition/filesmatch-test.xml b/src/tests/antunit/taskdefs/condition/filesmatch-test.xml index 67e7c00..ac6c8f9 100644 --- a/src/tests/antunit/taskdefs/condition/filesmatch-test.xml +++ b/src/tests/antunit/taskdefs/condition/filesmatch-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="${input}"/> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml b/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml index 01f1809..a8ed4eb 100644 --- a/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml +++ b/src/tests/antunit/taskdefs/condition/hasfreespace-test.xml @@ -17,41 +17,41 @@ --> <project name="hasfreespace-test" default="all" basedir="." xmlns:au="antlib:org.apache.ant.antunit"> - <available property="jdk6.available" classname="java.util.ServiceLoader" /> + <available property="jdk6.available" classname="java.util.ServiceLoader"/> - <property name="partition" value="${user.home}" /> + <property name="partition" value="${user.home}"/> <target name="test-not-enough-space-human" if="jdk6.available"> <au:assertFalse> - <hasfreespace partition="${partition}" needed="1P" /> + <hasfreespace partition="${partition}" needed="1P"/> </au:assertFalse> </target> <target name="test-enough-space-human" if="jdk6.available"> <au:assertTrue> - <hasfreespace partition="${partition}" needed="1K" /> + <hasfreespace partition="${partition}" needed="1K"/> </au:assertTrue> </target> <target name="test-not-enough-space" if="jdk6.available"> - <property name="long.max-value" value="9223372036854775807" /> + <property name="long.max-value" value="9223372036854775807"/> <au:assertFalse> - <hasfreespace partition="${partition}" needed="${long.max-value}" /> + <hasfreespace partition="${partition}" needed="${long.max-value}"/> </au:assertFalse> </target> <target name="test-enough-space" if="jdk6.available"> <au:assertTrue> - <hasfreespace partition="${partition}" needed="1" /> + <hasfreespace partition="${partition}" needed="1"/> </au:assertTrue> </target> <target name="all"> <au:antunit> - <fileset file="${ant.file}" /> - <au:plainlistener /> + <fileset file="${ant.file}"/> + <au:plainlistener/> </au:antunit> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/condition/hasmethod-text.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/condition/hasmethod-text.xml b/src/tests/antunit/taskdefs/condition/hasmethod-text.xml index 9ae9b32..cf6afd6 100644 --- a/src/tests/antunit/taskdefs/condition/hasmethod-text.xml +++ b/src/tests/antunit/taskdefs/condition/hasmethod-text.xml @@ -18,7 +18,7 @@ <project name="equals-test" xmlns:au="antlib:org.apache.ant.antunit" default="antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> <target name="test-missingclass"> <au:expectfailure http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/condition/javaversion-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/condition/javaversion-test.xml b/src/tests/antunit/taskdefs/condition/javaversion-test.xml index 5f15a1e..2a41612 100644 --- a/src/tests/antunit/taskdefs/condition/javaversion-test.xml +++ b/src/tests/antunit/taskdefs/condition/javaversion-test.xml @@ -16,24 +16,24 @@ limitations under the License. --> <project name="javaversion-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit"> - <import file="../../antunit-base.xml" /> + <import file="../../antunit-base.xml"/> <target name="test-atleast"> <au:assertTrue message="Expected javaversion of ${ant.version} to be at least 1.7.0"> <!-- Ant 1.9.x requires Java5 at runtime - so this must be true --> - <javaversion atleast="1.5" /> + <javaversion atleast="1.5"/> </au:assertTrue> </target> <target name="test-exactly"> <au:assertTrue message="Expected javaversion of ${ant.java.version}"> - <javaversion exactly="${ant.java.version}" /> + <javaversion exactly="${ant.java.version}"/> </au:assertTrue> </target> <target name="test-atleast-fail"> <au:assertFalse> - <javaversion atleast="1000.0" /> + <javaversion atleast="1000.0"/> </au:assertFalse> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml b/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml index 11c6a9e..0c946ea 100644 --- a/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml +++ b/src/tests/antunit/taskdefs/condition/resourcecontains-test.xml @@ -48,15 +48,15 @@ <target name="testContainsEmptyString"> <au:assertTrue message="Should have found the text in the resource"> - <resourcecontains resource="${file}" substring="" /> + <resourcecontains resource="${file}" substring=""/> </au:assertTrue> </target> <target name="testContainsEmptyProperty"> - <property name="testContainsEmptyProperty" value="" /> + <property name="testContainsEmptyProperty" value=""/> <au:assertTrue message="Should have found the text in the resource"> <resourcecontains resource="${file}" - substring="${testContainsEmptyProperty}" /> + substring="${testContainsEmptyProperty}"/> </au:assertTrue> </target> @@ -81,7 +81,7 @@ </target> <target name="testFileRefContains"> - <file id="file" file="${file}" /> + <file id="file" file="${file}"/> <au:assertTrue message="Should have found the text in the resource"> <resourcecontains refid="file" substring="text"/> </au:assertTrue> @@ -105,7 +105,7 @@ <target name="testFileConcatRefContains"> <resources id="concat"> - <concat><file file="${file}" /></concat> + <concat><file file="${file}"/></concat> </resources> <au:assertTrue message="Should have found the text in the resource"> <resourcecontains refid="concat" substring="text"/> @@ -118,7 +118,7 @@ <header>HEADER</header> <footer>FOOTER</footer> <string>foo</string> - <file file="${file}" /> + <file file="${file}"/> <string>bar</string> </concat> </resources> @@ -129,7 +129,7 @@ <target name="testFirstRefContains"> <first id="first"> - <fileset dir="${basedir}" includes="*-test.xml" /> + <fileset dir="${basedir}" includes="*-test.xml"/> </first> <au:assertTrue message="Should have found the text in the resource"> <resourcecontains refid="first" substring="project"/>
