You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/07/01 13:33:04 UTC
[03/11] ant git commit: Trailing whitespace
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/macrodef-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/macrodef-test.xml b/src/tests/antunit/taskdefs/macrodef-test.xml
index b12e6f7..af6b87c 100644
--- a/src/tests/antunit/taskdefs/macrodef-test.xml
+++ b/src/tests/antunit/taskdefs/macrodef-test.xml
@@ -18,7 +18,7 @@
<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="testDefaultTest">
<macrodef name="test-log">
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/manifest-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/manifest-test.xml b/src/tests/antunit/taskdefs/manifest-test.xml
index 4247ef2..5b682f3 100644
--- a/src/tests/antunit/taskdefs/manifest-test.xml
+++ b/src/tests/antunit/taskdefs/manifest-test.xml
@@ -18,7 +18,7 @@
<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}"/>
@@ -150,18 +150,18 @@ public class AntFail {
}
}
]]></echo>
- <javac srcdir="${input}" destdir="${output}/bin" includeantruntime="no" />
+ <javac srcdir="${input}" destdir="${output}/bin" includeantruntime="no"/>
</target>
<target name="testJava5JarProblemManifestInSeparateTask"
depends="-prepareJava5JarTest"
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=54762">
<manifest file="${output}/MANIFEST.MF">
- <attribute name="Main-Class" value="org.example.AntFail" />
+ <attribute name="Main-Class" value="org.example.AntFail"/>
</manifest>
-
+
<jar manifest="${output}/MANIFEST.MF" destfile="${output}/antfail.jar"
- basedir="${output}/bin" />
+ basedir="${output}/bin"/>
<java jar="${output}/antfail.jar" fork="true" failonerror="true"/>
</target>
@@ -172,7 +172,7 @@ public class AntFail {
<jar destfile="${output}/antfail.jar"
basedir="${output}/bin">
<manifest>
- <attribute name="Main-Class" value="org.example.AntFail" />
+ <attribute name="Main-Class" value="org.example.AntFail"/>
</manifest>
</jar>
<java jar="${output}/antfail.jar" fork="true" failonerror="true"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/manifestclasspath-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/manifestclasspath-test.xml b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
index 612990b..cbc06a9 100644
--- a/src/tests/antunit/taskdefs/manifestclasspath-test.xml
+++ b/src/tests/antunit/taskdefs/manifestclasspath-test.xml
@@ -18,7 +18,7 @@
<project default="antunit"
xmlns:au="antlib:org.apache.ant.antunit">
- <import file="../antunit-base.xml" />
+ <import file="../antunit-base.xml"/>
<target name="testRelativePathOfParentDir">
<manifestclasspath property="jar.classpath"
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/move-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/move-test.xml b/src/tests/antunit/taskdefs/move-test.xml
index 3584f9b..4dcf362 100644
--- a/src/tests/antunit/taskdefs/move-test.xml
+++ b/src/tests/antunit/taskdefs/move-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="test-move-caseonly">
<!-- this test is inspired by bugzilla 41948 -->
@@ -60,8 +60,7 @@
</target>
<target name="testNotModifiedSelector"
- description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574"
- >
+ description="https://issues.apache.org/bugzilla/show_bug.cgi?id=43574">
<mkdir dir="${input}/images"/>
<mkdir dir="${input}/cache"/>
<touch file="${input}/images/foo.jpg"/>
@@ -82,8 +81,8 @@
<au:assertFileDoesntExist file="${input}/cache/cache.properties"/>
<move todir="${output}" overwrite="true">
<fileset dir="${input}/images">
- <include name="*.jpg" />
- <selector refid="cache.selector" />
+ <include name="*.jpg"/>
+ <selector refid="cache.selector"/>
</fileset>
</move>
<au:assertFileExists file="${input}/cache/cache.properties"/>
@@ -91,8 +90,8 @@
<au:assertFileDoesntExist file="${output}/foo.jpg"/>
<move todir="${output}" overwrite="true">
<fileset dir="${input}/images">
- <include name="*.jpg" />
- <selector refid="cache.selector" />
+ <include name="*.jpg"/>
+ <selector refid="cache.selector"/>
</fileset>
</move>
<au:assertFileDoesntExist file="${input}/images/foo.jpg"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/cab.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/cab.xml b/src/tests/antunit/taskdefs/optional/cab.xml
index 4909107..a5a2ac2 100644
--- a/src/tests/antunit/taskdefs/optional/cab.xml
+++ b/src/tests/antunit/taskdefs/optional/cab.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="testBasedirOrFilesetRequired">
<au:expectfailure message="must specify basedir or fileset"
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml b/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
index 48f94aa..3abbca5 100644
--- a/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
+++ b/src/tests/antunit/taskdefs/optional/depend/depend-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"/>
<property name="src1" location="${input}/src1"/>
<property name="src2" location="${input}/src2"/>
@@ -59,8 +59,8 @@ public class Main {
<!--to ensure that the classfiles generated in the previous step
will be outdated-->
- <sleep seconds="3" />
- <touch file="${src1}/a/B.java" />
+ <sleep seconds="3"/>
+ <touch file="${src1}/a/B.java"/>
<javac srcdir="${src1}" destdir="${output}"/>
<jar destfile="${output}/A.jar" basedir="${output}" includes="a/**"/>
<delete dir="${output}/a"/>
@@ -93,8 +93,8 @@ public class Main {
<javac srcdir="${src1}" destdir="${resources}"/>
<javac srcdir="${src2}" destdir="${dest2}" classpath="${resources}"/>
- <sleep seconds="3" />
- <touch file="${src1}/a/B.java" />
+ <sleep seconds="3"/>
+ <touch file="${src1}/a/B.java"/>
<javac srcdir="${src1}" destdir="${resources}"/>
<au:assertFileExists file="${dest2}/b/Main.class"/>
</target>
@@ -109,8 +109,7 @@ public class Main {
<depend srcDir="${src2}"
destDir="${dest2}" cache="${output}"
- classpathref="resources-id"
- />
+ classpathref="resources-id"/>
<au:assertFileDoesntExist file="${dest2}/b/Main.class"/>
</target>
@@ -123,8 +122,7 @@ public class Main {
<depend srcDir="${src2}"
destDir="${dest2}" cache="${output}"
- classpathref="resources-id"
- />
+ classpathref="resources-id"/>
<au:assertFileDoesntExist file="${dest2}/b/Main.class"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/funtest-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/funtest-test.xml b/src/tests/antunit/taskdefs/optional/funtest-test.xml
index 6baa4f7..6656e44 100644
--- a/src/tests/antunit/taskdefs/optional/funtest-test.xml
+++ b/src/tests/antunit/taskdefs/optional/funtest-test.xml
@@ -100,7 +100,7 @@
</target>
<target name="testCondition">
- <funtest >
+ <funtest>
<condition>
<isset property="unset"/>
</condition>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/javah-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/javah-test.xml b/src/tests/antunit/taskdefs/optional/javah-test.xml
index 82d91c8..41ed9a3 100644
--- a/src/tests/antunit/taskdefs/optional/javah-test.xml
+++ b/src/tests/antunit/taskdefs/optional/javah-test.xml
@@ -16,10 +16,10 @@
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="-create-javah-adapter">
- <mkdir dir="${input}/org/example" />
+ <mkdir dir="${input}/org/example"/>
<echo file="${input}/org/example/Adapter.java">
<![CDATA[
package org.example;
@@ -33,34 +33,34 @@ public class Adapter implements JavahAdapter {
}
}]]>
</echo>
- <mkdir dir="${resources}" />
- <javac srcdir="${input}" destdir="${resources}" />
+ <mkdir dir="${resources}"/>
+ <javac srcdir="${input}" destdir="${resources}"/>
</target>
<target name="testAdapterNotFound" depends="-create-javah-adapter">
<au:expectfailure>
- <javah class="org.example.Adapter" destdir="${output}" implementation="org.example.Adapter" />
+ <javah class="org.example.Adapter" destdir="${output}" implementation="org.example.Adapter"/>
</au:expectfailure>
- <au:assertLogDoesntContain text="adapter called" />
+ <au:assertLogDoesntContain text="adapter called"/>
</target>
<target name="testImplementationClasspath" depends="-create-javah-adapter" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=11143">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
<javah class="org.example.Adapter" destdir="${output}" implementation="org.example.Adapter">
- <implementationclasspath location="${resources}" />
+ <implementationclasspath location="${resources}"/>
</javah>
- <au:assertLogContains text="adapter called" />
+ <au:assertLogContains text="adapter called"/>
</target>
<target name="testImplementationAsNestedElement" depends="-create-javah-adapter">
<componentdef classname="org.example.Adapter" name="myjavac">
- <classpath location="${resources}" />
+ <classpath location="${resources}"/>
</componentdef>
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
<javah class="org.example.Adapter" destdir="${output}">
- <myjavac />
+ <myjavac/>
</javah>
- <au:assertLogContains text="adapter called" />
+ <au:assertLogContains text="adapter called"/>
</target>
<target name="-setupForRealJavahTests">
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/junit/junit-formatter-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-formatter-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-formatter-test.xml
index b9a63c9..9747778 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-formatter-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-formatter-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"/>
<path id="junit">
<fileset dir="../../../../../../lib/optional" includes="junit*"/>
@@ -43,7 +43,7 @@ public class ATest extends TestCase {
<classpath location="${output}"/>
<batchtest todir="${output}">
<fileset dir="${output}">
- <include name="**/*Test.class" />
+ <include name="**/*Test.class"/>
</fileset>
</batchtest>
<formatter type="plain" if="${if}" extension=".dollar_if"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
index c84ae49..8a42665 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project default="all" xmlns:au="antlib:org.apache.ant.antunit">
- <import file="../../../antunit-base.xml" />
+ <import file="../../../antunit-base.xml"/>
<property name="ant-build" location="../../../../../../build"/>
<property name="build-junit-dir" location="${ant-build}/antunit/junit-dir"/>
<property name="reports.dir" location="${build-junit-dir}/report"/>
@@ -43,7 +43,7 @@
<macrodef name="assert-log-not-contains" backtrace="no">
<sequential>
- <au:assertLogDoesntContain text="Hello From Test" />
+ <au:assertLogDoesntContain text="Hello From Test"/>
</sequential>
</macrodef>
@@ -60,7 +60,7 @@
<sequential>
<junit fork="@{fork}" haltonfailure="no" showoutput="@{showoutput}"
outputtoformatters="@{outputtoformatters}">
- <test name="ExampleTest" todir="${reports.dir}"/>
+ <test name="ExampleTest" todir="${reports.dir}"/>
<classpath path="${resources}"/>
<formatter type="plain" usefile="yes"/>
</junit>
@@ -72,7 +72,7 @@
<mkdir dir="${resources}"/>
<mkdir dir="${reports.dir}"/>
</target>
-
+
<target name="compile" depends="init">
<javac srcdir="src" destdir="${resources}" debug="yes"/>
</target>
@@ -134,4 +134,3 @@
</target>
</project>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
index d93b96e..33eb602 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
@@ -16,16 +16,16 @@
limitations under the License.
-->
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
- <import file="../../../antunit-base.xml" />
+ <import file="../../../antunit-base.xml"/>
<path id="junit">
- <fileset dir="../../../../../../lib/optional" includes="junit*" />
- <fileset dir="../../../../../../lib/optional" includes="hamcrest-core*" />
+ <fileset dir="../../../../../../lib/optional" includes="junit*"/>
+ <fileset dir="../../../../../../lib/optional" includes="hamcrest-core*"/>
</path>
<macrodef name="empty-test">
- <attribute name="classname" />
- <attribute name="package" default="test" />
+ <attribute name="classname"/>
+ <attribute name="package" default="test"/>
<sequential>
<echo file="${input}/@{classname}.java">
<![CDATA[
@@ -41,14 +41,14 @@ public class @{classname} extends TestCase {
</macrodef>
<target name="setUp">
- <mkdir dir="${input}" />
- <mkdir dir="${output}" />
+ <mkdir dir="${input}"/>
+ <mkdir dir="${output}"/>
</target>
<target name="testTimeoutLogOfBatchTests">
- <mkdir dir="${input}" />
- <mkdir dir="${output}" />
- <empty-test classname="ATest" package="org.apache.ant.test" />
+ <mkdir dir="${input}"/>
+ <mkdir dir="${output}"/>
+ <empty-test classname="ATest" package="org.apache.ant.test"/>
<echo file="${input}/BTest.java">
<![CDATA[
package org.apache.ant.test;
@@ -61,30 +61,30 @@ public class BTest extends TestCase {
}
]]>
</echo>
- <empty-test classname="CTest" package="org.apache.ant.test" />
- <empty-test classname="DTest" package="org.apache.ant.test" />
+ <empty-test classname="CTest" package="org.apache.ant.test"/>
+ <empty-test classname="DTest" package="org.apache.ant.test"/>
<javac srcdir="${input}" destdir="${output}">
- <classpath refid="junit" />
+ <classpath refid="junit"/>
</javac>
<junit fork="true" forkMode="perBatch" timeout="5000" printsummary="yes">
- <classpath refid="junit" />
- <classpath location="${output}" />
+ <classpath refid="junit"/>
+ <classpath location="${output}"/>
<batchtest>
<fileset dir="${output}">
- <include name="**/*Test.class" />
+ <include name="**/*Test.class"/>
</fileset>
</batchtest>
</junit>
- <au:assertLogContains text="ATest" />
- <au:assertLogContains text="BTest" />
- <au:assertLogContains text="org.apache.ant.test.Batch-With-Multiple-Tests" />
- <au:assertLogDoesntContain text="CTest" />
- <au:assertLogDoesntContain text="DTest" />
+ <au:assertLogContains text="ATest"/>
+ <au:assertLogContains text="BTest"/>
+ <au:assertLogContains text="org.apache.ant.test.Batch-With-Multiple-Tests"/>
+ <au:assertLogDoesntContain text="CTest"/>
+ <au:assertLogDoesntContain text="DTest"/>
</target>
<target name="testFailurePropertyOnTestCase">
- <mkdir dir="${input}" />
- <mkdir dir="${output}" />
+ <mkdir dir="${input}"/>
+ <mkdir dir="${output}"/>
<echo file="${input}/ATest.java">
<![CDATA[
package test;
@@ -98,23 +98,23 @@ public class ATest extends TestCase {
]]>
</echo>
<javac srcdir="${input}" destdir="${output}">
- <classpath refid="junit" />
+ <classpath refid="junit"/>
</javac>
<junit failureProperty="testcase.failed" haltonfailure="false">
- <classpath refid="junit" />
- <classpath location="${output}" />
+ <classpath refid="junit"/>
+ <classpath location="${output}"/>
<batchtest>
<fileset dir="${output}">
- <include name="**/*Test.class" />
+ <include name="**/*Test.class"/>
</fileset>
</batchtest>
</junit>
- <au:assertPropertySet name="testcase.failed" />
+ <au:assertPropertySet name="testcase.failed"/>
</target>
<target name="testFailurePropertyOnTestSuite">
- <mkdir dir="${input}" />
- <mkdir dir="${output}" />
+ <mkdir dir="${input}"/>
+ <mkdir dir="${output}"/>
<echo file="${input}/ATest.java">
<![CDATA[
package test;
@@ -132,44 +132,44 @@ public class ATest extends TestSuite {
]]>
</echo>
<javac srcdir="${input}" destdir="${output}">
- <classpath refid="junit" />
+ <classpath refid="junit"/>
</javac>
<junit failureProperty="testsuite.failed" haltonfailure="false">
- <classpath refid="junit" />
- <classpath location="${output}" />
+ <classpath refid="junit"/>
+ <classpath location="${output}"/>
<batchtest>
<fileset dir="${output}">
- <include name="**/*Test.class" />
+ <include name="**/*Test.class"/>
</fileset>
</batchtest>
</junit>
- <au:assertPropertySet name="testsuite.failed" />
+ <au:assertPropertySet name="testsuite.failed"/>
</target>
<target name="testTimeoutAndFormattersForkPerTest">
<antcall target="runTimeoutAndFormattersTest">
- <param name="forkMode" value="perTest" />
+ <param name="forkMode" value="perTest"/>
</antcall>
- <au:assertFileExists file="${output}/TEST-test.CTest.txt" />
- <au:assertFileExists file="${output}/TEST-test.CTest.xml" />
- <au:assertFileExists file="${output}/TEST-test.DTest.txt" />
- <au:assertFileExists file="${output}/TEST-test.DTest.xml" />
+ <au:assertFileExists file="${output}/TEST-test.CTest.txt"/>
+ <au:assertFileExists file="${output}/TEST-test.CTest.xml"/>
+ <au:assertFileExists file="${output}/TEST-test.DTest.txt"/>
+ <au:assertFileExists file="${output}/TEST-test.DTest.xml"/>
</target>
<target name="testTimeoutAndFormattersForkOnce">
<antcall target="runTimeoutAndFormattersTest">
- <param name="forkMode" value="once" />
+ <param name="forkMode" value="once"/>
</antcall>
- <au:assertFileDoesntExist file="${output}/TEST-test.CTest.txt" />
- <au:assertFileDoesntExist file="${output}/TEST-test.CTest.xml" />
- <au:assertFileDoesntExist file="${output}/TEST-test.DTest.txt" />
- <au:assertFileDoesntExist file="${output}/TEST-test.DTest.xml" />
+ <au:assertFileDoesntExist file="${output}/TEST-test.CTest.txt"/>
+ <au:assertFileDoesntExist file="${output}/TEST-test.CTest.xml"/>
+ <au:assertFileDoesntExist file="${output}/TEST-test.DTest.txt"/>
+ <au:assertFileDoesntExist file="${output}/TEST-test.DTest.xml"/>
</target>
<target name="runTimeoutAndFormattersTest" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=35634">
- <mkdir dir="${input}" />
- <mkdir dir="${output}" />
- <empty-test classname="ATest" />
+ <mkdir dir="${input}"/>
+ <mkdir dir="${output}"/>
+ <empty-test classname="ATest"/>
<echo file="${input}/BTest.java">
<![CDATA[
package test;
@@ -182,27 +182,27 @@ public class BTest extends TestCase {
}
]]>
</echo>
- <empty-test classname="CTest" />
- <empty-test classname="DTest" />
+ <empty-test classname="CTest"/>
+ <empty-test classname="DTest"/>
<javac srcdir="${input}" destdir="${output}">
- <classpath refid="junit" />
+ <classpath refid="junit"/>
</javac>
<junit fork="true" timeout="5000" forkmode="${forkMode}">
- <classpath refid="junit" />
- <classpath location="${output}" />
+ <classpath refid="junit"/>
+ <classpath location="${output}"/>
<batchtest todir="${output}">
<fileset dir="${output}">
- <include name="**/*Test.class" />
+ <include name="**/*Test.class"/>
</fileset>
</batchtest>
- <formatter type="brief" />
- <formatter type="xml" />
+ <formatter type="brief"/>
+ <formatter type="xml"/>
</junit>
- <au:assertFileExists file="${output}/TEST-test.ATest.txt" />
- <au:assertFileExists file="${output}/TEST-test.ATest.xml" />
+ <au:assertFileExists file="${output}/TEST-test.ATest.txt"/>
+ <au:assertFileExists file="${output}/TEST-test.ATest.xml"/>
<!--
- <au:assertFileExists file="${output}/TEST-test.BTest.txt" />
- <au:assertFileExists file="${output}/TEST-test.BTest.xml" />
+ <au:assertFileExists file="${output}/TEST-test.BTest.txt"/>
+ <au:assertFileExists file="${output}/TEST-test.BTest.xml"/>
These files should only exist if something was written to the log by te runner.
The test previously passed even though the files were empty, which isn't a meaningful result.
@@ -211,44 +211,44 @@ public class BTest extends TestCase {
</target>
<target name="-ifUnlessSetup" depends="setUp">
- <empty-test classname="ATest" />
- <empty-test classname="BTest" />
- <empty-test classname="CTest" />
- <empty-test classname="DTest" />
- <empty-test classname="ETest" />
- <empty-test classname="FTest" />
- <empty-test classname="GTest" />
- <empty-test classname="HTest" />
+ <empty-test classname="ATest"/>
+ <empty-test classname="BTest"/>
+ <empty-test classname="CTest"/>
+ <empty-test classname="DTest"/>
+ <empty-test classname="ETest"/>
+ <empty-test classname="FTest"/>
+ <empty-test classname="GTest"/>
+ <empty-test classname="HTest"/>
<javac srcdir="${input}" destdir="${output}">
- <classpath refid="junit" />
+ <classpath refid="junit"/>
</javac>
<macrodef name="j">
<sequential>
<junit fork="true" forkMode="perBatch" printsummary="yes">
- <classpath refid="junit" />
- <classpath location="${output}" />
- <test name="test.ATest" if="${if}" />
- <test name="test.BTest" if="if" />
- <test name="test.CTest" unless="${if}" />
- <test name="test.DTest" unless="if" />
+ <classpath refid="junit"/>
+ <classpath location="${output}"/>
+ <test name="test.ATest" if="${if}"/>
+ <test name="test.BTest" if="if"/>
+ <test name="test.CTest" unless="${if}"/>
+ <test name="test.DTest" unless="if"/>
<batchtest if="${if}">
<fileset dir="${output}">
- <include name="**/ETest.class" />
+ <include name="**/ETest.class"/>
</fileset>
</batchtest>
<batchtest if="if">
<fileset dir="${output}">
- <include name="**/FTest.class" />
+ <include name="**/FTest.class"/>
</fileset>
</batchtest>
<batchtest unless="${if}">
<fileset dir="${output}">
- <include name="**/GTest.class" />
+ <include name="**/GTest.class"/>
</fileset>
</batchtest>
<batchtest unless="if">
<fileset dir="${output}">
- <include name="**/HTest.class" />
+ <include name="**/HTest.class"/>
</fileset>
</batchtest>
</junit>
@@ -257,61 +257,61 @@ public class BTest extends TestCase {
</target>
<target name="testPropertiesNotSet" depends="-ifUnlessSetup">
- <j />
- <au:assertLogDoesntContain text="Running test.ATest" />
- <au:assertLogDoesntContain text="Running test.BTest" />
- <au:assertLogContains text="Running test.CTest" />
- <au:assertLogContains text="Running test.DTest" />
- <au:assertLogDoesntContain text="Running test.ETest" />
- <au:assertLogDoesntContain text="Running test.FTest" />
- <au:assertLogContains text="Running test.GTest" />
- <au:assertLogContains text="Running test.HTest" />
+ <j/>
+ <au:assertLogDoesntContain text="Running test.ATest"/>
+ <au:assertLogDoesntContain text="Running test.BTest"/>
+ <au:assertLogContains text="Running test.CTest"/>
+ <au:assertLogContains text="Running test.DTest"/>
+ <au:assertLogDoesntContain text="Running test.ETest"/>
+ <au:assertLogDoesntContain text="Running test.FTest"/>
+ <au:assertLogContains text="Running test.GTest"/>
+ <au:assertLogContains text="Running test.HTest"/>
</target>
<target name="testPropertiesSet" depends="-ifUnlessSetup">
- <property name="if" value="whatever" />
- <j />
- <au:assertLogDoesntContain text="Running test.ATest" />
- <au:assertLogContains text="Running test.BTest" />
- <au:assertLogContains text="Running test.CTest" />
- <au:assertLogDoesntContain text="Running test.DTest" />
- <au:assertLogDoesntContain text="Running test.ETest" />
- <au:assertLogContains text="Running test.FTest" />
- <au:assertLogContains text="Running test.GTest" />
- <au:assertLogDoesntContain text="Running test.HTest" />
+ <property name="if" value="whatever"/>
+ <j/>
+ <au:assertLogDoesntContain text="Running test.ATest"/>
+ <au:assertLogContains text="Running test.BTest"/>
+ <au:assertLogContains text="Running test.CTest"/>
+ <au:assertLogDoesntContain text="Running test.DTest"/>
+ <au:assertLogDoesntContain text="Running test.ETest"/>
+ <au:assertLogContains text="Running test.FTest"/>
+ <au:assertLogContains text="Running test.GTest"/>
+ <au:assertLogDoesntContain text="Running test.HTest"/>
</target>
<target name="testPropertiesTrue" depends="-ifUnlessSetup">
- <property name="if" value="true" />
- <j />
- <au:assertLogContains text="Running test.ATest" />
- <au:assertLogContains text="Running test.BTest" />
- <au:assertLogDoesntContain text="Running test.CTest" />
- <au:assertLogDoesntContain text="Running test.DTest" />
- <au:assertLogContains text="Running test.ETest" />
- <au:assertLogContains text="Running test.FTest" />
- <au:assertLogDoesntContain text="Running test.GTest" />
- <au:assertLogDoesntContain text="Running test.HTest" />
+ <property name="if" value="true"/>
+ <j/>
+ <au:assertLogContains text="Running test.ATest"/>
+ <au:assertLogContains text="Running test.BTest"/>
+ <au:assertLogDoesntContain text="Running test.CTest"/>
+ <au:assertLogDoesntContain text="Running test.DTest"/>
+ <au:assertLogContains text="Running test.ETest"/>
+ <au:assertLogContains text="Running test.FTest"/>
+ <au:assertLogDoesntContain text="Running test.GTest"/>
+ <au:assertLogDoesntContain text="Running test.HTest"/>
</target>
<target name="testPropertiesFalse" depends="-ifUnlessSetup">
- <property name="if" value="false" />
- <j />
- <au:assertLogDoesntContain text="Running test.ATest" />
- <au:assertLogContains text="Running test.BTest" />
- <au:assertLogContains text="Running test.CTest" />
- <au:assertLogDoesntContain text="Running test.DTest" />
- <au:assertLogDoesntContain text="Running test.ETest" />
- <au:assertLogContains text="Running test.FTest" />
- <au:assertLogContains text="Running test.GTest" />
- <au:assertLogDoesntContain text="Running test.HTest" />
+ <property name="if" value="false"/>
+ <j/>
+ <au:assertLogDoesntContain text="Running test.ATest"/>
+ <au:assertLogContains text="Running test.BTest"/>
+ <au:assertLogContains text="Running test.CTest"/>
+ <au:assertLogDoesntContain text="Running test.DTest"/>
+ <au:assertLogDoesntContain text="Running test.ETest"/>
+ <au:assertLogContains text="Running test.FTest"/>
+ <au:assertLogContains text="Running test.GTest"/>
+ <au:assertLogDoesntContain text="Running test.HTest"/>
</target>
<target name="testMissingTestName">
- <property name="test.name" value="null" />
+ <property name="test.name" value="null"/>
<au:expectfailure message="test name must be specified">
<junit fork="false">
- <test name="${test.name}" />
+ <test name="${test.name}"/>
</junit>
</au:expectfailure>
</target>
@@ -326,42 +326,42 @@ public class BTest extends TestCase {
<echo file="${input}/T2.java">
import org.junit.Test;
public class T2 {
- @Test
+ @Test
public void ok() {}
- @Test
+ @Test
public void bad() {
throw new RuntimeException("failed");}
}</echo>
<javac srcdir="${input}" destdir="${output}" includes="T1.java,T2.java" source="${source}" includeantruntime="false">
<classpath>
- <path refid="junit" />
+ <path refid="junit"/>
</classpath>
</javac>
<junit fork="true" printsummary="true" haltonerror="true">
<classpath>
- <pathelement location="${output}" />
- <path refid="junit" />
+ <pathelement location="${output}"/>
+ <path refid="junit"/>
</classpath>
- <test name="T1" methods="testOK" />
- <test name="T2" methods="ok" />
+ <test name="T1" methods="testOK"/>
+ <test name="T2" methods="ok"/>
</junit>
</target>
<target name="testClasspathBuildingSurvivesNonZips" depends="setUp"
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53964">
- <empty-test classname="ATest" package="org.apache.ant.test" />
+ <empty-test classname="ATest" package="org.apache.ant.test"/>
<javac srcdir="${input}" destdir="${output}">
- <classpath refid="junit" />
+ <classpath refid="junit"/>
</javac>
<junit fork="true" printsummary="true" haltonerror="true">
<classpath>
- <pathelement location="${output}" />
- <pathelement location="${ant.file}" />
- <path refid="junit" />
+ <pathelement location="${output}"/>
+ <pathelement location="${ant.file}"/>
+ <path refid="junit"/>
</classpath>
<batchtest>
<fileset dir="${output}">
- <include name="**/*Test.class" />
+ <include name="**/*Test.class"/>
</fileset>
</batchtest>
</junit>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml b/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
index 4aa6e4d..65b23b1 100644
--- a/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
@@ -42,7 +42,7 @@ public class A extends TestCase {
<classpath location="${output}"/>
<batchtest todir="${output}">
<fileset dir="${output}">
- <include name="**/A.class" />
+ <include name="**/A.class"/>
</fileset>
</batchtest>
<formatter type="xml"/>
@@ -72,7 +72,7 @@ public class A extends TestCase {
<classpath location="${output}"/>
<batchtest todir="${output}">
<fileset dir="${output}">
- <include name="**/A.class" />
+ <include name="**/A.class"/>
</fileset>
</batchtest>
<formatter type="xml"/>
@@ -110,7 +110,7 @@ public class A extends TestCase {
<classpath location="${output}"/>
<batchtest todir="${output}">
<fileset dir="${output}">
- <include name="**/A.class" />
+ <include name="**/A.class"/>
</fileset>
</batchtest>
<formatter type="xml"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml b/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
index 8eff37c..7ca7892 100644
--- a/src/tests/antunit/taskdefs/optional/native2ascii-test.xml
+++ b/src/tests/antunit/taskdefs/optional/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="tearDown" depends="antunit-base.tearDown"
if="n2a.tmp">
@@ -42,7 +42,7 @@ public class Adapter implements Native2AsciiAdapter {
</target>
<target name="testAdapterNotFound" depends="-create-native2ascii-adapter" unless="build.sysclasspath.only">
- <!-- under gump the failure will not happen because the ${resources} directory is systematically on the classpath
+ <!-- under gump the failure will not happen because the ${resources} directory is systematically on the classpath
what would be cool would be a task which removes a path element from the classpath. Do we have that ? -->
<au:expectfailure>
<native2ascii src="${input}" dest="${output}" includes="**/*.java"
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/propertyfile-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/propertyfile-test.xml b/src/tests/antunit/taskdefs/optional/propertyfile-test.xml
index 0ea7051..1a25d03 100644
--- a/src/tests/antunit/taskdefs/optional/propertyfile-test.xml
+++ b/src/tests/antunit/taskdefs/optional/propertyfile-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/optional/propertyfilelayout-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/propertyfilelayout-test.xml b/src/tests/antunit/taskdefs/optional/propertyfilelayout-test.xml
index f1b367f..17d8541 100644
--- a/src/tests/antunit/taskdefs/optional/propertyfilelayout-test.xml
+++ b/src/tests/antunit/taskdefs/optional/propertyfilelayout-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/optional/replaceregexp-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/replaceregexp-test.xml b/src/tests/antunit/taskdefs/optional/replaceregexp-test.xml
index 2d64ce7..dd355ce 100644
--- a/src/tests/antunit/taskdefs/optional/replaceregexp-test.xml
+++ b/src/tests/antunit/taskdefs/optional/replaceregexp-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="testRCSupport">
<mkdir dir="${output}"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml b/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
index da78e42..558e296 100644
--- a/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
+++ b/src/tests/antunit/taskdefs/optional/script/scriptdef-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"/>
<description>
In which we test interesting aspects of scripting.
@@ -28,10 +28,10 @@
<condition property="prereqs-ok">
<or>
<and>
- <available classname="org.apache.bsf.BSFManager" />
- <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine" />
+ <available classname="org.apache.bsf.BSFManager"/>
+ <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine"/>
</and>
- <available classname="javax.script.ScriptEngineManager" />
+ <available classname="javax.script.ScriptEngineManager"/>
</or>
</condition>
@@ -40,12 +40,12 @@
<condition property="script.manager" value="javax">
<and>
<not>
- <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine" />
+ <available classname="org.apache.bsf.engines.javascript.JavaScriptEngine"/>
</not>
<isset property="prereqs-ok"/>
</and>
</condition>
- <property name="script.manager" value="auto" />
+ <property name="script.manager" value="auto"/>
<string id="script.code">
self.log("Ant version =${ant.version}");
@@ -55,36 +55,36 @@
<presetdef name="js">
<scriptdef language="javascript" name="scripttest" manager="${script.manager}">
<!-- optional property attribute-->
- <attribute name="property" />
+ <attribute name="property"/>
</scriptdef>
</presetdef>
- <property name="prop" value='self.log("Ant version =${ant.version}");project.setNewProperty("property","live");' />
+ <property name="prop" value='self.log("Ant version =${ant.version}");project.setNewProperty("property","live");'/>
<presetdef name="assertPropSet">
- <au:assertPropertyEquals name="property" value="live" />
+ <au:assertPropertyEquals name="property" value="live"/>
</presetdef>
<!--purely to test that everything works -->
<target name="testInline" if="prereqs-ok">
<js>self.log("Hello");</js>
- <scripttest />
+ <scripttest/>
</target>
<target name="testStringResource" if="prereqs-ok">
<js>
- <string value='self.log("Ant version =${ant.version}");' />
+ <string value='self.log("Ant version =${ant.version}");'/>
</js>
- <scripttest />
+ <scripttest/>
</target>
<target name="testStringResourceRef" if="prereqs-ok">
<js>
- <string refid="script.code" />
+ <string refid="script.code"/>
</js>
- <scripttest />
- <assertPropSet />
+ <scripttest/>
+ <assertPropSet/>
</target>
<target name="testStringResourceInline" if="prereqs-ok">
@@ -94,28 +94,28 @@
project.setNewProperty("property","live");
</string>
</js>
- <scripttest />
- <assertPropSet />
+ <scripttest/>
+ <assertPropSet/>
</target>
<target name="testPropertyResource" if="prereqs-ok">
<js>
- <propertyresource name="prop" />
+ <propertyresource name="prop"/>
</js>
- <scripttest />
- <assertPropSet />
+ <scripttest/>
+ <assertPropSet/>
</target>
<target name="testMixedResources" if="prereqs-ok">
<js>
- <string refid="script.code" />
- <propertyresource name="prop" />
+ <string refid="script.code"/>
+ <propertyresource name="prop"/>
<string>
project.setNewProperty("property2","live");
</string>
</js>
- <scripttest />
- <assertPropSet name="property2" />
+ <scripttest/>
+ <assertPropSet name="property2"/>
</target>
<target name="testExceptionNesting" description="https://issues.apache.org/bugzilla/show_bug.cgi?id=47509" if="prereqs-ok">
@@ -125,7 +125,7 @@
]]>
</scriptdef>
<au:expectfailure message="I failed!">
- <quickfail />
+ <quickfail/>
</au:expectfailure>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml b/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml
index 90c57f4..30e8a6b 100644
--- a/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml
+++ b/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml
@@ -21,7 +21,7 @@
<target name="setUp">
<condition property="isUnix">
- <os family="unix" />
+ <os family="unix"/>
</condition>
</target>
@@ -33,9 +33,9 @@
<target name="os">
- <mkdir dir="${output}" />
+ <mkdir dir="${output}"/>
<condition property="unix">
- <os family="unix" />
+ <os family="unix"/>
</condition>
<property name="file_ref"
location="${output}/file"/>
@@ -44,7 +44,7 @@
</target>
<target name="init" depends="os" if="unix">
- <touch file="${file_ref}" />
+ <touch file="${file_ref}"/>
</target>
<target name="testCreateDouble" depends="init" if="unix">
@@ -63,7 +63,7 @@
</target>
<target name="testCreateOverFile" depends="init" if="unix">
- <touch file="${output}/link3" />
+ <touch file="${output}/link3"/>
<symlink overwrite="true" link="${output}/link3"
resource="${file_ref}"/>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/windows/attrib-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/windows/attrib-test.xml b/src/tests/antunit/taskdefs/optional/windows/attrib-test.xml
index d5cea2b..6abf625 100644
--- a/src/tests/antunit/taskdefs/optional/windows/attrib-test.xml
+++ b/src/tests/antunit/taskdefs/optional/windows/attrib-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">
<condition property="windows?">
@@ -39,7 +39,7 @@
<touch file="${input}/9.tld"/>
<attrib readonly="false">
<fileset dir="${input}">
- <include name="*.tld" />
+ <include name="*.tld"/>
</fileset>
</attrib>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml b/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
index 0cfffb4..9c3d133 100644
--- a/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
+++ b/src/tests/antunit/taskdefs/optional/xz/unxz-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}"/>
@@ -60,4 +60,3 @@
</target>
</project>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/optional/xz/xz-test.xml b/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
index 3e4b6a8..ab7296c 100644
--- a/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
+++ b/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
@@ -18,20 +18,20 @@
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
<!-- note relies on antunit 1.1 -->
- <import file="../../../antunit-base.xml" />
+ <import file="../../../antunit-base.xml"/>
<target name="setUp">
- <mkdir dir="${output}" />
- <mkdir dir="${output}/empty" />
- <touch file="${output}/fileone" />
- <touch file="${output}/filetwo" />
+ <mkdir dir="${output}"/>
+ <mkdir dir="${output}/empty"/>
+ <touch file="${output}/fileone"/>
+ <touch file="${output}/filetwo"/>
<available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
</target>
<target name="testFailNone" if="xz.present">
<au:expectfailure expectedmessage="No resource selected, xz needs exactly one resource." message="Should have thrown an exception">
<xz destfile="${output}/file.gz">
- <fileset dir="${output}/empty" />
+ <fileset dir="${output}/empty"/>
</xz>
</au:expectfailure>
</target>
@@ -39,7 +39,7 @@
<target name="testFailTwo" if="xz.present">
<au:expectfailure expectedmessage="xz cannot handle multiple resources at once. (2 resources were selected.)" message="Should have thrown an exception">
<xz destfile="${output}/file.xz">
- <fileset dir="${output}" />
+ <fileset dir="${output}"/>
</xz>
</au:expectfailure>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/parallel-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/parallel-test.xml b/src/tests/antunit/taskdefs/parallel-test.xml
index 72e4828..7b531aa 100644
--- a/src/tests/antunit/taskdefs/parallel-test.xml
+++ b/src/tests/antunit/taskdefs/parallel-test.xml
@@ -19,19 +19,19 @@
<project default="antunit"
xmlns:au="antlib:org.apache.ant.antunit">
- <import file="../antunit-base.xml" />
+ <import file="../antunit-base.xml"/>
<target name="testTimeout"
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=49527">
<au:expectfailure message="Parallel execution timed out">
<parallel timeout="2000">
<sequential>
- <echo message="Before sleep" />
- <sleep seconds="10" />
- <echo message="After sleep" />
+ <echo message="Before sleep"/>
+ <sleep seconds="10"/>
+ <echo message="After sleep"/>
</sequential>
</parallel>
</au:expectfailure>
<au:assertLogDoesntContain text="After sleep"/>
</target>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/pathconvert-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/pathconvert-test.xml b/src/tests/antunit/taskdefs/pathconvert-test.xml
index 3683aff..09d2f79 100644
--- a/src/tests/antunit/taskdefs/pathconvert-test.xml
+++ b/src/tests/antunit/taskdefs/pathconvert-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="test-dir-char">
<pathconvert property="def|ghi" dirsep="|">
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/property-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/property-test.xml b/src/tests/antunit/taskdefs/property-test.xml
index 2eb0e18..5395996 100644
--- a/src/tests/antunit/taskdefs/property-test.xml
+++ b/src/tests/antunit/taskdefs/property-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"/>
<target name="testNestedText">
<property name="foo">bar</property>
@@ -37,7 +37,7 @@
</property>
</au:expectfailure>
</target>
-
+
<!-- Ensure we have platform dependent path separator -->
<property name="base" location="${basedir}"/>
<!-- an existing file as anchor for calculating paths -->
@@ -47,7 +47,7 @@
<property name="foo" location="${testfile}"/>
<au:assertPropertyEquals name="foo" value="${base}${file.separator}${testfile}"/>
</target>
-
+
<target name="testLocationWithRecursive">
<property name="foo" location="${testfile}" relative="false"/>
<au:assertPropertyEquals name="foo" value="${base}${file.separator}${testfile}"/>
@@ -62,7 +62,7 @@
<property name="foo" location="${testfile}" relative="true" basedir="${base}"/>
<au:assertPropertyEquals name="foo" value="${testfile}"/>
</target>
-
+
<target name="testRelativeUnderBase">
<property name="foo" location="${testfile}" relative="true" basedir="condition"/>
<au:assertPropertyEquals name="foo" value="antversion-test.xml"/>
@@ -151,7 +151,7 @@ b=$${a}
<au:assertPropertyEquals name="baz.b" value="$${a}"/>
</target>
- <!--
+ <!--
Problems with @-sign discussed on the mailinglist.
Seems to work.
http://mail-archives.apache.org/mod_mbox/ant-user/201412.mbox/%3CCAPxjwW%2BQKFFj45O-ZbCGOnAkJXe9KJ5qKtVQCvS2x7hObRJmkQ%40mail.gmail.com%3E
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/propertyfile-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/propertyfile-test.xml b/src/tests/antunit/taskdefs/propertyfile-test.xml
index b02cfa4..ddcfb12 100644
--- a/src/tests/antunit/taskdefs/propertyfile-test.xml
+++ b/src/tests/antunit/taskdefs/propertyfile-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"/>
<target name="-fileResourceSetup">
<mkdir dir="${output}"/>
@@ -25,20 +25,20 @@
<target name="testInternationalText" depends="-fileResourceSetup"
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50515">
- <property name="line1" value="萬 利 食 品 批 發 公 司" />
- <property name="line2" value="TEL: (123)123-1234" />
+ <property name="line1" value="萬 利 食 品 批 發 公 司"/>
+ <property name="line2" value="TEL: (123)123-1234"/>
<propertyfile file="${output}/test.properties">
- <entry key="line1" value="${line1}" />
- <entry key="line2" value="${line2}" />
+ <entry key="line1" value="${line1}"/>
+ <entry key="line2" value="${line2}"/>
</propertyfile>
<loadproperties prefix="rereading" srcfile="${output}/test.properties"/>
<au:assertTrue message="${line2}">
- <equals arg1="${line2}" arg2="${rereading.line2}" />
+ <equals arg1="${line2}" arg2="${rereading.line2}"/>
</au:assertTrue>
<au:assertTrue message="${line1}">
- <equals arg1="${line1}" arg2="${rereading.line1}" />
+ <equals arg1="${line1}" arg2="${rereading.line1}"/>
</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/taskdefs/propertyhelper-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/propertyhelper-test.xml b/src/tests/antunit/taskdefs/propertyhelper-test.xml
index f86342e..041429b 100644
--- a/src/tests/antunit/taskdefs/propertyhelper-test.xml
+++ b/src/tests/antunit/taskdefs/propertyhelper-test.xml
@@ -17,7 +17,7 @@
-->
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
<!-- each test verifies that the PropertyEvaluator delegate works -->
- <import file="../antunit-base.xml" />
+ <import file="../antunit-base.xml"/>
<condition property="prereqs-ok">
<and>
@@ -44,108 +44,108 @@
project.addReference("mapEvaluator", new MapEvaluator());
</script>
<propertyhelper>
- <delegate refid="mapEvaluator" />
+ <delegate refid="mapEvaluator"/>
</propertyhelper>
- <property name="setup.complete" value="true" />
+ <property name="setup.complete" value="true"/>
</target>
<target name="testValueTypes" depends="setUp" if="prereqs-ok">
<!-- verify BC, strings -->
- <au:assertPropertyEquals name="string" value="${STRING}" />
+ <au:assertPropertyEquals name="string" value="${STRING}"/>
<!-- verify non-string properties -->
- <au:assertPropertyEquals name="object" value="${OBJECT}" />
- <au:assertPropertyEquals name="int" value="${INT}" />
+ <au:assertPropertyEquals name="object" value="${OBJECT}"/>
+ <au:assertPropertyEquals name="int" value="${INT}"/>
<!-- verify that a string containing nothing but a property reference is a valid value -->
- <property name="string2" value="${string}" />
- <au:assertPropertyEquals name="string2" value="${string}" />
+ <property name="string2" value="${string}"/>
+ <au:assertPropertyEquals name="string2" value="${string}"/>
- <property name="object2" value="${object}" />
+ <property name="object2" value="${object}"/>
<!-- demonstrate that equals args can be non-string -->
- <au:assertPropertyEquals name="object2" value="${object}" />
+ <au:assertPropertyEquals name="object2" value="${object}"/>
- <property name="int2" value="${int}" />
- <au:assertPropertyEquals name="int2" value="${int}" />
+ <property name="int2" value="${int}"/>
+ <au:assertPropertyEquals name="int2" value="${int}"/>
</target>
<target name="testNull" depends="setUp" if="prereqs-ok">
<!-- demonstrate that a null value always implies a nonexistent property -->
<au:assertFalse>
- <isset property="null" />
+ <isset property="null"/>
</au:assertFalse>
</target>
<target name="testAvailable" depends="setUp" if="prereqs-ok">
<!-- verify the available task can set a non-string property -->
- <available file="${ant.file}" type="file" property="available.string" value="bc" />
- <au:assertPropertyEquals name="available.string" value="bc" />
- <available file="${ant.file}" type="file" property="available.object" value="${object}" />
- <au:assertPropertyEquals name="available.object" value="${OBJECT}" />
+ <available file="${ant.file}" type="file" property="available.string" value="bc"/>
+ <au:assertPropertyEquals name="available.string" value="bc"/>
+ <available file="${ant.file}" type="file" property="available.object" value="${object}"/>
+ <au:assertPropertyEquals name="available.object" value="${OBJECT}"/>
</target>
<target name="testCondition" depends="setUp" if="prereqs-ok">
<!-- verify the condition task can set a non-string property -->
<echo>$${ant.file}=${ant.file}</echo>
<condition property="condition.true.string">
- <available file="${ant.file}" type="file" />
+ <available file="${ant.file}" type="file"/>
</condition>
- <au:assertPropertyEquals name="condition.true.string" value="true" />
+ <au:assertPropertyEquals name="condition.true.string" value="true"/>
<condition property="condition.else.string" value="true" else="false">
- <not><available file="${ant.file}" type="file" /></not>
+ <not><available file="${ant.file}" type="file"/></not>
</condition>
- <au:assertPropertyEquals name="condition.else.string" value="false" />
+ <au:assertPropertyEquals name="condition.else.string" value="false"/>
<condition property="condition.true.object" value="${object}">
- <available file="${ant.file}" type="file" />
+ <available file="${ant.file}" type="file"/>
</condition>
- <au:assertPropertyEquals name="condition.true.object" value="${OBJECT}" />
+ <au:assertPropertyEquals name="condition.true.object" value="${OBJECT}"/>
<condition property="condition.else.int" value="${object}" else="${int}">
- <not><available file="${ant.file}" type="file" /></not>
+ <not><available file="${ant.file}" type="file"/></not>
</condition>
- <au:assertPropertyEquals name="condition.else.int" value="${INT}" />
+ <au:assertPropertyEquals name="condition.else.int" value="${INT}"/>
</target>
<target name="testEmbeddedNonString" if="prereqs-ok">
<!-- verify that a property embedded in a string is a substring -->
<au:assertTrue>
- <equals arg1="@${int}@" arg2="@1@" />
+ <equals arg1="@${int}@" arg2="@1@"/>
</au:assertTrue>
</target>
<target name="XtestLoadPropertiesWithObjects" if="prereqs-ok" depends="setUp">
<au:assertFalse>
- <isset property="object2" />
+ <isset property="object2"/>
</au:assertFalse>
- <string id="props" value="object2=$${object}" />
+ <string id="props" value="object2=$${object}"/>
<!-- verify the property is not yet expanded -->
<au:assertTrue>
<length length="17">
- <resource refid="props" />
+ <resource refid="props"/>
</length>
</au:assertTrue>
<loadproperties>
- <resource refid="props" />
+ <resource refid="props"/>
</loadproperties>
- <au:assertPropertyEquals name="object2" value="${object}" />
- <au:assertPropertyEquals name="object2" value="${OBJECT}" />
+ <au:assertPropertyEquals name="object2" value="${object}"/>
+ <au:assertPropertyEquals name="object2" value="${OBJECT}"/>
</target>
<target name="testLoadPropertiesWithStrings" if="prereqs-ok" depends="setUp">
<au:assertFalse>
- <isset property="string2" />
+ <isset property="string2"/>
</au:assertFalse>
- <string id="props" value="string2=$${string}" />
+ <string id="props" value="string2=$${string}"/>
<!-- verify the property is not yet expanded -->
<au:assertTrue>
<length length="17">
- <resource refid="props" />
+ <resource refid="props"/>
</length>
</au:assertTrue>
<loadproperties>
- <resource refid="props" />
+ <resource refid="props"/>
</loadproperties>
- <au:assertPropertyEquals name="string2" value="${string}" />
- <au:assertPropertyEquals name="string2" value="${STRING}" />
+ <au:assertPropertyEquals name="string2" value="${string}"/>
+ <au:assertPropertyEquals name="string2" value="${STRING}"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/replace-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/replace-test.xml b/src/tests/antunit/taskdefs/replace-test.xml
index e7aa118..382abd6 100644
--- a/src/tests/antunit/taskdefs/replace-test.xml
+++ b/src/tests/antunit/taskdefs/replace-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/taskdefs/rmic-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/rmic-test.xml b/src/tests/antunit/taskdefs/rmic-test.xml
index 67b4afc..1f0e42d 100644
--- a/src/tests/antunit/taskdefs/rmic-test.xml
+++ b/src/tests/antunit/taskdefs/rmic-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="-create-rmic-adapter">
<mkdir dir="${input}/org/example"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/secure-input.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/secure-input.xml b/src/tests/antunit/taskdefs/secure-input.xml
index ae0675e..6d51d39 100644
--- a/src/tests/antunit/taskdefs/secure-input.xml
+++ b/src/tests/antunit/taskdefs/secure-input.xml
@@ -17,16 +17,16 @@
-->
<project name="test-input" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
- <import file="../antunit-base.xml" />
+ <import file="../antunit-base.xml"/>
<target name="setUp">
</target>
<target name="test-secure-input">
<input message="secure-input:>" addproperty="the.password">
- <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
+ <handler classname="org.apache.tools.ant.input.SecureInputHandler"/>
</input>
- <au:assertPropertySet name="the.password" />
+ <au:assertPropertySet name="the.password"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/setpermissions-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/setpermissions-test.xml b/src/tests/antunit/taskdefs/setpermissions-test.xml
index 99b90e0..38a8116 100644
--- a/src/tests/antunit/taskdefs/setpermissions-test.xml
+++ b/src/tests/antunit/taskdefs/setpermissions-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}"/>
@@ -27,7 +27,7 @@
<target name="testRequiresNestedResources" depends="setUp">
<au:expectfailure expectedMessage="At least one resource-collection is required">
- <setpermissions mode="644" />
+ <setpermissions mode="644"/>
</au:expectfailure>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/signjar-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/signjar-test.xml b/src/tests/antunit/taskdefs/signjar-test.xml
index 8fff479..585940a 100644
--- a/src/tests/antunit/taskdefs/signjar-test.xml
+++ b/src/tests/antunit/taskdefs/signjar-test.xml
@@ -17,31 +17,31 @@
-->
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
- <import file="../antunit-base.xml" />
+ <import file="../antunit-base.xml"/>
- <property name="classes.dir" value="../../../../build/classes" />
- <property name="sign.dir" location="${output}" />
- <property name="subdir" location="${sign.dir}/subdir" />
- <property name="signtest.jar" location="${sign.dir}/signtest.jar" />
- <property name="subdirsigntest.jar" location="${subdir}/signtest.jar" />
- <property name="testkeystore" location="../../../etc/testcases/testkeystore" />
- <property name="testkeystore.pkcs12" location="${input}/testkeystore.pkcs12" />
+ <property name="classes.dir" value="../../../../build/classes"/>
+ <property name="sign.dir" location="${output}"/>
+ <property name="subdir" location="${sign.dir}/subdir"/>
+ <property name="signtest.jar" location="${sign.dir}/signtest.jar"/>
+ <property name="subdirsigntest.jar" location="${subdir}/signtest.jar"/>
+ <property name="testkeystore" location="../../../etc/testcases/testkeystore"/>
+ <property name="testkeystore.pkcs12" location="${input}/testkeystore.pkcs12"/>
<macrodef name="assertSigned">
- <attribute name="jar" default="${signtest.jar}" />
+ <attribute name="jar" default="${signtest.jar}"/>
<sequential>
<au:assertTrue message="not signed: @{jar}">
- <issigned file="@{jar}" />
+ <issigned file="@{jar}"/>
</au:assertTrue>
</sequential>
</macrodef>
<presetdef name="sign-base">
- <signjar alias="testonly" keystore="${testkeystore}" storepass="apacheant" />
+ <signjar alias="testonly" keystore="${testkeystore}" storepass="apacheant"/>
</presetdef>
<presetdef name="verify-base">
- <verifyjar keystore="${testkeystore}" storepass="apacheant" />
+ <verifyjar keystore="${testkeystore}" storepass="apacheant"/>
</presetdef>
<presetdef name="verify-base-pkcs12">
@@ -50,22 +50,22 @@
</presetdef>
<presetdef name="sign">
- <sign-base jar="${signtest.jar}" />
+ <sign-base jar="${signtest.jar}"/>
</presetdef>
<target name="setUp">
<mkdir dir="${input}"/>
<gunzip src="${testkeystore}.pkcs12.gz" dest="${testkeystore.pkcs12}"/>
- <mkdir dir="${sign.dir}" />
- <mkdir dir="${subdir}" />
+ <mkdir dir="${sign.dir}"/>
+ <mkdir dir="${subdir}"/>
</target>
<target name="jar" depends="setUp">
- <jar jarfile="${signtest.jar}" basedir="${classes.dir}" includes="**/Task.class" />
+ <jar jarfile="${signtest.jar}" basedir="${classes.dir}" includes="**/Task.class"/>
</target>
<target name="basic" depends="jar">
- <sign />
+ <sign/>
</target>
<target name="basic-pkcs12" depends="jar" unless="jdk9+" if="jdk1.7+">
@@ -73,23 +73,23 @@
</target>
<target name="testBasic" depends="basic">
- <assertSigned />
+ <assertSigned/>
</target>
<target name="testMaxmemory" depends="jar">
- <sign maxmemory="128m" />
- <assertSigned />
+ <sign maxmemory="128m"/>
+ <assertSigned/>
</target>
<target name="testPreserveLastModified" depends="jar">
- <touch file="${signtest.jar}" datetime="06/28/2000 2:02 pm" />
- <sign preservelastmodified="true" />
- <assertSigned />
+ <touch file="${signtest.jar}" datetime="06/28/2000 2:02 pm"/>
+ <sign preservelastmodified="true"/>
+ <assertSigned/>
<fail message="preserveLastModified did not preserve the last modified time">
<condition>
<not>
<isfileselected file="${signtest.jar}">
- <date datetime="06/28/2000 2:02 pm" when="equal" />
+ <date datetime="06/28/2000 2:02 pm" when="equal"/>
</isfileselected>
</not>
</condition>
@@ -98,22 +98,22 @@
<target name="testFileset" depends="jar">
<sign-base>
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</sign-base>
- <assertSigned />
+ <assertSigned/>
</target>
<target name="testFilesetAndJar" depends="jar">
<sign-base jar="${signtest.jar}" lazy="true">
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</sign-base>
- <assertSigned />
+ <assertSigned/>
</target>
<target name="testFilesetAndSignedJar" depends="jar">
<au:expectfailure expectedMessage="You cannot specify the signed JAR when using paths or filesets">
<sign-base signedjar="${sign.dir}/newfile.jar">
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</sign-base>
</au:expectfailure>
</target>
@@ -121,167 +121,167 @@
<target name="testPath" depends="jar">
<sign-base>
<path>
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</path>
</sign-base>
- <assertSigned />
+ <assertSigned/>
</target>
<target name="testPathAndJar" depends="jar">
<sign-base jar="${signtest.jar}" lazy="true">
<path>
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</path>
</sign-base>
- <assertSigned />
+ <assertSigned/>
</target>
<target name="testPathAndSignedJar" depends="jar">
<au:expectfailure expectedMessage="You cannot specify the signed JAR when using paths or filesets">
<sign-base signedjar="${sign.dir}/newfile.jar">
<path>
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</path>
</sign-base>
</au:expectfailure>
</target>
<target name="testSignedJar" depends="jar">
- <sign signedjar="${subdirsigntest.jar}" />
- <assertSigned jar="${subdirsigntest.jar}" />
+ <sign signedjar="${subdirsigntest.jar}"/>
+ <assertSigned jar="${subdirsigntest.jar}"/>
</target>
<target name="testDestDirAndSignedJar" depends="jar">
<au:expectfailure expectedMessage="'destdir' and 'signedjar' cannot both be set">
- <sign destDir="${subdir}" signedjar="${sign.dir}/newfile.jar" />
+ <sign destDir="${subdir}" signedjar="${sign.dir}/newfile.jar"/>
</au:expectfailure>
</target>
<target name="testDestDir" depends="jar">
- <sign destDir="${subdir}" />
- <assertSigned jar="${subdirsigntest.jar}" />
+ <sign destDir="${subdir}"/>
+ <assertSigned jar="${subdirsigntest.jar}"/>
</target>
<target name="testDestDirFileset" depends="jar">
<sign-base destDir="${subdir}">
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</sign-base>
- <assertSigned jar="${subdirsigntest.jar}" />
+ <assertSigned jar="${subdirsigntest.jar}"/>
</target>
<target name="testDestDirPath" depends="jar">
<sign-base destDir="${subdir}">
<path>
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</path>
</sign-base>
- <assertSigned jar="${subdirsigntest.jar}" />
+ <assertSigned jar="${subdirsigntest.jar}"/>
</target>
<target name="testMapperNoDest" depends="jar">
<au:expectfailure expectedMessage="The destDir attribute is required if a mapper is set">
<sign-base>
- <flattenmapper />
- <fileset file="${signtest.jar}" />
+ <flattenmapper/>
+ <fileset file="${signtest.jar}"/>
</sign-base>
</au:expectfailure>
</target>
<target name="testMapperFileset" depends="jar">
<sign-base destDir="${subdir}">
- <fileset file="${signtest.jar}" />
- <flattenmapper />
+ <fileset file="${signtest.jar}"/>
+ <flattenmapper/>
</sign-base>
- <assertSigned jar="${subdirsigntest.jar}" />
+ <assertSigned jar="${subdirsigntest.jar}"/>
</target>
<target name="testMapperPath" depends="jar">
<sign-base destDir="${subdir}">
<path>
- <pathelement location="${signtest.jar}" />
+ <pathelement location="${signtest.jar}"/>
</path>
- <flattenmapper />
+ <flattenmapper/>
</sign-base>
- <assertSigned jar="${subdirsigntest.jar}" />
+ <assertSigned jar="${subdirsigntest.jar}"/>
</target>
<target name="testTwoMappers" depends="jar">
<au:expectfailure expectedMessage="Too many mappers">
<sign-base destDir="${subdir}">
- <fileset file="${signtest.jar}" />
- <flattenmapper />
- <flattenmapper />
+ <fileset file="${signtest.jar}"/>
+ <flattenmapper/>
+ <flattenmapper/>
</sign-base>
</au:expectfailure>
</target>
<target name="testNoAlias" depends="jar">
<au:expectfailure expectedMessage="alias attribute must be set">
- <signjar keystore="${testkeystore}" jar="${signtest.jar}" storepass="apacheant" />
+ <signjar keystore="${testkeystore}" jar="${signtest.jar}" storepass="apacheant"/>
</au:expectfailure>
</target>
<target name="testNoFiles">
<au:expectfailure expectedMessage="jar must be set through jar attribute">
- <sign-base />
+ <sign-base/>
</au:expectfailure>
</target>
<target name="testNoStorePass" depends="jar">
<au:expectfailure expectedMessage="storepass attribute must be set">
- <signjar keystore="${testkeystore}" alias="testonly" jar="${signtest.jar}" />
+ <signjar keystore="${testkeystore}" alias="testonly" jar="${signtest.jar}"/>
</au:expectfailure>
</target>
<target name="testSysProperty" depends="jar">
<sign>
- <sysproperty key="ant.home" value="${ant.home}" />
+ <sysproperty key="ant.home" value="${ant.home}"/>
</sign>
- <assertSigned />
+ <assertSigned/>
</target>
<target name="testVerifyJar" depends="basic">
- <verify-base jar="${signtest.jar}" />
+ <verify-base jar="${signtest.jar}"/>
</target>
<target name="testVerifyJarPKCS12" depends="basic-pkcs12"
unless="jdk9+" if="jdk1.7+">
- <verify-base-pkcs12 jar="${signtest.jar}" />
+ <verify-base-pkcs12 jar="${signtest.jar}"/>
</target>
<target name="testVerifyJarCertificates" depends="basic">
- <verify-base jar="${signtest.jar}" certificates="true" verbose="true" />
+ <verify-base jar="${signtest.jar}" certificates="true" verbose="true"/>
</target>
<target name="testVerifyJarUnsigned" depends="jar">
<au:expectfailure expectedMessage="Failed to verify ${signtest.jar}">
- <verify-base jar="${signtest.jar}" />
+ <verify-base jar="${signtest.jar}"/>
</au:expectfailure>
</target>
<target name="NOtestVerifyJarNotInKeystore" depends="basic">
<au:expectfailure>
- <verifyjar jar="${signtest.jar}" certificates="true" verbose="true" />
+ <verifyjar jar="${signtest.jar}" certificates="true" verbose="true"/>
</au:expectfailure>
</target>
<target name="testVerifyFileset" depends="basic">
<verify-base>
- <fileset file="${signtest.jar}" />
+ <fileset file="${signtest.jar}"/>
</verify-base>
</target>
<target name="testVerifyPath" depends="basic">
<verify-base>
<path>
- <pathelement location="${signtest.jar}" />
+ <pathelement location="${signtest.jar}"/>
</path>
</verify-base>
</target>
<target name="testVerifyNoArgs">
<au:expectfailure expectedMessage="jar must be set through jar attribute">
- <verify-base />
+ <verify-base/>
</au:expectfailure>
</target>
@@ -296,4 +296,3 @@
</target>
</project>
-
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/subant-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/subant-test.xml b/src/tests/antunit/taskdefs/subant-test.xml
index 3bc4405..6269b92 100644
--- a/src/tests/antunit/taskdefs/subant-test.xml
+++ b/src/tests/antunit/taskdefs/subant-test.xml
@@ -20,17 +20,17 @@
<description>
Test that subant properly sets various properties
</description>
- <import file="../antunit-base.xml" />
+ <import file="../antunit-base.xml"/>
<target name="assertProperties">
- <au:assertPropertySet name="ant.version" />
- <au:assertPropertySet name="java.home" />
- <au:assertPropertySet name="java.class.path" />
+ <au:assertPropertySet name="ant.version"/>
+ <au:assertPropertySet name="java.home"/>
+ <au:assertPropertySet name="java.class.path"/>
</target>
<target name="testAntVersion">
<subant inheritall="false" target="assertProperties">
- <fileset file="${ant.file}" />
+ <fileset file="${ant.file}"/>
</subant>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/sync-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/sync-test.xml b/src/tests/antunit/taskdefs/sync-test.xml
index 21a1442..28bfe70 100644
--- a/src/tests/antunit/taskdefs/sync-test.xml
+++ b/src/tests/antunit/taskdefs/sync-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}/a"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/tar-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/tar-test.xml b/src/tests/antunit/taskdefs/tar-test.xml
index d83b5f9..06796ae 100644
--- a/src/tests/antunit/taskdefs/tar-test.xml
+++ b/src/tests/antunit/taskdefs/tar-test.xml
@@ -19,18 +19,18 @@
<project name="tar-test" default="antunit"
xmlns:cond="antlib:org.apache.tools.ant.types.conditions"
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}" />
+ <mkdir dir="${input}"/>
+ <mkdir dir="${output}"/>
<available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
</target>
<target name="testTarFilesetHandlesFilesetReferences" depends="setUp">
- <fileset id="xml.fileset" dir="." includes="*.xml" />
+ <fileset id="xml.fileset" dir="." includes="*.xml"/>
<tar destfile="${output}/testtar.tar">
- <tarfileset prefix="pre" refid="xml.fileset" />
+ <tarfileset prefix="pre" refid="xml.fileset"/>
</tar>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index a201603..da23f8c 100644
--- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
@@ -16,30 +16,30 @@
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}/org/example" />
- <property name="tmpdir" location="../../../../build/antunit/taskdef" />
- <mkdir dir="${tmpdir}" />
+ <mkdir dir="${input}/org/example"/>
+ <property name="tmpdir" location="../../../../build/antunit/taskdef"/>
+ <mkdir dir="${tmpdir}"/>
<echo file="${input}/org/example/antlib.xml">
<![CDATA[<antlib xmlns:e="ant:current">
<macrodef name="echoo" backtrace="false">
- <attribute name="message" />
+ <attribute name="message"/>
<sequential>
- <echo message="@{message}@{message}" />
+ <echo message="@{message}@{message}"/>
</sequential>
</macrodef>
<macrodef name="echoooo" backtrace="false">
- <attribute name="message" />
+ <attribute name="message"/>
<sequential>
- <e:echoo message="@{message}@{message}" />
+ <e:echoo message="@{message}@{message}"/>
</sequential>
</macrodef>
</antlib>]]>
</echo>
<jar destfile="${test.jar}">
- <fileset dir="${input}" />
+ <fileset dir="${input}"/>
</jar>
<sleep seconds="1"/>
</target>
@@ -47,16 +47,16 @@
<target name="testAntlib" depends="setUp">
<taskdef classpath="${test.jar}" uri="antlib:org.example"
loaderref="loader1"/>
- <echoooo xmlns="antlib:org.example" message="exemple" />
- <au:assertLogContains text="exempleexempleexempleexemple" />
+ <echoooo xmlns="antlib:org.example" message="exemple"/>
+ <au:assertLogContains text="exempleexempleexempleexemple"/>
</target>
<target name="testURI" depends="setUp">
<taskdef classpath="${test.jar}" uri="urn:my:exemple"
loaderref="loader2"
- resource="org/example/antlib.xml" />
- <echoooo xmlns="urn:my:exemple" message="exemple" />
- <au:assertLogContains text="exempleexempleexempleexemple" />
+ resource="org/example/antlib.xml"/>
+ <echoooo xmlns="urn:my:exemple" message="exemple"/>
+ <au:assertLogContains text="exempleexempleexempleexemple"/>
</target>
</project>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/taskdef-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/taskdef-test.xml b/src/tests/antunit/taskdefs/taskdef-test.xml
index 976872d..e50f487 100644
--- a/src/tests/antunit/taskdefs/taskdef-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-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}/org/example"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/tempfile-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/tempfile-test.xml b/src/tests/antunit/taskdefs/tempfile-test.xml
index 1132007..46a9a31 100644
--- a/src/tests/antunit/taskdefs/tempfile-test.xml
+++ b/src/tests/antunit/taskdefs/tempfile-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="tearDown" depends="antunit-base.tearDown">
<delete file="${tmp}" quiet="true"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/touch-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/touch-test.xml b/src/tests/antunit/taskdefs/touch-test.xml
index a9327ed..10a999b 100644
--- a/src/tests/antunit/taskdefs/touch-test.xml
+++ b/src/tests/antunit/taskdefs/touch-test.xml
@@ -20,14 +20,14 @@
<target name="test-no-child">
<au:expectfailure>
- <touch />
+ <touch/>
</au:expectfailure>
</target>
<target name="test-no-match">
<touch>
<fileset file="${ant.file}">
- <filename name="IDONOTMATCH" />
+ <filename name="IDONOTMATCH"/>
</fileset>
</touch>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/tests/antunit/taskdefs/truncate/truncate-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/truncate/truncate-test.xml b/src/tests/antunit/taskdefs/truncate/truncate-test.xml
index 86f896c..717df99 100644
--- a/src/tests/antunit/taskdefs/truncate/truncate-test.xml
+++ b/src/tests/antunit/taskdefs/truncate/truncate-test.xml
@@ -20,98 +20,98 @@
<target name="default">
<au:antunit>
- <file file="${ant.file}" />
+ <file file="${ant.file}"/>
</au:antunit>
</target>
<target name="tearDown">
- <delete file="foo" />
- <delete file="bar" />
- <delete dir="baz" />
+ <delete file="foo"/>
+ <delete file="bar"/>
+ <delete dir="baz"/>
</target>
<target name="test-basic">
- <truncate file="foo" />
+ <truncate file="foo"/>
<au:assertTrue>
- <length file="foo" length="0" />
+ <length file="foo" length="0"/>
</au:assertTrue>
</target>
<target name="test-explicit">
- <truncate file="foo" length="1034" />
+ <truncate file="foo" length="1034"/>
<au:assertTrue>
- <length file="foo" length="1034" />
+ <length file="foo" length="1034"/>
</au:assertTrue>
</target>
<target name="test-extend">
- <truncate file="foo" length="5" />
+ <truncate file="foo" length="5"/>
<au:assertTrue>
- <length file="foo" length="5" />
+ <length file="foo" length="5"/>
</au:assertTrue>
- <truncate file="foo" adjust="5" />
+ <truncate file="foo" adjust="5"/>
<au:assertTrue>
- <length file="foo" length="10" />
+ <length file="foo" length="10"/>
</au:assertTrue>
</target>
<target name="test-truncate">
- <truncate file="foo" length="5" />
+ <truncate file="foo" length="5"/>
<au:assertTrue>
- <length file="foo" length="5" />
+ <length file="foo" length="5"/>
</au:assertTrue>
- <truncate file="foo" adjust="-5" />
+ <truncate file="foo" adjust="-5"/>
<au:assertTrue>
- <length file="foo" length="0" />
+ <length file="foo" length="0"/>
</au:assertTrue>
</target>
<target name="test-bigger">
- <truncate file="foo" length="1K" />
+ <truncate file="foo" length="1K"/>
<au:assertTrue>
<and>
- <length file="foo" length="1K" />
- <length file="foo" length="1024" />
+ <length file="foo" length="1K"/>
+ <length file="foo" length="1024"/>
</and>
</au:assertTrue>
</target>
<target name="truncate-bigger">
- <truncate file="foo" length="3K" />
+ <truncate file="foo" length="3K"/>
<au:assertTrue>
- <length file="foo" length="3K" />
+ <length file="foo" length="3K"/>
</au:assertTrue>
- <truncate file="foo" adjust="-2K" />
+ <truncate file="foo" adjust="-2K"/>
<au:assertTrue>
- <length file="foo" length="1K" />
+ <length file="foo" length="1K"/>
</au:assertTrue>
</target>
<target name="test-no-create">
- <au:assertFileDoesntExist file="foo" />
- <truncate file="foo" create="false" length="0" />
- <au:assertFileDoesntExist file="foo" />
+ <au:assertFileDoesntExist file="foo"/>
+ <truncate file="foo" create="false" length="0"/>
+ <au:assertFileDoesntExist file="foo"/>
</target>
<target name="test-mkdirs">
- <au:assertFileDoesntExist file="baz" />
- <truncate file="baz/foo" mkdirs="true" length="0" />
+ <au:assertFileDoesntExist file="baz"/>
+ <truncate file="baz/foo" mkdirs="true" length="0"/>
<au:assertTrue>
- <length file="baz/foo" length="0" />
+ <length file="baz/foo" length="0"/>
</au:assertTrue>
</target>
<target name="test-rc">
<truncate length="10">
<resources>
- <file file="foo" />
- <file file="bar" />
+ <file file="foo"/>
+ <file file="bar"/>
</resources>
</truncate>
<au:assertTrue>
<and>
- <length file="foo" length="10" />
- <length file="bar" length="10" />
+ <length file="foo" length="10"/>
+ <length file="bar" length="10"/>
</and>
</au:assertTrue>
</target>
@@ -119,26 +119,26 @@
<target name="test-bad-resource">
<au:expectfailure>
<truncate length="1P">
- <string value="blah" />
+ <string value="blah"/>
</truncate>
</au:expectfailure>
</target>
<target name="test-invalid-attrs">
<au:expectfailure>
- <truncate file="foo" length="0" adjust="0" />
+ <truncate file="foo" length="0" adjust="0"/>
</au:expectfailure>
</target>
<target name="test-bad-length">
<au:expectfailure>
- <truncate file="foo" length="-1P" />
+ <truncate file="foo" length="-1P"/>
</au:expectfailure>
</target>
<target name="test-no-files">
<au:expectfailure>
- <truncate length="0" />
+ <truncate length="0"/>
</au:expectfailure>
</target>