aboutsummaryrefslogtreecommitdiffstats
path: root/tests/integration-testscripts
diff options
context:
space:
mode:
authorMikael Grankvist <mikael.grankvist@itmill.com>2010-09-07 06:12:39 +0000
committerMikael Grankvist <mikael.grankvist@itmill.com>2010-09-07 06:12:39 +0000
commit33167286e9a16d020340abde3d621b157ef39f04 (patch)
tree5b05afd36c27acb8939dbac434267e99aebb534f /tests/integration-testscripts
parent3826e2e42c5a5ecdec0b956015887d412451c358 (diff)
downloadvaadin-framework-33167286e9a16d020340abde3d621b157ef39f04.tar.gz
vaadin-framework-33167286e9a16d020340abde3d621b157ef39f04.zip
Updated integration tests.
Fixed GateIn test. Added Liferay6 test. svn changeset:14731/svn branch:6.4
Diffstat (limited to 'tests/integration-testscripts')
-rw-r--r--tests/integration-testscripts/Add_Sampler_to_Liferay.html2
-rw-r--r--tests/integration-testscripts/integration-test-GAE-sampler.html2
-rw-r--r--tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html33
-rw-r--r--tests/integration-testscripts/integration-test-liferay-6.0.5.html127
-rw-r--r--tests/integration-testscripts/sampler_deployment.tpl2
5 files changed, 159 insertions, 7 deletions
diff --git a/tests/integration-testscripts/Add_Sampler_to_Liferay.html b/tests/integration-testscripts/Add_Sampler_to_Liferay.html
index 09a3b7b02a..1148be05fe 100644
--- a/tests/integration-testscripts/Add_Sampler_to_Liferay.html
+++ b/tests/integration-testscripts/Add_Sampler_to_Liferay.html
@@ -3,7 +3,7 @@
<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://rndtestlinux.office.itmill.com:8080/" />
+<link rel="selenium.base" href="" />
<title>Add_Sampler_to_Liferay</title>
</head>
<body>
diff --git a/tests/integration-testscripts/integration-test-GAE-sampler.html b/tests/integration-testscripts/integration-test-GAE-sampler.html
index be3baa00b6..b35743c1fe 100644
--- a/tests/integration-testscripts/integration-test-GAE-sampler.html
+++ b/tests/integration-testscripts/integration-test-GAE-sampler.html
@@ -3,7 +3,7 @@
<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-test.appspot.com/" />
+<link rel="selenium.base" href="" />
<title>integration-test-GAE-sampler</title>
</head>
<body>
diff --git a/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html b/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
index 9d10fb8ea9..c9b5c16770 100644
--- a/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
+++ b/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
@@ -3,13 +3,13 @@
<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://rndtestlinux.office.itmill.com:8080/" />
-<title>GateIn-Test</title>
+<link rel="selenium.base" href="" />
+<title>integration-test-GateIn-3.1.0-sampler</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
-<tr><td rowspan="1" colspan="3">GateIn-Test</td></tr>
+<tr><td rowspan="1" colspan="3">integration-test-GateIn-3.1.0-sampler</td></tr>
</thead><tbody>
<tr>
<td>open</td>
@@ -17,6 +17,11 @@
<td></td>
</tr>
<tr>
+ <td>setSpeed</td>
+ <td>100</td>
+ <td>100</td>
+</tr>
+<tr>
<td>mouseClickAndWait</td>
<td>link=Administrator</td>
<td>27,7</td>
@@ -27,7 +32,7 @@
<td>93,13</td>
</tr>
<tr>
- <td>click</td>
+ <td>expectDialog</td>
<td>//div[2]/div[2]/div[1]/div[1]/div[2]</td>
<td>73,18</td>
</tr>
@@ -52,6 +57,11 @@
<td>55,11</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>pageName</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseClick</td>
<td>pageName</td>
<td>33,16</td>
@@ -67,11 +77,21 @@
<td>36,12</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIDropDownPageTemp']/div[1]/div/div/div/div/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>21,13</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPageEditor']/div[1]/div/div/div/div[2]</td>
+ <td></td>
+</tr>
+<tr>
<td>mouseClick</td>
<td>//div[3]/div</td>
<td>51,11</td>
@@ -112,6 +132,11 @@
<td>22,-1763</td>
</tr>
<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>screenCapture</td>
<td></td>
<td></td>
diff --git a/tests/integration-testscripts/integration-test-liferay-6.0.5.html b/tests/integration-testscripts/integration-test-liferay-6.0.5.html
new file mode 100644
index 0000000000..c17647a604
--- /dev/null
+++ b/tests/integration-testscripts/integration-test-liferay-6.0.5.html
@@ -0,0 +1,127 @@
+<?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="" />
+<title>integration-test-liferay-6.0.5</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">integration-test-liferay-6.0.5</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/web/guest/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>link=Login as bruno</td>
+ <td>50,5</td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>link=Add</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>link=Add</td>
+ <td>60,15</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>addPage</td>
+ <td>45,11</td>
+</tr>
+<tr>
+ <td>enterCharacter</td>
+ <td>//div/span[1]/span/input</td>
+ <td>Sampler</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>save</td>
+ <td>10,12</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//nav/ul/li[2]/a/span</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>//nav/ul/li[2]/a/span</td>
+ <td>26,7</td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>link=Add</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>link=Manage</td>
+ <td>32,4</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Page Layout</td>
+ <td>78,17</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//div[2]/img</td>
+ <td>47,73</td>
+</tr>
+<tr>
+ <td>mouseClickAndWait</td>
+ <td>//div[5]/span/span/input</td>
+ <td>32,14</td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>link=Add</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>link=Add</td>
+ <td>56,23</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>link=Moreā€¦</td>
+ <td>50,13</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[13]/h2/span</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//div[13]/h2/span</td>
+ <td>35,10</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>//div[13]/div/div[8]/p/a</td>
+ <td>10,10</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration-testscripts/sampler_deployment.tpl b/tests/integration-testscripts/sampler_deployment.tpl
index f7f6839a96..11125d733c 100644
--- a/tests/integration-testscripts/sampler_deployment.tpl
+++ b/tests/integration-testscripts/sampler_deployment.tpl
@@ -3,7 +3,7 @@
<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://rndtestlinux.office.itmill.com:8080/" />
+<link rel="selenium.base" href="" />
<title>sampler_deployment</title>
</head>
<body>