From 1e22aaf4df18413e537731f6b2bac249022cb72e Mon Sep 17 00:00:00 2001
From: Sauli Tähkäpää <sauli@vaadin.com>
Date: Mon, 10 Mar 2014 07:45:55 +0200
Subject: Added nojavadoc parameter, test-server, test-tb2, test-tb3 targets.

Change-Id: I3b0f4ebc247d0cdbf5d8cdd78c3088207e2f8e45
---
 uitest/build.xml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'uitest')

diff --git a/uitest/build.xml b/uitest/build.xml
index 7d5ce867fe..b9bb5a4cbd 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -191,6 +191,44 @@
         </parallel>
     </target>
 
+    <target name="test-server" depends="clean-testbench-errors">
+       <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+       <parallel>
+         <daemons>
+           <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
+         </daemons>
+         <sequential>
+           <ant antfile="${uitest.dir}/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false">
+             <property name="demo.war" value="${war.file}" />
+           </ant>
+         </sequential>
+       </parallel>
+    </target>
+
+    <target name="test-tb2" depends="clean-testbench-errors">
+       <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+       <parallel>
+         <daemons>
+           <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
+         </daemons>
+         <sequential>
+           <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" />
+         </sequential>
+       </parallel>
+    </target>
+
+    <target name="test-tb3" depends="clean-testbench-errors">
+       <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+       <parallel>
+         <daemons>
+           <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
+         </daemons>
+         <sequential>
+           <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" />
+         </sequential>
+       </parallel>
+    </target>
+
     <target name="clean-testbench-errors">
         <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" />
         <mkdir dir="${com.vaadin.testbench.screenshot.directory}/errors" />
-- 
cgit v1.2.3