summaryrefslogtreecommitdiffstats
path: root/tests/integration-testscripts
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2011-08-12 09:53:31 +0000
committerHenri Sara <henri.sara@itmill.com>2011-08-12 09:53:31 +0000
commita25b677763730d83e8b1986b752f9021dfa61594 (patch)
tree0c23ff12d5e1e04e8abb122d735c246e31fc7937 /tests/integration-testscripts
parent2a0bf9b8b613addca8a35e7bb6df4c9bcef62917 (diff)
downloadvaadin-framework-a25b677763730d83e8b1986b752f9021dfa61594.tar.gz
vaadin-framework-a25b677763730d83e8b1986b752f9021dfa61594.zip
#7178 New servlet integration test not using the address book demo, related screenshots
svn changeset:20342/svn branch:6.7
Diffstat (limited to 'tests/integration-testscripts')
-rw-r--r--tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html57
-rw-r--r--tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html42
-rw-r--r--tests/integration-testscripts/common/integration_test.tpl (renamed from tests/integration-testscripts/common/addressbook_deployment.tpl)26
3 files changed, 50 insertions, 75 deletions
diff --git a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html
deleted file mode 100644
index 495a9ec2e8..0000000000
--- a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE-addressbook.html
+++ /dev/null
@@ -1,57 +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="http://vaadin-integration-test.appspot.com/" />
-<title>integration-test-GAE-addressbook</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">integration-test-GAE-addressbook</td></tr>
-</thead><tbody>
-<tr>
- <td>openAndWait</td>
- <td>/AddressBook</td>
- <td></td>
-</tr>
-<tr>
- <td>pause</td>
- <td>5000</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=AddressBook::/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>1000</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>vaadin=AddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>pause</td>
- <td>1000</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyTextPresent</td>
- <td>Save</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyValue</td>
- <td>vaadin=AddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
- <td>Marge</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
new file mode 100644
index 0000000000..ff6889d2c8
--- /dev/null
+++ b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
@@ -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-test.appspot.com/" />
+<title>integration-test-GAE</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">integration-test-GAE</td></tr>
+</thead><tbody>
+<tr>
+ <td>openAndWait</td>
+ <td>/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestsintegrationIntegrationTestApplication::/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>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyValue</td>
+ <td>vaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>
+ <td>FI</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration-testscripts/common/addressbook_deployment.tpl b/tests/integration-testscripts/common/integration_test.tpl
index cf2d9364e4..4275d3fab0 100644
--- a/tests/integration-testscripts/common/addressbook_deployment.tpl
+++ b/tests/integration-testscripts/common/integration_test.tpl
@@ -4,24 +4,19 @@
<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>
+<title>integration_test</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
-<tr><td rowspan="1" colspan="3">addressbook_deployment</td></tr>
+<tr><td rowspan="1" colspan="3">integration_test</td></tr>
</thead><tbody>
<tr>
<td>openAndWait</td>
- <td>/demo/AddressBook</td>
+ <td>/demo/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication</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>
@@ -29,22 +24,17 @@
<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>
+ <td>initial</td>
</tr>
<tr>
- <td>pause</td>
- <td>500</td>
- <td></td>
+ <td>mouseClick</td>
+ <td>vaadin=demoruncomvaadintestsintegrationIntegrationTestApplication::/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>Marge_in_edit_mode</td>
+ <td>finland</td>
</tr>
</tbody></table>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 07:37:59 +0000