diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-05 19:45:04 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-09 11:23:30 +0300 |
| commit | 98d9d6fafc612f44d62d025520d040c69f5e80bc (patch) | |
| tree | 48950b9149db3b17686be0932ca5120e8a2868a2 /uitest | |
| parent | ca9263e405d3988b20ddd1aa45eac4707674ddc0 (diff) | |
| download | vaadin-framework-98d9d6fafc612f44d62d025520d040c69f5e80bc.tar.gz vaadin-framework-98d9d6fafc612f44d62d025520d040c69f5e80bc.zip | |
Fixed running of TestBench tests (#9299)
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/test.xml | 23 | ||||
| -rw-r--r-- | uitest/vaadin-server.xml | 3 |
2 files changed, 10 insertions, 16 deletions
diff --git a/uitest/test.xml b/uitest/test.xml index fca4d1c299..294d0130e4 100644 --- a/uitest/test.xml +++ b/uitest/test.xml @@ -1,14 +1,8 @@ <?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"> - <property name="project.root" value=".." /> - <!-- Import common targets --> - <!--<import file="../build/common.xml" />--> - <!-- ant contrib required for flow control (for loop, if, property override) --> - <!-- Note that we have to use a namespace to avoid clash when running sub-ant. --> - <ivy:resolve file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" /> - <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> - <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" /> + <include file="../common.xml" /> + <dirname property="test.xml.dir" file="${ant.file.Run Vaadin Testbench Tests}" /> <!-- ================================================================== --> <!-- Configuration --> @@ -44,9 +38,9 @@ </target> <!-- fileset containing all TestBench tests to run --> - <fileset dir=".." id="html-test-files"> - <include name="uitest/**/AbsoluteLayoutClip**.html" /> - <exclude name="uitest/integration-testscripts/**" /> + <fileset dir="${test.xml.dir}" id="html-test-files"> + <include name="src/**/*.html" /> + <exclude name="integration-testscripts/**/*.html" /> </fileset> <!-- This target converts HTML tests files to java junit tests. One test file for each browser is created. --> @@ -171,7 +165,7 @@ <!-- 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="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. --> @@ -181,13 +175,12 @@ <property name="com.vaadin.testbench.screenshot.block.error" value="0.025" /> <property name="com.vaadin.testbench.debug" value="false" /> - <parallel> <daemons> - <ant antfile="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="vaadin-server.xml" target="wait-for-startup" /> + <ant antfile="${test.xml.dir}/vaadin-server.xml" target="wait-for-startup" /> <antcall inheritall="true" inheritrefs="true" target="run-and-clean-up" /> </sequential> </parallel> diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml index f07ff49e50..3628483436 100644 --- a/uitest/vaadin-server.xml +++ b/uitest/vaadin-server.xml @@ -1,11 +1,12 @@ <?xml version="1.0"?> <project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" name="vaadin-server" default="deploy-and-start" basedir="."> <include file="../common.xml" /> + <dirname property="dir" file="${ant.file.vaadin-server}" /> <target name="deploy-and-start"> <fail unless="war.file" message="No war file given in 'war.file'" /> - <ivy:resolve file="ivy.xml" /> + <ivy:resolve file="${dir}/ivy.xml" /> <ivy:cachepath pathid="classpath.jetty" conf="jetty-run" /> <java classname="org.mortbay.jetty.runner.Runner" fork="yes"> <arg value="--port" /> |