aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2013-04-16 15:20:44 +0300
committerVaadin Code Review <review@vaadin.com>2013-04-17 22:22:42 +0000
commitd44f49c73b2042c03ed2f6f94537949ff94dc471 (patch)
treed7e71b25f89426884780b2d077c289daebbd01d1
parentcdcdc115b79f0773c2d140e43f58cfe9cb4b1cdb (diff)
downloadvaadin-framework-d44f49c73b2042c03ed2f6f94537949ff94dc471.tar.gz
vaadin-framework-d44f49c73b2042c03ed2f6f94537949ff94dc471.zip
Run server integration tests with push enabled #11494
Change-Id: Iaeac0053372f4606e760925ab0f105193153c3a3
-rw-r--r--uitest/integration-testscripts/common/integration_push_test.tpl42
-rw-r--r--uitest/integration_tests.xml35
2 files changed, 77 insertions, 0 deletions
diff --git a/uitest/integration-testscripts/common/integration_push_test.tpl b/uitest/integration-testscripts/common/integration_push_test.tpl
new file mode 100644
index 0000000000..4e93f628e5
--- /dev/null
+++ b/uitest/integration-testscripts/common/integration_push_test.tpl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://vaadin-integration-tests:8080/" />
+<title>integration_test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">integration_test</td></tr>
+</thead><tbody>
+<tr>
+ <td>openAndWait</td>
+ <td>/demo/run-push/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>1000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>initial</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=demorunpushcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+ <td>51,13</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>finland</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index f8d250554c..60296ee8c3 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -54,6 +54,23 @@
<fileset dir="." includes="test.xml" />
</subant>
</target>
+
+ <target name="integration-test-push-servlet">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-push-servlet.html" />
+ <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
+ <subant target="run-tests" failonerror="false" antfile="test.xml">
+ <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
+ <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
+ <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
+ <property name="server.start.succeeded" value="1" />
+ <property name="browsers" value="${test_browsers}" />
+ <property name="testfiles" value="${testfiles}" />
+ <property name="test-output-dir" value="${integration_test.dir}/result/integration-test-output/${server-name}" />
+ <property name="retries" value="0" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
<target name="integration-test-theme">
<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -427,6 +444,24 @@
</antcontrib:then>
</antcontrib:if>
+ <!-- Run integration tests with push -->
+ <copy file="integration-testscripts/common/integration_push_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-push-servlet.html" overwrite="true" />
+ <antcall target="integration-test-push-servlet">
+ <param name="server-name" value="${target-server}" />
+ <param name="deployment.url" value="http://${target-host}:${target-port}" />
+ </antcall>
+
+ <!-- Run theme tests in all browsers if there's a property with the test files -->
+ <antcontrib:if>
+ <isset property="testfiles-theme" />
+ <antcontrib:then>
+ <antcall target="integration-test-theme">
+ <param name="server-name" value="${target-server}" />
+ <param name="deployment.url" value="http://${target-host}:${target-port}" />
+ </antcall>
+ </antcontrib:then>
+ </antcontrib:if>
+
<!-- timeout in five minutes -->
<sshexec host="${target-host}" outputproperty="stop-output" timeout="600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" failonerror="false" />
<antcall target="echo-prefix">