summaryrefslogtreecommitdiffstats
path: root/tests/integration-testscripts
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2011-08-03 05:07:28 +0000
committerHenri Sara <henri.sara@itmill.com>2011-08-03 05:07:28 +0000
commit493f179c254a873a7a7ddf36f2a642c9386028da (patch)
tree9ee5059182906dcf08af08737633607046734ff5 /tests/integration-testscripts
parent577d3578bd373a53e575bd6f90b7a8e879381588 (diff)
downloadvaadin-framework-493f179c254a873a7a7ddf36f2a642c9386028da.tar.gz
vaadin-framework-493f179c254a873a7a7ddf36f2a642c9386028da.zip
#7266 converted most integration tests not to use Sampler, related screenshot updates
svn changeset:20086/svn branch:6.7
Diffstat (limited to 'tests/integration-testscripts')
-rw-r--r--tests/integration-testscripts/common/addressbook_deployment.tpl52
-rw-r--r--tests/integration-testscripts/common/sampler_deployment.tpl93
2 files changed, 52 insertions, 93 deletions
diff --git a/tests/integration-testscripts/common/addressbook_deployment.tpl b/tests/integration-testscripts/common/addressbook_deployment.tpl
new file mode 100644
index 0000000000..cf2d9364e4
--- /dev/null
+++ b/tests/integration-testscripts/common/addressbook_deployment.tpl
@@ -0,0 +1,52 @@
+<?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>addressbook_deployment</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">addressbook_deployment</td></tr>
+</thead><tbody>
+<tr>
+ <td>openAndWait</td>
+ <td>/demo/AddressBook</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=demoAddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+ <td>62,13</td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>500</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>Marge_selected</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=demoAddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>500</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-testscripts/common/sampler_deployment.tpl b/tests/integration-testscripts/common/sampler_deployment.tpl
deleted file mode 100644
index f98fa98133..0000000000
--- a/tests/integration-testscripts/common/sampler_deployment.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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>sampler_deployment</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">sampler_deployment</td></tr>
-</thead><tbody>
-<tr>
- <td>openAndWait</td>
- <td>/demo</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForVaadin</td>
- <td></td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClickAndWait</td>
- <td>//div[@id='sampler']/a/strong</td>
- <td>96,14</td>
-</tr>
-<tr>
- <td>pause</td>
- <td>1000</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForVaadin</td>
- <td></td>
- <td></td>
-</tr>
-<!--Start scrolling through all samples in order-->
-<tr>
- <td>mouseClick</td>
- <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[5]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
- <td>16,10</td>
-</tr>
-<tr>
- <td>waitForVaadin</td>
- <td></td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
- <td>11,13</td>
-</tr>
-<tr>
- <td>waitForVaadin</td>
- <td></td>
- <td></td>
-</tr>
-<tr>
- <td>pause</td>
- <td>500</td>
- <td></td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>tooltips</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
- <td>11,13</td>
-</tr>
-<tr>
- <td>waitForVaadin</td>
- <td></td>
- <td></td>
-</tr>
-<tr>
- <td>pause</td>
- <td>500</td>
- <td></td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td>icons</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>