Reformatted using Ant editor (#12040)

Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474

1 files changed, 35 insertions, 71 deletions

diff --git a/uitest/test.xml b/uitest/test.xml
index 44dac13d90..3baccb4117 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant"
-    name="Run Vaadin Testbench Tests" basedir="." default="run-and-clean-up">
+<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" name="Run Vaadin Testbench Tests" basedir="." default="run-and-clean-up">
 
     <include file="../common.xml" />
     <dirname property="test.xml.dir" file="${ant.file.Run Vaadin Testbench Tests}" />
@@ -9,12 +8,9 @@
     <!-- Configuration -->
     <!-- ================================================================== -->
     <!-- Browsers to use for testing -->
-    <property name="browsers-windows"
-        value="winxp-ie8,win7-ie9,win7-ie10,winxp-firefox17-esr,winxp-safari5,winxp-googlechrome21,winxp-opera12" />
-    <property name="browsers-linux"
-        value="linux-firefox3,linux-opera10,linux-googlechrome8" />
-    <property name="browsers-mac"
-        value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />
+    <property name="browsers-windows" value="winxp-ie8,win7-ie9,win7-ie10,winxp-firefox17-esr,winxp-safari5,winxp-googlechrome21,winxp-opera12" />
+    <property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
+    <property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />
 
     <property name="browsers" value="${browsers-windows}" />
 
@@ -22,26 +18,22 @@
     <property name="retries" value="2" />
 
     <!-- Screen shot base directory -->
-    <fail unless="com.vaadin.testbench.screenshot.directory"
-        message="The 'com.vaadin.testbench.screenshot.directory' property must be defined." />
+    <fail unless="com.vaadin.testbench.screenshot.directory" message="The 'com.vaadin.testbench.screenshot.directory' property must be defined." />
 
     <!-- Screen shot resolution -->
-    <property name="com.vaadin.testbench.screenshot.resolution"
-        value="1500x850" />
+    <property name="com.vaadin.testbench.screenshot.resolution" value="1500x850" />
 
     <!-- Host running Testbench Hub -->
     <property name="com.vaadin.testbench.tester.host" value="testbench-hub.intra.itmill.com" />
 
-    <property name="com.vaadin.testbench.screenshot.block.error"
-        value="0.025" />
+    <property name="com.vaadin.testbench.screenshot.block.error" value="0.025" />
     <property name="com.vaadin.testbench.debug" value="false" />
 
 
     <target name="initialize">
         <!-- classpath must include test bench jar and its dependencies -->
         <path id="classpath">
-            <fileset dir="${com.vaadin.testbench.lib.dir}"
-                includes="**/*.jar" />
+            <fileset dir="${com.vaadin.testbench.lib.dir}" includes="**/*.jar" />
         </path>
     </target>
 
@@ -55,16 +47,13 @@
         file for each browser is created. -->
     <target name="create-tests" depends="initialize, remove-temp-testclasses">
         <!-- Temporary output directory, created and removed by this script -->
-        <fail unless="test-output-dir"
-            message="The 'test-output-dir' property must be defined." />
+        <fail unless="test-output-dir" message="The 'test-output-dir' property must be defined." />
         <property name="class-dir" value="${test-output-dir}/classes" />
 
         <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
 
-        <java classname="com.vaadin.testbench.util.TestConverter"
-            classpathref="classpath" fork="true">
-            <sysproperty key="com.vaadin.testbench.test.retries"
-                value="${retries}" />
+        <java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath" fork="true">
+            <sysproperty key="com.vaadin.testbench.test.retries" value="${retries}" />
             <jvmarg value="-Duser.language=en" />
             <jvmarg value="-Duser.country=US" />
             <arg value="${test-output-dir}" />
@@ -77,9 +66,7 @@
     <!-- This target complies the generated java junit tests. -->
     <target name="compile-tests" depends="create-tests">
         <mkdir dir="${class-dir}" />
-        <javac includeantruntime="false" srcdir="${test-output-dir}"
-            destdir="${class-dir}" debug="on" fork="yes" failonerror="false"
-            encoding="UTF8">
+        <javac includeantruntime="false" srcdir="${test-output-dir}" destdir="${class-dir}" debug="on" fork="yes" failonerror="false" encoding="UTF8">
             <classpath>
                 <path refid="classpath" />
             </classpath>
@@ -91,12 +78,9 @@
     <!-- ================================================================== -->
 
     <target name="check-parameters">
-        <fail unless="com.vaadin.testbench.lib.dir"
-            message="The 'com.vaadin.testbench.lib.dir' property must be defined." />
-        <fail unless="com.vaadin.testbench.tester.host"
-            message="The 'com.vaadin.testbench.tester.host' property must be defined." />
-        <fail unless="com.vaadin.testbench.deployment.url"
-            message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
+        <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined." />
+        <fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined." />
+        <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
     </target>
 
     <target name="run-tests" depends="compile-tests">
@@ -104,8 +88,7 @@
             <include name="**/**.java" />
         </fileset>
 
-        <antcontrib:for threadCount="30" parallel="true"
-            keepgoing="true" param="target">
+        <antcontrib:for threadCount="30" parallel="true" keepgoing="true" param="target">
             <path>
                 <fileset refid="tests-fileset" />
             </path>
@@ -128,32 +111,23 @@
 
             <formatter usefile="false" type="plain" />
 
-            <jvmarg
-                value="-Dcom.vaadin.testbench.tester.host=${com.vaadin.testbench.tester.host}" />
-            <jvmarg
-                value="-Dcom.vaadin.testbench.deployment.url=${com.vaadin.testbench.deployment.url}" />
+            <jvmarg value="-Dcom.vaadin.testbench.tester.host=${com.vaadin.testbench.tester.host}" />
+            <jvmarg value="-Dcom.vaadin.testbench.deployment.url=${com.vaadin.testbench.deployment.url}" />
             <!-- Define where the reference screenshots and diff files are 
                 saved -->
-            <jvmarg
-                value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
+            <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
             <!-- Resolution for screenshots -->
-            <jvmarg
-                value="-Dcom.vaadin.testbench.screenshot.resolution=${com.vaadin.testbench.screenshot.resolution}" />
-            <jvmarg
-                value="-Dcom.vaadin.testbench.debug=${com.vaadin.testbench.debug}" />
-            <jvmarg
-                value="-Dcom.vaadin.testbench.screenshot.block.error=${com.vaadin.testbench.screenshot.block.error}" />
+            <jvmarg value="-Dcom.vaadin.testbench.screenshot.resolution=${com.vaadin.testbench.screenshot.resolution}" />
+            <jvmarg value="-Dcom.vaadin.testbench.debug=${com.vaadin.testbench.debug}" />
+            <jvmarg value="-Dcom.vaadin.testbench.screenshot.block.error=${com.vaadin.testbench.screenshot.block.error}" />
 
 
             <jvmarg value="-Djava.awt.headless=true" />
 
             <!-- true/false system arguments -->
-            <jvmarg
-                value="-Dcom.vaadin.testbench.screenshot.softfail=${com.vaadin.testbench.screenshot.softfail}" />
-            <jvmarg
-                value="-Dcom.vaadin.testbench.screenshot.reference.debug=${com.vaadin.testbench.screenshot.reference.debug}" />
-            <jvmarg
-                value="-Dcom.vaadin.testbench.screenshot.cursor=${com.vaadin.testbench.screenshot.cursor}" />
+            <jvmarg value="-Dcom.vaadin.testbench.screenshot.softfail=${com.vaadin.testbench.screenshot.softfail}" />
+            <jvmarg value="-Dcom.vaadin.testbench.screenshot.reference.debug=${com.vaadin.testbench.screenshot.reference.debug}" />
+            <jvmarg value="-Dcom.vaadin.testbench.screenshot.cursor=${com.vaadin.testbench.screenshot.cursor}" />
 
             <batchtest>
                 <filelist dir="${test-output-dir}" files="${target}" />
@@ -176,8 +150,7 @@
     <target name="remove-error-screens">
         <mkdir dir="${com.vaadin.testbench.screenshot.directory}/errors" />
         <delete>
-            <fileset
-                dir="${com.vaadin.testbench.screenshot.directory}/errors">
+            <fileset dir="${com.vaadin.testbench.screenshot.directory}/errors">
                 <include name="**/**.*" />
             </fileset>
         </delete>
@@ -188,38 +161,29 @@
     <!-- ================================================================== -->
 
     <!-- The default target. -->
-    <target name="run-and-clean-up"
-        depends="check-parameters,remove-error-screens,run-tests" />
+    <target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tests" />
 
 
     <!-- Starts the server and runs all TestBench tests -->
     <target name="test-package">
         <fail unless="war.file" message="No 'war.file' parameter given." />
-        <property name="test-output-dir"
-            location="${test.xml.dir}/result/testbench-junit-classes" />
+        <property name="test-output-dir" location="${test.xml.dir}/result/testbench-junit-classes" />
         <property name="retries" value="2" />
 
         <!-- Parameters for the test.xml script. -->
-        <fail unless="com.vaadin.testbench.tester.host"
-            message="The 'com.vaadin.testbench.tester.host' property must be defined." />
-        <fail unless="com.vaadin.testbench.deployment.url"
-            message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
-        <fail unless="com.vaadin.testbench.lib.dir"
-            message="The 'com.vaadin.testbench.lib.dir' property must be defined." />
-        <property name="com.vaadin.testbench.screenshot.block.error"
-            value="0.025" />
+        <fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined." />
+        <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
+        <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined." />
+        <property name="com.vaadin.testbench.screenshot.block.error" value="0.025" />
         <property name="com.vaadin.testbench.debug" value="false" />
 
         <parallel>
             <daemons>
-                <ant antfile="${test.xml.dir}/vaadin-server.xml"
-                    inheritall="true" inheritrefs="true" target="deploy-and-start" />
+                <ant antfile="${test.xml.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
             </daemons>
             <sequential>
-                <ant antfile="${test.xml.dir}/vaadin-server.xml"
-                    target="wait-for-startup" />
-                <antcall inheritall="true" inheritrefs="true"
-                    target="run-and-clean-up" />
+                <ant antfile="${test.xml.dir}/vaadin-server.xml" target="wait-for-startup" />
+                <antcall inheritall="true" inheritrefs="true" target="run-and-clean-up" />
                 <echo message="All TestBench tests have been run" />
             </sequential>
         </parallel>