summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/build.xml6
-rw-r--r--tests/integration-testscripts/eXo-3/eXo-integration.html182
-rw-r--r--tests/integration_tests.xml34
-rw-r--r--tests/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html5
4 files changed, 224 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml
index 36f00ad63f..232c175dfb 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1159,9 +1159,9 @@
<target name="tests" depends="compile-java, internal-package-war">
<!-- Run all different types of tests in parallel to decrease testing time -->
<parallel threadcount="3">
- <antcall target="integration-tests"></antcall>
- <antcall target="testbench-tests"></antcall>
- <antcall target="server-side-tests"></antcall>
+ <antcall inheritrefs="true" inheritall="true" target="integration-tests"></antcall>
+ <antcall inheritrefs="true" inheritall="true" target="testbench-tests"></antcall>
+ <antcall inheritrefs="true" inheritall="true" target="server-side-tests"></antcall>
</parallel>
</target>
diff --git a/tests/integration-testscripts/eXo-3/eXo-integration.html b/tests/integration-testscripts/eXo-3/eXo-integration.html
new file mode 100644
index 0000000000..10bd1e2922
--- /dev/null
+++ b/tests/integration-testscripts/eXo-3/eXo-integration.html
@@ -0,0 +1,182 @@
+<?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.intra.itmill.com:8080/" />
+<title>eXo-integration</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">eXo-integration</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/default/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Visit the Acme Social Intranet</td>
+ <td>121,7</td>
+</tr>
+<tr>
+ <td>setTimeout</td>
+ <td>60000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Login as John</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Login as John</td>
+ <td>37,4</td>
+</tr>
+<tr>
+ <td>setTimeout</td>
+ <td>60000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Applications Registry</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>link=Applications Registry</td>
+ <td>138,17</td>
+</tr>
+<tr>
+ <td>expectDialog</td>
+ <td>//div[@onclick=&quot;javascript:if(confirm('This action will automatically create categories and import all the gadgets and portlets on it.'))ajaxGet('/portal/private/intranet/administration/registry?portal:componentId=09e0ea8b-7d6e-410d-9ed0-871e3e7bc17f&amp;portal:type=action&amp;uicomponent=UIApplicationOrganizer&amp;op=ImportAllApplications&amp;ajaxRequest=true')&quot;]</td>
+ <td>36,15</td>
+</tr>
+<tr>
+ <td>getConfirmation</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=demo</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Add New Page</td>
+ <td>64,16</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIWizardPageSetInfo']/div[2]/div[2]/div/div[2]/div[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>pageName</td>
+ <td>98,10</td>
+</tr>
+<tr>
+ <td>enterCharacter</td>
+ <td>pageName</td>
+ <td>Application_test</td>
+</tr>
+<tr>
+ <td>enterCharacter</td>
+ <td>pageDisplayName</td>
+ <td>Vaadin test</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>24,16</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIWizardPageSelectLayoutForm']/div[2]/div/div[1]/div[2]/div[1]/div[1]/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
+ <td>20,12</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=demo</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=demo</td>
+ <td>24,7</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[2]</td>
+ <td>147,6</td>
+</tr>
+<tr>
+ <td>mouseMoveAt</td>
+ <td>//div[2]/div/div/div[1]/div/div[2]/div/div/div/div</td>
+ <td>20,20</td>
+</tr>
+<tr>
+ <td>drop</td>
+ <td>//div[@id='UIPortalApplication']/div[4]</td>
+ <td>760,138</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
+ <td>10,7</td>
+</tr>
+<tr>
+ <td>setTimeout</td>
+ <td>60000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//tr[3]/td[1]/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//tr[3]/td[1]/div</td>
+ <td>64,15</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>Marge_selected</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[4]/div/div/div[3]/div/div/span</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>Marge_in_edit_mode</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 5d9da5583e..f1f16d1243 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -294,6 +294,23 @@
</subant>
</target>
+ <target name="integration-test-eXo-3">
+ <fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/eXo-integration.html" />
+ <pathconvert pathsep=" " property="test-gatein" 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="winxp-firefox36" />
+ <property name="testfiles" value="${test-gatein}" />
+ <property name="test-output-dir" value="../build/integration-test-output" />
+
+ <fileset dir="." includes="test.xml" />
+ </subant>
+ </target>
+
<target name="integration-test-start-liferay-5">
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-5.2.3" />
</target>
@@ -326,6 +343,14 @@
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-gatein-3.1.0" />
</target>
+ <target name="integration-test-start-eXo-3">
+ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-eXo-3.0.3" />
+ </target>
+
+ <target name="integration-test-stop-eXo-3">
+ <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-eXo-3.0.3" />
+ </target>
+
<!-- Run sampler deployment test for WebLogic server -->
<target name="integration-test-test-weblogic">
<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />
@@ -508,6 +533,12 @@
<antcall target="integration-test-stop-gatein-3" />
</target>
+ <target name="integration-test-eXo3">
+ <antcall target="integration-test-start-eXo-3" />
+ <antcall target="integration-test-eXo-3" />
+ <antcall target="integration-test-stop-eXo-3" />
+ </target>
+
<target name="integration-test-weblogic9">
<antcall target="integration-test-start-weblogic9"/>
<antcall target="integration-test-test-weblogic">
@@ -585,6 +616,9 @@
<param name="target-server" value="gatein3"/>
</antcall>
<antcall target="run-integration-test">
+ <param name="target-server" value="eXo3"/>
+ </antcall>
+ <antcall target="run-integration-test">
<param name="target-server" value="weblogic9"/>
</antcall>
<antcall target="run-integration-test">
diff --git a/tests/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html b/tests/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
index db765cccd3..70abbd78ba 100644
--- a/tests/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
+++ b/tests/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
@@ -76,6 +76,11 @@
</tr>
<!--scroll right-->
<tr>
+ <td>pause</td>
+ <td>300</td>
+ <td></td>
+</tr>
+<tr>
<td>scrollLeft</td>
<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]</td>
<td>200</td>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 10:26:55 +0000