http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/depend.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/depend.xml b/src/etc/testcases/taskdefs/optional/depend/depend.xml index 26260a7..2eb39c5 100644 --- a/src/etc/testcases/taskdefs/optional/depend/depend.xml +++ b/src/etc/testcases/taskdefs/optional/depend/depend.xml @@ -24,7 +24,7 @@ <property name="classes.dir" value="${output}/classes"/> <target name="setUp"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> </target> @@ -105,17 +105,17 @@ <condition> <not> <and> - <resourcecount count="2" refid="result" /> + <resourcecount count="2" refid="result"/> <resourcecount count="1"> <intersect> - <resources refid="result" /> - <file file="${classes.dir}/B.class" /> + <resources refid="result"/> + <file file="${classes.dir}/B.class"/> </intersect> </resourcecount> <resourcecount count="1"> <intersect> - <resources refid="result" /> - <file file="${classes.dir}/C.class" /> + <resources refid="result"/> + <file file="${classes.dir}/C.class"/> </intersect> </resourcecount> </and> @@ -159,7 +159,7 @@ <target name="testmethodparaminner" depends="src4setup, compile"> <classfileset id="result" dir="${classes.dir}" rootclass="test.MethodParam"/> - </target> + </target> <target name="testnosource" depends="src1setup, compile"> <depend destdir="${classes.dir}" closure="yes"/> @@ -176,7 +176,7 @@ </path> <javac srcdir="${tempsrc.dir}" destdir="${classes.dir}" - classpathref="path.compile" fork="false" /> + classpathref="path.compile" fork="false"/> <depend srcdir="${tempsrc.dir}" destdir="${classes.dir}" closure="yes" dump="yes" @@ -186,9 +186,9 @@ </target> <target name="testcache" depends="src1setup, compile"> - <depend cache="${cache.dir}" srcdir="${tempsrc.dir}" + <depend cache="${cache.dir}" srcdir="${tempsrc.dir}" destdir="${classes.dir}" closure="yes"/> - <depend cache="${cache.dir}" srcdir="${tempsrc.dir}" + <depend cache="${cache.dir}" srcdir="${tempsrc.dir}" destdir="${classes.dir}" closure="yes"/> </target>
http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src1/A.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/A.java b/src/etc/testcases/taskdefs/optional/depend/src1/A.java index dc6df23..b7452c7 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src1/A.java +++ b/src/etc/testcases/taskdefs/optional/depend/src1/A.java @@ -17,4 +17,3 @@ limitations under the License. public class A extends B { private D d = new D(); } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src1/B.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/B.java b/src/etc/testcases/taskdefs/optional/depend/src1/B.java index 4be51f7..86abefd 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src1/B.java +++ b/src/etc/testcases/taskdefs/optional/depend/src1/B.java @@ -16,4 +16,3 @@ limitations under the License. */ public class B extends C { } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src1/C.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/C.java b/src/etc/testcases/taskdefs/optional/depend/src1/C.java index d2bfca9..766c9bb 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src1/C.java +++ b/src/etc/testcases/taskdefs/optional/depend/src1/C.java @@ -16,4 +16,3 @@ limitations under the License. */ public class C { } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src1/D.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/D.java b/src/etc/testcases/taskdefs/optional/depend/src1/D.java index 127de57..81f4545 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src1/D.java +++ b/src/etc/testcases/taskdefs/optional/depend/src1/D.java @@ -16,4 +16,3 @@ limitations under the License. */ public class D { } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src1/E.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src1/E.java b/src/etc/testcases/taskdefs/optional/depend/src1/E.java index 0efd613..4f4834f 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src1/E.java +++ b/src/etc/testcases/taskdefs/optional/depend/src1/E.java @@ -19,4 +19,3 @@ public class E { System.out.println(A.class); } } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src2/A.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/A.java b/src/etc/testcases/taskdefs/optional/depend/src2/A.java index 02b35be..a9a07fa 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src2/A.java +++ b/src/etc/testcases/taskdefs/optional/depend/src2/A.java @@ -18,4 +18,3 @@ public class A { static private class Inner extends B { } } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src2/B.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src2/B.java b/src/etc/testcases/taskdefs/optional/depend/src2/B.java index bc7b7d2..0811180 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src2/B.java +++ b/src/etc/testcases/taskdefs/optional/depend/src2/B.java @@ -16,4 +16,3 @@ limitations under the License. */ public class B { } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src3/A.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src3/A.java b/src/etc/testcases/taskdefs/optional/depend/src3/A.java index 1d973b1..ae2c6a2 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src3/A.java +++ b/src/etc/testcases/taskdefs/optional/depend/src3/A.java @@ -20,4 +20,3 @@ public class A { } } } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src3/B.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src3/B.java b/src/etc/testcases/taskdefs/optional/depend/src3/B.java index bc7b7d2..0811180 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src3/B.java +++ b/src/etc/testcases/taskdefs/optional/depend/src3/B.java @@ -16,4 +16,3 @@ limitations under the License. */ public class B { } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java b/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java index 276f016..3c88ed3 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java +++ b/src/etc/testcases/taskdefs/optional/depend/src4/test/MethodParam.java @@ -21,4 +21,3 @@ public class MethodParam { System.out.print(ContainsOnlyInner.class); } } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java b/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java index 0b70900..c2491f7 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java +++ b/src/etc/testcases/taskdefs/optional/depend/src4/test/Outer.java @@ -20,4 +20,3 @@ public class Outer { static class Inner { } } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/depend/src5/B.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/depend/src5/B.java b/src/etc/testcases/taskdefs/optional/depend/src5/B.java index bc7b7d2..0811180 100644 --- a/src/etc/testcases/taskdefs/optional/depend/src5/B.java +++ b/src/etc/testcases/taskdefs/optional/depend/src5/B.java @@ -16,4 +16,3 @@ limitations under the License. */ public class B { } - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/echoproperties.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/echoproperties.xml b/src/etc/testcases/taskdefs/optional/echoproperties.xml index 7b1b8bb..26df2d5 100644 --- a/src/etc/testcases/taskdefs/optional/echoproperties.xml +++ b/src/etc/testcases/taskdefs/optional/echoproperties.xml @@ -21,12 +21,12 @@ </target> <target name="setup"> - <property name="a.set" value="true" /> - <property name="b.set" value="false" /> + <property name="a.set" value="true"/> + <property name="b.set" value="false"/> </target> <target name="testEchoToLog" depends="setup"> - <echoproperties /> + <echoproperties/> </target> <target name="testEchoWithEmptyPrefixToLog" depends="setup"> @@ -34,55 +34,55 @@ </target> <target name="testEchoToLogXml" depends="setup"> - <echoproperties format="xml" /> + <echoproperties format="xml"/> </target> <target name="testReadAndEchoToLog" depends="setup"> - <echoproperties srcfile="echoproperties.properties" /> + <echoproperties srcfile="echoproperties.properties"/> </target> <target name="testReadBadFile" depends="setup"> - <echoproperties srcfile="." /> + <echoproperties srcfile="."/> </target> <target name="testReadBadFileFail" depends="setup"> - <echoproperties srcfile="." failonerror="yes" /> + <echoproperties srcfile="." failonerror="yes"/> </target> <target name="testReadBadFileNoFail" depends="setup"> - <echoproperties srcfile="." failonerror="no" /> + <echoproperties srcfile="." failonerror="no"/> </target> <target name="testEchoToBadFile" depends="setup"> - <echoproperties destfile="." /> + <echoproperties destfile="."/> </target> <target name="testEchoToBadFileFail" depends="setup"> - <echoproperties destfile="." failonerror="yes" /> + <echoproperties destfile="." failonerror="yes"/> </target> <target name="testEchoToBadFileNoFail" depends="setup"> - <echoproperties destfile="." failonerror="no" /> + <echoproperties destfile="." failonerror="no"/> </target> <target name="testEchoToGoodFile" depends="setup"> - <echoproperties destfile="test.properties" /> + <echoproperties destfile="test.properties"/> </target> <target name="testEchoToGoodFileXml" depends="setup"> - <echoproperties destfile="test.xml" format="xml" /> + <echoproperties destfile="test.xml" format="xml"/> </target> <target name="testEchoToGoodFileFail" depends="setup"> - <echoproperties destfile="test.properties" failonerror="yes" /> + <echoproperties destfile="test.properties" failonerror="yes"/> </target> <target name="testEchoToGoodFileNoFail" depends="setup"> - <echoproperties destfile="test.properties" failonerror="no" /> + <echoproperties destfile="test.properties" failonerror="no"/> </target> <target name="testEchoPrefix" depends="setup"> - <echoproperties destfile="test-prefix.properties" prefix="a." /> + <echoproperties destfile="test-prefix.properties" prefix="a."/> </target> <target name="testEchoPrefixAsPropertyset" depends="setup"> @@ -124,10 +124,9 @@ </target> <target name="cleanup"> - <delete file="test.properties" failonerror="no" /> - <delete file="test-prefix.properties" failonerror="no" /> - <delete file="test.xml" failonerror="no" /> + <delete file="test.properties" failonerror="no"/> + <delete file="test-prefix.properties" failonerror="no"/> + <delete file="test.xml" failonerror="no"/> </target> </project> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml b/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml index e6debd5..a1249d3 100644 --- a/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml +++ b/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml @@ -41,4 +41,3 @@ </translate> </target> </project> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/javah/build.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/javah/build.xml b/src/etc/testcases/taskdefs/optional/javah/build.xml index ea70b9e..c95d2ad 100644 --- a/src/etc/testcases/taskdefs/optional/javah/build.xml +++ b/src/etc/testcases/taskdefs/optional/javah/build.xml @@ -42,7 +42,7 @@ </classpath> </javah> </target> - + <target name="test-fileset" depends="compile"> <javah destdir="${output}"> <fileset dir="${output}"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml b/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml index 8418226..bf043cd 100644 --- a/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml +++ b/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml @@ -17,18 +17,18 @@ --> <project> <property name="testclasses" location="../../../../../../build/testcases"/> - + <path id="all-test-classes.id"> - <pathelement location="../../../../build/testcases" /> - <pathelement path="${java.class.path}" /> + <pathelement location="../../../../build/testcases"/> + <pathelement path="${java.class.path}"/> </path> <path id="example-classes.id"> - <pathelement location="${testclasses}/org/apache/tools/ant/util/facade" /> + <pathelement location="${testclasses}/org/apache/tools/ant/util/facade"/> </path> <path id="test-classes.id"> - <pathelement location="${testclasses}" /> + <pathelement location="${testclasses}"/> </path> <target name="simple"> @@ -67,4 +67,4 @@ </jdepend> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/junit.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/junit.xml b/src/etc/testcases/taskdefs/optional/junit.xml index 40bfda6..2cae4b9 100644 --- a/src/etc/testcases/taskdefs/optional/junit.xml +++ b/src/etc/testcases/taskdefs/optional/junit.xml @@ -20,75 +20,75 @@ <import file="../../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> </target> - <property name="showoutput" value="false" /> + <property name="showoutput" value="false"/> <path id="test"> - <pathelement path="${java.class.path}" /> - <pathelement location="../../../../../build/testcases" /> + <pathelement path="${java.class.path}"/> + <pathelement location="../../../../../build/testcases"/> </path> <target name="testForkedOutput"> - <junit fork="yes" haltonerror="true" haltonfailure="true" + <junit fork="yes" haltonerror="true" haltonfailure="true" showoutput="${showoutput}"> - <test name="org.example.junit.Output" /> - <classpath refid="test" /> + <test name="org.example.junit.Output"/> + <classpath refid="test"/> </junit> </target> <target name="testNonForkedOutput"> <junit fork="false" haltonerror="true" haltonfailure="true" showoutput="${showoutput}"> - <test name="org.example.junit.Output" /> - <classpath refid="test" /> + <test name="org.example.junit.Output"/> + <classpath refid="test"/> </junit> </target> <target name="testForkedThreadedOutput"> <junit fork="yes" haltonerror="true" haltonfailure="true" showoutput="${showoutput}"> - <test name="org.example.junit.ThreadedOutput" /> - <classpath refid="test" /> + <test name="org.example.junit.ThreadedOutput"/> + <classpath refid="test"/> </junit> </target> <target name="testNonForkedThreadedOutput"> <junit fork="false" haltonerror="true" haltonfailure="true" showoutput="${showoutput}"> - <test name="org.example.junit.ThreadedOutput" /> - <classpath refid="test" /> + <test name="org.example.junit.ThreadedOutput"/> + <classpath refid="test"/> </junit> </target> - <target name="outputTests" - depends="testForkedOutput,testNonForkedOutput,testForkedThreadedOutput,testNonForkedThreadedOutput" /> + <target name="outputTests" + depends="testForkedOutput,testNonForkedOutput,testForkedThreadedOutput,testNonForkedThreadedOutput"/> <target name="crash"> <junit fork="true" errorproperty="crashed"> <test name="org.apache.tools.ant.taskdefs.optional.junit.VmCrash"/> - <classpath refid="test" /> + <classpath refid="test"/> </junit> </target> <target name="nocrash"> <junit fork="true" errorproperty="crashed"> <test name="org.apache.tools.ant.taskdefs.optional.junit.NoVmCrash"/> - <classpath refid="test" /> + <classpath refid="test"/> </junit> </target> <target name="timeout"> <junit fork="true" errorproperty="timeout" timeout="1000"> <test name="org.apache.tools.ant.taskdefs.optional.junit.Sleeper"/> - <classpath refid="test" /> + <classpath refid="test"/> </junit> </target> <target name="notimeout"> <junit fork="true" errorproperty="timeout" timeout="15000"> <test name="org.apache.tools.ant.taskdefs.optional.junit.Sleeper"/> - <classpath refid="test" /> + <classpath refid="test"/> </junit> </target> @@ -200,7 +200,7 @@ } </echo> <echo file="${tmp.dir}/org/D.java"> - package org; + package org; import junit.framework.*; public class D extends TestCase { public D(String s) { super(s); } @@ -210,7 +210,7 @@ <javac srcdir="${tmp.dir}" destdir="${tmp.dir}"/> </target> - <target name="failureRecorder.internal"> + <target name="failureRecorder.internal"> <property name="tmp.dir" value="${output}"/> <delete> <fileset dir="${tmp.dir}" includes="FailedTests*.class"/> @@ -218,7 +218,7 @@ <!-- compile the FailedTests class if present --> <javac srcdir="${tmp.dir}" destdir="${tmp.dir}"/> <available file="${tmp.dir}/FailedTests.class" property="hasFailingTests"/> - + <property name="ant.junit.failureCollector" value="${tmp.dir}/FailedTests"/> <junit haltonerror="false" haltonfailure="false"> <classpath> @@ -232,22 +232,21 @@ <formatter type="plain" usefile="false"/> </batchtest> <test name="FailedTests" if="hasFailingTests" todir="${tmp.dir}"> - <!-- update the FailingTests.java --> + <!-- update the FailingTests.java --> <formatter type="failure"/> <!-- again, I want to see something --> <formatter type="plain" usefile="false"/> </test> </junit> </target> - + <target name="failureRecorder.runtest"> <ant target="failureRecorder.internal" - antfile="junit.xml" + antfile="junit.xml" inheritAll="false" - inheritRefs="false" - /> + inheritRefs="false"/> </target> - + <target name="failureRecorder.fixing"> <property name="tmp.dir" value="${output}"/> <echo file="${tmp.dir}/A.java"> @@ -260,7 +259,7 @@ } </echo> </target> - + <!-- Bugzilla Issue 45411 --> <target name="testMultilineAssertsNoFork"> <junit> @@ -281,14 +280,14 @@ <target name="testSkippableTests"> <mkdir dir="${output}"/> <junit> - <formatter type="xml"/> - <classpath refid="test"/> - <batchtest todir="${output}"> - <fileset dir="../../../../tests/junit"> - <include name="org/example/junit/JUnit4Skippable.java"/> - <!-- tests remove out-dir on tearDown --> - </fileset> - </batchtest> + <formatter type="xml"/> + <classpath refid="test"/> + <batchtest todir="${output}"> + <fileset dir="../../../../tests/junit"> + <include name="org/example/junit/JUnit4Skippable.java"/> + <!-- tests remove out-dir on tearDown --> + </fileset> + </batchtest> </junit> </target> @@ -296,15 +295,15 @@ <!-- Skipping classes that are not tests --> <target name="testNonTests"> <mkdir dir="${output}"/> - <junit> - <formatter type="xml"/> - <classpath refid="test"/> - <batchtest todir="${output}" skipNonTests="true"> - <fileset dir="../../../../tests/junit"> - <include name="org/example/junit/*Missed.java"/> - <!-- tests remove out-dir on tearDown --> - </fileset> - </batchtest> + <junit> + <formatter type="xml"/> + <classpath refid="test"/> + <batchtest todir="${output}" skipNonTests="true"> + <fileset dir="../../../../tests/junit"> + <include name="org/example/junit/*Missed.java"/> + <!-- tests remove out-dir on tearDown --> + </fileset> + </batchtest> </junit> </target> @@ -323,7 +322,7 @@ </junit> </target> - <target name="testTestMethods" > + <target name="testTestMethods"> <property name="tmp.dir" value="${output}"/> <echo file="${tmp.dir}/T1.java">public class T1 extends junit.framework.TestCase { @@ -346,25 +345,25 @@ </javac> <junit fork="false" printsummary="true" haltonerror="true"> <classpath> - <pathelement location="${tmp.dir}" /> - <path refid="test" /> + <pathelement location="${tmp.dir}"/> + <path refid="test"/> </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="testCheckForkedPath"> - <property name="includeantruntime" value="yes" /> + <property name="includeantruntime" value="yes"/> <!-- duplicate the Ant classes into a jar --> - <jar destfile="${output}/ant.jar" basedir="${antclasses}" /> + <jar destfile="${output}/ant.jar" basedir="${antclasses}"/> <junit fork="yes" haltonerror="true" haltonfailure="true" showoutput="${showoutput}" includeantruntime="${includeantruntime}"> - <test name="org.example.junit.Output" /> + <test name="org.example.junit.Output"/> <classpath> - <pathelement location="../../../../../build/testcases" /> - <pathelement location="${junitjar}" /> - <pathelement location="${output}/ant.jar" /> + <pathelement location="../../../../../build/testcases"/> + <pathelement location="${junitjar}"/> + <pathelement location="${output}/ant.jar"/> </classpath> </junit> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml b/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml index abb6a41..0b9b7a1 100644 --- a/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml +++ b/src/etc/testcases/taskdefs/optional/junit/teardownlistener.xml @@ -18,8 +18,8 @@ <project> <path id="test"> - <pathelement path="${java.class.path}" /> - <pathelement location="../../../../../../build/testcases" /> + <pathelement path="${java.class.path}"/> + <pathelement location="../../../../../../build/testcases"/> </path> <target name="testNoTeardown"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/junitlauncher.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/junitlauncher.xml b/src/etc/testcases/taskdefs/optional/junitlauncher.xml index ccae7ae..d0b19b3 100644 --- a/src/etc/testcases/taskdefs/optional/junitlauncher.xml +++ b/src/etc/testcases/taskdefs/optional/junitlauncher.xml @@ -110,4 +110,3 @@ </junitlauncher> </target> </project> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/junitreport.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/junitreport.xml b/src/etc/testcases/taskdefs/optional/junitreport.xml index 6080662..05f8066 100644 --- a/src/etc/testcases/taskdefs/optional/junitreport.xml +++ b/src/etc/testcases/taskdefs/optional/junitreport.xml @@ -21,7 +21,7 @@ <import file="../../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> </target> @@ -182,8 +182,7 @@ </junitreport> <concat> <fileset file="${output}/html/index.html"/> - </concat> + </concat> </target> </project> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/native2ascii/build.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/native2ascii/build.xml b/src/etc/testcases/taskdefs/optional/native2ascii/build.xml index 27b4031..49b8dcb 100644 --- a/src/etc/testcases/taskdefs/optional/native2ascii/build.xml +++ b/src/etc/testcases/taskdefs/optional/native2ascii/build.xml @@ -35,4 +35,3 @@ src="${in}" includes="iso8859-1.*"/> </target> </project> - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/net/ftp.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/net/ftp.xml b/src/etc/testcases/taskdefs/optional/net/ftp.xml index aaf4b8e..3a25e4b 100644 --- a/src/etc/testcases/taskdefs/optional/net/ftp.xml +++ b/src/etc/testcases/taskdefs/optional/net/ftp.xml @@ -21,8 +21,8 @@ <property file="${env.HOME}/ant-ftp.properties"/> <property name="ftp.user" value="${user.name}"/> <property name="ftp.host" value="localhost"/> - <property name="ftp.port" value="21" /> - <property name="ftp.password" value="sunshine" /> + <property name="ftp.port" value="21"/> + <property name="ftp.password" value="sunshine"/> <property name="ftp.filesep" value="/"/> <property name="tmp.dir" location="tmp"/> <property name="tmp.get.dir" location="tmp.get"/> @@ -36,7 +36,7 @@ <fileset dir="${tmp.get.dir}" id="fileset-destination-with-selector"> <include name="alpha/**"/> - <filename name="**/alpha.xml" /> + <filename name="**/alpha.xml"/> </fileset> <fileset dir="${tmp.dir}" id="fileset-source-without-selector"> <include name="alpha/**"/> @@ -69,11 +69,11 @@ <target name="ftp-get-with-selector"> <ftp action="get" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.dir}"> + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.dir}"> <fileset refid="fileset-destination-with-selector"/> </ftp> </target> @@ -93,23 +93,21 @@ </target> <target name="ftp-get-directory-symbolic-link" depends="symlink-setup"> <ftp action="get" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.dir}" - > + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.dir}"> <fileset refid="fileset-destination-followsymlinks"/> </ftp> </target> <target name="ftp-get-directory-no-symbolic-link" depends="symlink-setup"> <ftp action="get" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.dir}" - > + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.dir}"> <fileset refid="fileset-destination-nofollowsymlinks"/> </ftp> </target> @@ -132,27 +130,26 @@ </fileset> </ftp> <ftp action="rmdir" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - remotedir="${tmp.dir}"> + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + remotedir="${tmp.dir}"> <fileset dir="${tmp.get.dir}"> <include name="**"/> </fileset> </ftp> - </target> + </target> <target name="timed.test.setup"> <touch> <filelist refid="timed-files"/> - </touch> + </touch> <ftp action="put" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - > + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}"> <fileset dir="${tmp.local}"> <patternset refid="timed-test-files"/> </fileset> @@ -170,14 +167,13 @@ </fileset> </touch> <ftp action="put" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - newer="true" - serverTimeZoneConfig="${ftp.server.timezone}" - > + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + newer="true" + serverTimeZoneConfig="${ftp.server.timezone}"> <fileset dir="${tmp.local}"> <patternset refid="timed-test-files"/> </fileset> @@ -196,121 +192,112 @@ </fileset> </touch> <ftp action="get" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - preservelastmodified="true" - newer="true" - serverTimeZoneConfig="${ftp.server.timezone}" - > + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + preservelastmodified="true" + newer="true" + serverTimeZoneConfig="${ftp.server.timezone}"> <fileset dir="${tmp.local}"> <patternset refid="timed-test-files"/> </fileset> </ftp> </target> - + <target name="configuration.1"> <ftp action="list" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - serverTimeZoneConfig="${ftp.server.timezone}" - listing="${ftp.listing.file}" - > - <fileset dir="${tmp.local}"/> - </ftp> + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + serverTimeZoneConfig="${ftp.server.timezone}" + listing="${ftp.listing.file}"> + <fileset dir="${tmp.local}"/> + </ftp> </target> <target name="configuration.2"> <ftp action="list" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - serverTimeZoneConfig="${ftp.server.timezone}" - listing="${ftp.listing.file}" - systemTypeKey="WINDOWS" - > - <fileset dir="${tmp.local}"/> - </ftp> + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + serverTimeZoneConfig="${ftp.server.timezone}" + listing="${ftp.listing.file}" + systemTypeKey="WINDOWS"> + <fileset dir="${tmp.local}"/> + </ftp> </target> <target name="configuration.3"> <ftp action="list" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - defaultDateFormatConfig="yyyy/MM/dd HH:mm" - listing="${ftp.listing.file}" - systemTypeKey="UNIX" - > - <fileset dir="${tmp.local}"/> - </ftp> + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + defaultDateFormatConfig="yyyy/MM/dd HH:mm" + listing="${ftp.listing.file}" + systemTypeKey="UNIX"> + <fileset dir="${tmp.local}"/> + </ftp> </target> <target name="configuration.lang.good"> <ftp action="list" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - serverLanguageCodeConfig="de" - listing="${ftp.listing.file}" - > - <fileset dir="${tmp.local}"/> - </ftp> - </target> + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + serverLanguageCodeConfig="de" + listing="${ftp.listing.file}"> + <fileset dir="${tmp.local}"/> + </ftp> + </target> <target name="configuration.lang.bad"> <ftp action="list" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - serverLanguageCodeConfig="QQ" - listing="${ftp.listing.file}" - > - <fileset dir="${tmp.local}"/> - </ftp> - </target> + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + serverLanguageCodeConfig="QQ" + listing="${ftp.listing.file}"> + <fileset dir="${tmp.local}"/> + </ftp> + </target> <target name="configuration.none"> <ftp action="list" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - listing="${ftp.listing.file}" - > - <fileset dir="${tmp.local}"/> - </ftp> + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + listing="${ftp.listing.file}"> + <fileset dir="${tmp.local}"/> + </ftp> </target> <target name="ftp-get-with-selector-retryable"> <ftp action="get" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.dir}" - retriesAllowed="${ftp.retries}" - > + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.dir}" + retriesAllowed="${ftp.retries}"> <fileset refid="fileset-destination-with-selector"/> </ftp> </target> <target name="test-initial-command"> <ftp action="put" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - initialSiteCommand="umask 222" - > + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + initialSiteCommand="umask 222"> <fileset dir="${tmp.local}"> <patternset refid="timed-test-files"/> </fileset> @@ -319,13 +306,12 @@ <target name="test-site-action"> <ftp action="site" - server="${ftp.host}" - userid="${ftp.user}" - password="${ftp.password}" - separator="${ftp.filesep}" - remotedir="${tmp.remote}" - siteCommand="umask 222" - > + server="${ftp.host}" + userid="${ftp.user}" + password="${ftp.password}" + separator="${ftp.filesep}" + remotedir="${tmp.remote}" + siteCommand="umask 222"> </ftp> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/propertyfile.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/propertyfile.xml b/src/etc/testcases/taskdefs/optional/propertyfile.xml index 20a1727..11f8490 100644 --- a/src/etc/testcases/taskdefs/optional/propertyfile.xml +++ b/src/etc/testcases/taskdefs/optional/propertyfile.xml @@ -21,7 +21,7 @@ <import file="../../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> </target> <property file="${output}/propertyfile.build.properties"/> @@ -36,13 +36,13 @@ <target name="update-existing-properties"> <propertyfile file="${output}/${test.propertyfile}" - comment="unit test for the property file task..." > - <entry key="firstname" value="${firstname}" /> - <entry key="lastname" value="${lastname}" /> - <entry key="email" value="${email}" /> - <entry key="phone" default="${phone}" /> - <entry key="age" default="${age}" type="int"/> - <entry key="date" default="${date}" type="date"/> + comment="unit test for the property file task..."> + <entry key="firstname" value="${firstname}"/> + <entry key="lastname" value="${lastname}"/> + <entry key="email" value="${email}"/> + <entry key="phone" default="${phone}"/> + <entry key="age" default="${age}" type="int"/> + <entry key="date" default="${date}" type="date"/> </propertyfile> </target> @@ -50,8 +50,8 @@ <echoproperties/> <propertyfile file="${output}/${test.propertyfile}" - comment="unit test for the property file task..." > - <entry key="firstname" operation="del" /> + comment="unit test for the property file task..."> + <entry key="firstname" operation="del"/> </propertyfile> </target> @@ -99,15 +99,15 @@ </propertyfile> <property file="${output}/${test.propertyfile}"/> </target> - + <target name="createfile"> <echo file="${output}/${overwrite.test.propertyfile}"> foo=3 </echo> </target> - + <target name="bugDemo1" depends="createfile,bugDemoInit"/> - + <target name="bugDemo2" depends="bugDemoInit"> <property file="${output}/${overwrite.test.propertyfile}"/> </target> @@ -119,5 +119,3 @@ </target> </project> - - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/pvcs.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/pvcs.xml b/src/etc/testcases/taskdefs/optional/pvcs.xml index 99bfcff..6f37259 100644 --- a/src/etc/testcases/taskdefs/optional/pvcs.xml +++ b/src/etc/testcases/taskdefs/optional/pvcs.xml @@ -37,12 +37,12 @@ </target> <target name="test5" description="Get the latest from PVCS"> - <pvcs pvcsbin="/home/cvs/pvcsant/src/etc/testcases/taskdefs" + <pvcs pvcsbin="/home/cvs/pvcsant/src/etc/testcases/taskdefs" repository="//ct4serv2/pvcs/monitor"/> </target> <target name="test6" description="No pcli to be found"> - <pvcs pvcsbin="/never/heard/of/a/directory/structure/like/this" + <pvcs pvcsbin="/never/heard/of/a/directory/structure/like/this" repository="//ct4serv2/pvcs/monitor"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/replaceregexp.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/replaceregexp.xml b/src/etc/testcases/taskdefs/optional/replaceregexp.xml index 58fdc59..8480d2d 100644 --- a/src/etc/testcases/taskdefs/optional/replaceregexp.xml +++ b/src/etc/testcases/taskdefs/optional/replaceregexp.xml @@ -21,8 +21,8 @@ <property name="root" location="../../../../.."/> <target name="setUp"> - <mkdir dir="${output}" /> - <copy file="replaceregexp.properties" tofile="${output}/test.properties" /> + <mkdir dir="${output}"/> + <copy file="replaceregexp.properties" tofile="${output}/test.properties"/> </target> <target name="def"> @@ -30,39 +30,39 @@ </target> <target name="setUp-nl"> - <mkdir dir="${output}" /> - <copy file="replaceregexp2.properties" tofile="${output}/test.properties" /> + <mkdir dir="${output}"/> + <copy file="replaceregexp2.properties" tofile="${output}/test.properties"/> </target> <target name="testReplace" depends="setUp"> <replaceregexp file="${output}/test.properties" byline="true"> - <regexp pattern="Old(.*)=(.*)" /> - <substitution expression="NewProp=\1\2" /> + <regexp pattern="Old(.*)=(.*)"/> + <substitution expression="NewProp=\1\2"/> </replaceregexp> </target> <!-- use in conjunction with testDirectoryDateDoesNotChange to make sure something will happen --> <target name="touchDirectory"> - <copy file="replaceregexp.properties" tofile="${output}/test.properties" /> + <copy file="replaceregexp.properties" tofile="${output}/test.properties"/> </target> <target name="testDirectoryDateDoesNotChange"> <replaceregexp file="${output}/test.properties" byline="true"> - <regexp pattern="foo" /> + <regexp pattern="foo"/> <substitution expression="bar"/> </replaceregexp> </target> <target name="testDontAddNewline1" depends="setUp-nl"> <replaceregexp file="${output}/test.properties" byline="false"> - <regexp pattern="Old(.*)=(.*)" /> - <substitution expression="NewProp=\1\2" /> + <regexp pattern="Old(.*)=(.*)"/> + <substitution expression="NewProp=\1\2"/> </replaceregexp> </target> <target name="testDontAddNewline2" depends="setUp-nl"> <replaceregexp file="${output}/test.properties" byline="true"> - <regexp pattern="Old(.*)=(.*)" /> - <substitution expression="NewProp=\1\2" /> + <regexp pattern="Old(.*)=(.*)"/> + <substitution expression="NewProp=\1\2"/> </replaceregexp> </target> @@ -80,4 +80,3 @@ </target> </project> - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/schemavalidate.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/schemavalidate.xml b/src/etc/testcases/taskdefs/optional/schemavalidate.xml index f43201e..0e5050b 100644 --- a/src/etc/testcases/taskdefs/optional/schemavalidate.xml +++ b/src/etc/testcases/taskdefs/optional/schemavalidate.xml @@ -20,9 +20,9 @@ <property name="doc.xsd" location="xml/doc.xsd"/> <property name="doc-in-ns.xsd" location="xml/doc-in-ns.xsd"/> - <property name="namespace" value="http://apache.org/ant/doc/"; /> - - <property name="endpiece-ns-no-location.xml" + <property name="namespace" value="http://apache.org/ant/doc/"/> + + <property name="endpiece-ns-no-location.xml" location="xml/endpiece-ns-no-location.xml"/> <target name="testNoNamespace"> @@ -35,33 +35,33 @@ <target name="testNSMapping"> <schemavalidate file="${endpiece-ns-no-location.xml}"> - <schema namespace="${namespace}" file="${doc-in-ns.xsd}" /> - <schema namespace="http://apache.org/ant/2"; - url="http://ant.apache.org/"; /> + <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/> + <schema namespace="http://apache.org/ant/2"; + url="http://ant.apache.org/"/> </schemavalidate> </target> <target name="testNoEmptySchemaNamespace"> <schemavalidate file="${endpiece-ns-no-location.xml}"> - <schema namespace="" file="${doc-in-ns.xsd}" /> + <schema namespace="" file="${doc-in-ns.xsd}"/> </schemavalidate> </target> <target name="testNoEmptySchemaLocation"> <schemavalidate file="${endpiece-ns-no-location.xml}"> - <schema namespace="${namespace}" /> + <schema namespace="${namespace}"/> </schemavalidate> </target> - + <target name="testNoFile"> <schemavalidate file="${endpiece-ns-no-location.xml}"> - <schema namespace="${namespace}" file="${namespace}" /> + <schema namespace="${namespace}" file="${namespace}"/> </schemavalidate> - </target> - + </target> + <target name="testNoDoubleSchemaLocation"> <schemavalidate file="${endpiece-ns-no-location.xml}"> @@ -72,29 +72,28 @@ <target name="testNoDuplicateSchema"> <schemavalidate file="${endpiece-ns-no-location.xml}"> - <schema namespace="${namespace}" file="${doc-in-ns.xsd}" /> - <schema namespace="${namespace}" - url="http://ant.apache.org/"; /> + <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/> + <schema namespace="${namespace}" + url="http://ant.apache.org/"/> </schemavalidate> - </target> + </target> <target name="testEqualsSchemasOK"> <schemavalidate file="${endpiece-ns-no-location.xml}"> - <schema namespace="${namespace}" file="${doc-in-ns.xsd}" /> - <schema namespace="${namespace}" file="${doc-in-ns.xsd}" /> + <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/> + <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/> </schemavalidate> - </target> - + </target> + <target name="testFileset"> - <schemavalidate noNamespaceFile="${doc.xsd}" - > - <schema namespace="${namespace}" file="${doc-in-ns.xsd}" /> - <fileset dir="xml" - includes="endpiece.xml, endpiece-ns-no-location.xml, endpiece-no-schema.xml" /> + <schemavalidate noNamespaceFile="${doc.xsd}"> + <schema namespace="${namespace}" file="${doc-in-ns.xsd}"/> + <fileset dir="xml" + includes="endpiece.xml, endpiece-ns-no-location.xml, endpiece-no-schema.xml"/> </schemavalidate> - </target> - - - <target name="default" depends="testNoNamespace,testNSMapping" /> -</project> \ No newline at end of file + </target> + + + <target name="default" depends="testNoNamespace,testNSMapping"/> +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/script.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/script.xml b/src/etc/testcases/taskdefs/optional/script.xml index c098289..fef465f 100644 --- a/src/etc/testcases/taskdefs/optional/script.xml +++ b/src/etc/testcases/taskdefs/optional/script.xml @@ -48,21 +48,21 @@ </target> <target name="useSrcAndEncoding"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> <property name="useSrcAndEncoding.encoding" value="UTF-8"/> <property name="useSrcAndEncoding.reader.encoding" value="${useSrcAndEncoding.encoding}" - description="Set a different encoding to raise a failure (ex. ISO-8859-1)" /> + description="Set a different encoding to raise a failure (ex. ISO-8859-1)"/> <property name="useSrcAndEncoding.file" location="${output}/script.useSrcAndEncoding.js"/> - <property name="useSrcAndEncoding.expectedProp" value="eacute [é]" /> + <property name="useSrcAndEncoding.expectedProp" value="eacute [é]"/> <echo file="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.encoding}" message="project.setNewProperty('useSrcAndEncoding.prop', '${useSrcAndEncoding.expectedProp}');"/> <script language="javascript" src="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.reader.encoding}"/> - <condition property="useSrcAndEncoding.testOK" > - <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}" /> + <condition property="useSrcAndEncoding.testOK"> + <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}"/> </condition> - <fail message="expected <${useSrcAndEncoding.expectedProp}> but was <${useSrcAndEncoding.prop}>" unless="useSrcAndEncoding.testOK" /> + <fail message="expected <${useSrcAndEncoding.expectedProp}> but was <${useSrcAndEncoding.prop}>" unless="useSrcAndEncoding.testOK"/> </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/script/scriptdef.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/script/scriptdef.xml b/src/etc/testcases/taskdefs/optional/script/scriptdef.xml index 3b54e3e..8aa8045 100644 --- a/src/etc/testcases/taskdefs/optional/script/scriptdef.xml +++ b/src/etc/testcases/taskdefs/optional/script/scriptdef.xml @@ -30,14 +30,14 @@ <attribute name="attr1"/> <element name="fileset" type="fileset"/> <![CDATA[ - + project.log("Attribute attr1 = " + attributes.get("attr1")); project.log("Fileset basedir = " + elements.get("fileset").get(0).getDir(project)); - + ]]> </scriptdef> - + <fileset id="testfileset" dir="."/> <scripttest attr1="test"> <fileset refid="testfileset"/> @@ -65,20 +65,20 @@ <attribute name="attr1"/> <element name="fileset" classname="org.apache.tools.ant.types.FileSet"/> <![CDATA[ - + project.log("Attribute attr1 = " + attributes.get("attr1")); project.log("Fileset basedir = " + elements.get("fileset").get(0).getDir(project)); - + ]]> </scriptdef> - + <fileset id="testfileset" dir="."/> <scripttest attr1="test"> <fileset refid="testfileset"/> </scripttest> </target> - + <target name="noelement"> <scriptdef name="scripttest" language="javascript"> <attribute name="attr1"/> @@ -87,7 +87,7 @@ java.lang.System.out.println("Attribute attr1 = " + attributes.get("attr1")); ]]> </scriptdef> - + <scripttest attr1="test"> </scripttest> </target> @@ -97,18 +97,18 @@ <attribute name="attr1"/> <element name="fileset" classname="org.apache.tools.ant.types.FileSet"/> <![CDATA[ - + java.lang.System.out.println("Attribute attr1 = " + attributes.get("attr1")); java.lang.System.out.println("Fileset basedir = " + elements.get("fileset").get(0).getDir(project)); - + ]]> </scriptdef> - + <scripttest attr1="test"> </scripttest> </target> - + <target name="doubledef"> <scriptdef name="task1" language="javascript"> <![CDATA[ @@ -123,24 +123,24 @@ <task1/> <task2/> </target> - + <target name="doubleAttributeDef"> <scriptdef name="scripttest" language="javascript"> <attribute name="attr1"/> <attribute name="attr1"/> </scriptdef> </target> - + <target name="property"> <scriptdef name="scripttest" language="javascript"> <attribute name="attr1"/> <![CDATA[ - + project.log("Attribute value = " + attributes.get("attr1")); ]]> </scriptdef> - <property name="testproperty" value="test"/> + <property name="testproperty" value="test"/> <scripttest attr1="${testproperty}"> </scripttest> </target> @@ -152,12 +152,12 @@ </target> <target name="useSrcAndEncoding"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> <property name="useSrcAndEncoding.encoding" value="UTF-8"/> <property name="useSrcAndEncoding.reader.encoding" value="${useSrcAndEncoding.encoding}" - description="Set a different encoding to raise a failure (ex. ISO-8859-1)" /> + description="Set a different encoding to raise a failure (ex. ISO-8859-1)"/> <property name="useSrcAndEncoding.file" location="${output}/script.useSrcAndEncoding.js"/> - <property name="useSrcAndEncoding.expectedProp" value="eacute [é]" /> + <property name="useSrcAndEncoding.expectedProp" value="eacute [é]"/> <echo file="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.encoding}" message="project.setNewProperty('useSrcAndEncoding.prop', '${useSrcAndEncoding.expectedProp}');"/> @@ -165,64 +165,64 @@ <scriptdef name="useSrcAndEncoding" language="javascript" src="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.reader.encoding}"/> <useSrcAndEncoding/> - <condition property="useSrcAndEncoding.testOK" > - <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}" /> + <condition property="useSrcAndEncoding.testOK"> + <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}"/> </condition> - <fail message="expected <${useSrcAndEncoding.expectedProp}> but was <${useSrcAndEncoding.prop}>" unless="useSrcAndEncoding.testOK" /> + <fail message="expected <${useSrcAndEncoding.expectedProp}> but was <${useSrcAndEncoding.prop}>" unless="useSrcAndEncoding.testOK"/> </target> <target name="useCompiled"> <!-- Test with 'javax' manager, 'bsf' manager already compiles the script. --> - <scriptdef manager="javax" name="heavyscript" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="true" /> - - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> - <heavyscript /> + <scriptdef manager="javax" name="heavyscript" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="true"/> + + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> + <heavyscript/> </target> <target name="useNotCompiled"> - <scriptdef manager="javax" name="heavyscriptNotCompiled" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="false" /> - - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> - <heavyscriptNotCompiled /> + <scriptdef manager="javax" name="heavyscriptNotCompiled" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="false"/> + + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> + <heavyscriptNotCompiled/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/unix/symlink.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/unix/symlink.xml b/src/etc/testcases/taskdefs/optional/unix/symlink.xml index 134f29f..68c1304 100644 --- a/src/etc/testcases/taskdefs/optional/unix/symlink.xml +++ b/src/etc/testcases/taskdefs/optional/unix/symlink.xml @@ -33,44 +33,44 @@ <project name="symlink-test" basedir="." default="all"> - <!-- + <!-- Since the symlink task and some of these targets rely on - calls to exec, it may be possible for the JVM to outrun the + calls to exec, it may be possible for the JVM to outrun the execution of the command line system calls, so this value is the number of seconds we give the operating system to - catch up before executing a task that depends on the + catch up before executing a task that depends on the completion of previous tasks. This delay is also added to the end of each target so junit doesn't go testing things before they have finnished (hopefully). Tweak if needed. --> <property name="delay" value="0"/> - + <import file="../../../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> </target> <target name="all" depends="setUp, test-single, test-delete, test-record, test-recreate, tearDown"/> - + <!-- test for action = single --> - <!-- + <!-- Creates: File: ${output}/symlink.test Link: ${output}/singletest --> <target name="test-single"> <touch file="${output}/symlink.test"/> - <symlink resource="${output}/symlink.test" - link="${output}/singletest" + <symlink resource="${output}/symlink.test" + link="${output}/singletest" failonerror="yes"/> <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up --> - <available file="${output}/symlink.test" + <available file="${output}/symlink.test" property="test.single.file.created"/> - <available file="${output}/singletest" + <available file="${output}/singletest" property="test.single.link.created"/> </target> @@ -78,7 +78,7 @@ <!-- test for action = delete (no calls to command line so no sleep) --> - <!-- + <!-- Creates: (none) Deletes: @@ -87,8 +87,8 @@ <target name="test-delete"> <touch file="${output}/symlink.test"/> - <symlink resource="${output}/symlink.test" - link="${output}/singletest" + <symlink resource="${output}/symlink.test" + link="${output}/singletest" failonerror="yes"/> <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up --> @@ -96,19 +96,19 @@ <symlink action="delete" link="${output}/symlink.test" failonerror="no"/> <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up --> - <available file="${output}/symlink.test" + <available file="${output}/symlink.test" property="test.delete.file.still.there"/> - <available file="${output}/singletest" + <available file="${output}/singletest" property="test.delete.link.still.there" value="ERROR: link deletion failed"/> - + </target> <!-- test for action = record --> - <!-- + <!-- Creates: Dir: ${output}/symtest1 Dir: ${output}/symtest1/symtest2 @@ -143,22 +143,22 @@ <touch file="${output}/symtest1/symtest3/fileB"/> <touch file="${output}/symtest1/symtest3/fileC"/> - <symlink resource="${output}/symtest1/file1" - link="${output}/symtest1/link1" - failonerror="no" /> - <symlink resource="${output}/symtest1/symtest2/file2" - link="${output}/symtest1/link2" - failonerror="no" /> - <symlink resource="${output}/symtest1/symtest2/file2" - link="${output}/symtest1/symtest2/link3" - failonerror="no" /> + <symlink resource="${output}/symtest1/file1" + link="${output}/symtest1/link1" + failonerror="no"/> + <symlink resource="${output}/symtest1/symtest2/file2" + link="${output}/symtest1/link2" + failonerror="no"/> + <symlink resource="${output}/symtest1/symtest2/file2" + link="${output}/symtest1/symtest2/link3" + failonerror="no"/> <symlink resource="${output}/symtest1/symtest3" link="${output}/symtest1/dirlink" - failonerror="no" /> - <symlink resource="${output}/symtest1/symtest3" + failonerror="no"/> + <symlink resource="${output}/symtest1/symtest3" link="${output}/symtest1/dirlink2" failonerror="no"/> - <symlink resource="${output}/symtest1/symtest3" + <symlink resource="${output}/symtest1/symtest3" link="${output}/symtest1/dirlink3" failonerror="no"/> @@ -217,7 +217,7 @@ <!-- this is redundant for this test, but used in the recreate test --> - <available file="${output}/symtest1/dirlink2" + <available file="${output}/symtest1/dirlink2" property="test.record.dirlink2.created"/> <!-- Test to see if the linkfiles were created --> @@ -239,7 +239,7 @@ <!-- test for action = recreate --> - <!-- + <!-- Deletes: Link: ${output}/symtest1/link1==>${output}/symtest1/file1 Link: ${output}/symtest1/link2==>${output}/symtest1/symtest2/file2 @@ -278,7 +278,7 @@ <sleep seconds="${delay}"/> <!-- make sure OS has time to catch up --> - <symlink resource="${output}/symtest1/symtest2" + <symlink resource="${output}/symtest1/symtest2" link="${output}/symtest1/dirlink3" failonerror="no"/> @@ -321,7 +321,7 @@ property="test.recreate.dirlink.recreated"/> <!-- this should not get set --> - <available file="${output}/symtest1/symtest3/symtest3" + <available file="${output}/symtest1/symtest3/symtest3" property="test.recreate.dirlink2.recreated.twice" value="ERROR: dirlink2 was created a second time (bug 25181)"/> @@ -329,7 +329,7 @@ <sleep seconds="${delay}"/> <!-- make sure OS has time to do the execs --> - <available file="${output}/symtest1/symtest3/WhereAmI" + <available file="${output}/symtest1/symtest3/WhereAmI" property="test.recreate.dirlink3.was.altered"/> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl b/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl index b9d0794..4cd1345 100644 --- a/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl +++ b/src/etc/testcases/taskdefs/optional/xalan-redirect-in.xsl @@ -25,7 +25,7 @@ for a xsl...the behavior might be dependent on Xalan1 and Xalan2...this will be a problem to erase the files :( Can take as a systemid the base for the xsl document or the base or the JVM working dir just like: new File("xalan-redirect-out.tmp") ---> +--> <xsl:param name="xalan-version" select="'x'"/> <xsl:template match="/"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/about.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/about.xml b/src/etc/testcases/taskdefs/optional/xml/about.xml index f6a9dab..3811ce5 100644 --- a/src/etc/testcases/taskdefs/optional/xml/about.xml +++ b/src/etc/testcases/taskdefs/optional/xml/about.xml @@ -17,8 +17,7 @@ --> <!DOCTYPE doc PUBLIC "-//stevo//DTD doc 1.0//EN" - "http://chemical/brothers"; - > + "http://chemical/brothers";> <doc> <section title="About"> in the absence of technology, there is only marketing http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/apache.xsl ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/apache.xsl b/src/etc/testcases/taskdefs/optional/xml/apache.xsl index 120addf..215898e 100644 --- a/src/etc/testcases/taskdefs/optional/xml/apache.xsl +++ b/src/etc/testcases/taskdefs/optional/xml/apache.xsl @@ -31,5 +31,5 @@ <xsl:value-of select="@name"/> </xsl:attribute> </author> - </xsl:template> + </xsl:template> </xsl:stylesheet> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd b/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd index b34147c..7fe2378 100644 --- a/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd +++ b/src/etc/testcases/taskdefs/optional/xml/doc-in-ns.xsd @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; targetNamespace="http://apache.org/ant/doc/"; xmlns:tns="http://apache.org/ant/doc/"; elementFormDefault="qualified"> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/doc.dtd ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/doc.dtd b/src/etc/testcases/taskdefs/optional/xml/doc.dtd index 51629d5..baa5cab 100644 --- a/src/etc/testcases/taskdefs/optional/xml/doc.dtd +++ b/src/etc/testcases/taskdefs/optional/xml/doc.dtd @@ -17,8 +17,3 @@ <!ELEMENT doc (section) > <!ELEMENT section (#PCDATA)> <!ATTLIST section title CDATA #IMPLIED> - - - - - http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/doc.xsd ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/doc.xsd b/src/etc/testcases/taskdefs/optional/xml/doc.xsd index eeedbca..56aef0a 100644 --- a/src/etc/testcases/taskdefs/optional/xml/doc.xsd +++ b/src/etc/testcases/taskdefs/optional/xml/doc.xsd @@ -15,8 +15,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<xs:schema - xmlns:xs="http://www.w3.org/2001/XMLSchema"; +<xs:schema + xmlns:xs="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified"> <xs:element name="doc"> <xs:complexType> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/doc.xsl ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/doc.xsl b/src/etc/testcases/taskdefs/optional/xml/doc.xsl index 3d9c2a4..4edb847 100644 --- a/src/etc/testcases/taskdefs/optional/xml/doc.xsl +++ b/src/etc/testcases/taskdefs/optional/xml/doc.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"; - xmlns:template="struts template" + xmlns:template="struts template" version="1.0"> <xsl:output method="text"/> <xsl:template match="/"> <xsl:value-of select="/doc/section"/> -</xsl:template> +</xsl:template> </xsl:stylesheet> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml index ec58085..588ac2b 100644 --- a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml +++ b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema-invalid.xml @@ -16,15 +16,15 @@ limitations under the License. --> -<!-- - Invalid test XML file without any schema refeferences +<!-- + Invalid test XML file without any schema refeferences --> <doc> <section title="endpiece"> - With a little luck, the network will pick me up. + With a little luck, the network will pick me up. This is Ripley - last survivor of The Nostromo - signing off. </section> - + <invalidelement/> - + </doc> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml index 7ae559d..ecca43d 100644 --- a/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml +++ b/src/etc/testcases/taskdefs/optional/xml/endpiece-noSchema.xml @@ -16,13 +16,13 @@ limitations under the License. --> -<!-- - Test XML file without any schema refeferences +<!-- + Test XML file without any schema refeferences --> <doc> <section title="endpiece"> - With a little luck, the network will pick me up. + With a little luck, the network will pick me up. This is Ripley - last survivor of The Nostromo - signing off. </section> - + </doc> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml index 3fe93c7..471af96 100644 --- a/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml +++ b/src/etc/testcases/taskdefs/optional/xml/endpiece-ns-no-location.xml @@ -17,7 +17,7 @@ --> <doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="doc-in-ns.xsd" xmlns="http://apache.org/ant/doc/";> <section title="endpiece"> - With a little luck, the network will pick me up. + With a little luck, the network will pick me up. This is Ripley - last survivor of The Nostromo - signing off. </section> </doc> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/endpiece.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece.xml index 3fe93c7..471af96 100644 --- a/src/etc/testcases/taskdefs/optional/xml/endpiece.xml +++ b/src/etc/testcases/taskdefs/optional/xml/endpiece.xml @@ -17,7 +17,7 @@ --> <doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="doc-in-ns.xsd" xmlns="http://apache.org/ant/doc/";> <section title="endpiece"> - With a little luck, the network will pick me up. + With a little luck, the network will pick me up. This is Ripley - last survivor of The Nostromo - signing off. </section> </doc> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml b/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml index eec49f6..a7f107a 100644 --- a/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml +++ b/src/etc/testcases/taskdefs/optional/xml/endpiece2.xml @@ -15,11 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<doc xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="doc.xsd" xmlns="http://Massive/Attack+Mezzanine";> <section title="endpiece"> - With a little luck, the network will pick me up. + With a little luck, the network will pick me up. This is Ripley - last survivor of The Nostromo - signing off. <illegal-element/> </section> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl b/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl index 9c1ffad..6ab86d9 100644 --- a/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl +++ b/src/etc/testcases/taskdefs/optional/xml/stylesheet_include.xsl @@ -24,5 +24,5 @@ <xsl:value-of select="@name"/> </xsl:attribute> </author> - </xsl:template> + </xsl:template> </xsl:stylesheet> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/test.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/test.xml b/src/etc/testcases/taskdefs/optional/xml/test.xml index 7f2abe0..f4ed857 100644 --- a/src/etc/testcases/taskdefs/optional/xml/test.xml +++ b/src/etc/testcases/taskdefs/optional/xml/test.xml @@ -22,4 +22,3 @@ <c>indented</c> </b> </root> - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/test.xsl ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/test.xsl b/src/etc/testcases/taskdefs/optional/xml/test.xsl index 8d28eb3..4151039 100644 --- a/src/etc/testcases/taskdefs/optional/xml/test.xsl +++ b/src/etc/testcases/taskdefs/optional/xml/test.xsl @@ -21,5 +21,5 @@ <xsl:copy> <xsl:apply-templates select="@*|node()"/> </xsl:copy> - </xsl:template> -</xsl:stylesheet> \ No newline at end of file + </xsl:template> +</xsl:stylesheet> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xml/validate.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xml/validate.xml b/src/etc/testcases/taskdefs/optional/xml/validate.xml index cade722..a7a7667 100644 --- a/src/etc/testcases/taskdefs/optional/xml/validate.xml +++ b/src/etc/testcases/taskdefs/optional/xml/validate.xml @@ -19,10 +19,10 @@ <target name="testValidate"> <xmlvalidate warn="false"> - <fileset dir="." includes="about.xml"/> + <fileset dir="." includes="about.xml"/> <dtd publicID="-//stevo//DTD doc 1.0//EN" location="doc.dtd"/> </xmlvalidate> </target> - + </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xmlvalidate.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xmlvalidate.xml b/src/etc/testcases/taskdefs/optional/xmlvalidate.xml index cd7cc45..38a4d74 100644 --- a/src/etc/testcases/taskdefs/optional/xmlvalidate.xml +++ b/src/etc/testcases/taskdefs/optional/xmlvalidate.xml @@ -19,16 +19,16 @@ <target name="testValidate"> <xmlvalidate warn="false"> - <fileset dir="xml" includes="**/about.xml"/> + <fileset dir="xml" includes="**/about.xml"/> <dtd publicID="-//stevo//DTD doc 1.0//EN" - location="xml/doc.dtd"/> + location="xml/doc.dtd"/> </xmlvalidate> </target> - + <target name="testDeepValidate"> - <ant dir="xml" - antfile="validate.xml" - target="testValidate"/> + <ant dir="xml" + antfile="validate.xml" + target="testValidate"/> </target> <target name="xmlcatalog"> @@ -55,8 +55,8 @@ <xmlvalidate warn="false"> <fileset dir="xml" includes="**/about.xml"/> <xmlcatalog classpath="xml"> - <entity publicID = "bogusImage" - location = "/i/dont/exist.jpg"/> + <entity publicID="bogusImage" + location="/i/dont/exist.jpg"/> <xmlcatalog> <dtd publicID="-//stevo//DTD doc 1.0//EN" location="doc.dtd"/> @@ -78,7 +78,7 @@ </xmlcatalog> </xmlvalidate> </target> - + <target name="xmlcatalogpath-override"> <xmlvalidate warn="false"> <fileset dir="xml" includes="**/about.xml"/> @@ -87,11 +87,11 @@ <pathelement location="xml/catalog"/> </catalogpath> <dtd publicID="-//stevo//DTD doc 1.0//EN" - location="doc.dtd"/> + location="doc.dtd"/> </xmlcatalog> </xmlvalidate> </target> - + <target name="xmlcatalogfiles"> <xmlvalidate warn="false"> <fileset dir="xml" includes="**/about.xml"/> @@ -102,7 +102,7 @@ </xmlcatalog> </xmlvalidate> </target> - + <target name="xmlcatalogpath"> <xmlvalidate warn="false"> <fileset dir="xml" includes="**/about.xml"/> @@ -115,13 +115,13 @@ </target> <target name="testSchemaGood"> - <xmlvalidate warn="false" lenient="no" > + <xmlvalidate warn="false" lenient="no"> <fileset dir="xml" includes="endpiece.xml"/> - <attribute name="http://xml.org/sax/features/validation"; - value="false"/> - <attribute name="http://apache.org/xml/features/validation/schema"; - value="false"/> + <attribute name="http://xml.org/sax/features/validation"; + value="false"/> + <attribute name="http://apache.org/xml/features/validation/schema"; + value="false"/> </xmlvalidate> </target> @@ -129,14 +129,14 @@ <target name="testSchemaBad"> <xmlvalidate warn="false"> <fileset dir="xml" includes="endpiece2.xml"/> - - <attribute name="http://xml.org/sax/features/validation"; - value="true"/> - <attribute name="http://apache.org/xml/features/validation/schema"; - value="true"/> + + <attribute name="http://xml.org/sax/features/validation"; + value="true"/> + <attribute name="http://apache.org/xml/features/validation/schema"; + value="true"/> </xmlvalidate> </target> - + <target name="testIso2022Jp"> <xmlvalidate warn="false" file="xml/iso-2022-jp.xml"/> </target> @@ -151,20 +151,20 @@ <!-- Converts path to URL format --> <pathconvert dirsep="/" property="xsd.file"> - <path> - <pathelement location="xml/doc.xsd"/> - </path> + <path> + <pathelement location="xml/doc.xsd"/> + </path> </pathconvert> <xmlvalidate file="xml/endpiece-noSchema.xml" lenient="false" - failonerror="true" warn="true"> + failonerror="true" warn="true"> - <attribute name="http://apache.org/xml/features/validation/schema"; - value="true"/> + <attribute name="http://apache.org/xml/features/validation/schema"; + value="true"/> - <property - name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"; - value="${xsd.file}"/> + <property + name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"; + value="${xsd.file}"/> </xmlvalidate> </target> @@ -172,37 +172,36 @@ <!-- Tests property element with XML file that fails schema validation --> <target name="testProperty.invalidXML"> - <!-- Converts path to URL format --> - <pathconvert dirsep="/" property="xsd.file"> - <path> - <pathelement location="xml/doc.xsd"/> - </path> - </pathconvert> + <!-- Converts path to URL format --> + <pathconvert dirsep="/" property="xsd.file"> + <path> + <pathelement location="xml/doc.xsd"/> + </path> + </pathconvert> - <xmlvalidate file="xml/endpiece-noSchema-invalid.xml" lenient="false" - failonerror="true" warn="true"> + <xmlvalidate file="xml/endpiece-noSchema-invalid.xml" lenient="false" + failonerror="true" warn="true"> - <attribute name="http://apache.org/xml/features/validation/schema"; - value="true"/> + <attribute name="http://apache.org/xml/features/validation/schema"; + value="true"/> - <property - name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"; - value="${xsd.file}"/> - </xmlvalidate> + <property + name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"; + value="${xsd.file}"/> + </xmlvalidate> </target> <target name="testSchemaWithXSD"> - <xmlvalidate warn="false" lenient="false" - file="xml/endpiece-noSchema.xml"> - - <attribute name="http://apache.org/xml/features/validation/schema"; - value="true"/> - <property - name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"; - value="${xsd.file}"/> - - </xmlvalidate> - </target> - -</project> + <xmlvalidate warn="false" lenient="false" + file="xml/endpiece-noSchema.xml"> + + <attribute name="http://apache.org/xml/features/validation/schema"; + value="true"/> + <property + name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"; + value="${xsd.file}"/> + </xmlvalidate> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/optional/xslt.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/xslt.xml b/src/etc/testcases/taskdefs/optional/xslt.xml index d872ea8..15c522f 100644 --- a/src/etc/testcases/taskdefs/optional/xslt.xml +++ b/src/etc/testcases/taskdefs/optional/xslt.xml @@ -21,7 +21,7 @@ <import file="../../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}" /> + <mkdir dir="${output}"/> </target> <target name="initNonAscii" depends="setUp"> @@ -42,12 +42,12 @@ style="xml/doc.xsl"> </xslt> </target> - + <xmlcatalog id="xdocs.catalog"> <dtd publicID="-//stevo//DTD doc 1.0//EN" location="xml/doc.dtd"/> - </xmlcatalog> - + </xmlcatalog> + <target name="testCatalog" depends="setUp"> <xslt destdir="${output}" includes="about.xml" @@ -67,8 +67,8 @@ <outputproperty name="indent" value="yes"/> </xslt> </target> - - + + <target name="testFactory" depends="setUp"> <xslt in="xml/test.xml" out="${output}/test-out.xml" http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/parallel.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/parallel.xml b/src/etc/testcases/taskdefs/parallel.xml index 9a3434c..250416c 100644 --- a/src/etc/testcases/taskdefs/parallel.xml +++ b/src/etc/testcases/taskdefs/parallel.xml @@ -129,7 +129,7 @@ </sequential> </parallel> <echo>|</echo> - + </target> <target name="testDemux"> @@ -141,7 +141,7 @@ <demuxtest/> </parallel> </target> - + <target name="testSingleExit"> <parallel> <echo message="all is well"/> @@ -157,7 +157,7 @@ </target> <target name="help"> - <echo>Test build file for the <parallel> task.</echo> + <echo>Test build file for the <parallel> task.</echo> <echo>Use the various targets to run the tests.</echo> </target> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/2f64e0b5/src/etc/testcases/taskdefs/pathconvert.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/pathconvert.xml b/src/etc/testcases/taskdefs/pathconvert.xml index 5a1cdf7..4c54486 100644 --- a/src/etc/testcases/taskdefs/pathconvert.xml +++ b/src/etc/testcases/taskdefs/pathconvert.xml @@ -20,25 +20,25 @@ <import file="../buildfiletest-base.xml"/> <path id="testpath"> - <pathelement path="${ant.file}" /> + <pathelement path="${ant.file}"/> </path> <target name="testmap"> <pathconvert property="result" dirsep="#"> - <path refid="testpath" /> - <map from="${basedir}" to="test" /> + <path refid="testpath"/> + <map from="${basedir}" to="test"/> </pathconvert> </target> <target name="testmapper"> <pathconvert property="result" dirsep="#"> - <path refid="testpath" /> - <mapper type="glob" from="${basedir}*" to="test*" /> + <path refid="testpath"/> + <mapper type="glob" from="${basedir}*" to="test*"/> </pathconvert> </target> <target name="testnotargetos"> - <pathconvert property="result" refid="testpath" /> + <pathconvert property="result" refid="testpath"/> </target> <target name="test-nonmatching-mapper" description="test for bug fix bz-62076">
