aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2010-08-19 11:36:26 +0000
committerMarc Englund <marc.englund@itmill.com>2010-08-19 11:36:26 +0000
commit49be14bf46f764fec601b6f4f6e2748ee6003619 (patch)
treec97b0449e043fcb5d57f7d5ae663628b33418cec
parent4afa907d449f541cd4b6a32c8c2a52d48c0d3a76 (diff)
downloadvaadin-framework-49be14bf46f764fec601b6f4f6e2748ee6003619.tar.gz
vaadin-framework-49be14bf46f764fec601b6f4f6e2748ee6003619.zip
Modified test to use assertElementPresent
svn changeset:14544/svn branch:6.4
-rw-r--r--tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.html71
1 files changed, 48 insertions, 23 deletions
diff --git a/tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.html b/tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.html
index 025444afdf..c9c869e18a 100644
--- a/tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.html
+++ b/tests/src/com/vaadin/tests/layouts/WidgetImplementationSwap.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://localhost:8080/" />
+<link rel="selenium.base" href="" />
<title>New Test</title>
</head>
<body>
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/run/com.vaadin.tests.layouts.WidgetImplementationSwap?restartApplication</td>
+ <td>/run/com.vaadin.tests.layouts.WidgetImplementationSwap?debug&amp;restartApplication</td>
<td></td>
</tr>
<tr>
@@ -47,6 +47,16 @@
<td></td>
</tr>
<tr>
+ <td>assertElementPresent</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[0]/VTextArea[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
@@ -58,7 +68,17 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>
<td></td>
</tr>
<tr>
@@ -87,8 +107,8 @@
<td></td>
</tr>
<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>assertElementPresent</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>
<td></td>
</tr>
<tr>
@@ -98,7 +118,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -108,7 +128,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[9]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -117,8 +137,8 @@
<td></td>
</tr>
<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[9]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>assertElementPresent</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[6]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VTextArea[0]</td>
<td></td>
</tr>
<tr>
@@ -127,29 +147,34 @@
<td></td>
</tr>
<tr>
- <td>assertElementHeight</td>
- <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>
- <td>66</td>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[9]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
</tr>
<tr>
- <td>assertElementHeight</td>
- <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextArea[0]</td>
- <td>66</td>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
</tr>
<tr>
- <td>assertElementHeight</td>
- <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[6]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VTextArea[0]</td>
- <td>66</td>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[9]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
</tr>
<tr>
- <td>assertElementHeight</td>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
<td>vaadin=runcomvaadintestslayoutsWidgetImplementationSwap::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[8]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTextArea[0]</td>
- <td>66</td>
+ <td></td>
</tr>
<tr>
- <td>assertElementHeight</td>
- <td>//input[@type='text']</td>
- <td>66</td>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
</tr>
</tbody></table>