aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Valli <juuso@vaadin.com>2014-06-03 15:46:42 +0300
committerJuuso Valli <juuso@vaadin.com>2014-06-03 15:46:42 +0300
commit85efc3bff1bdbe6ca19316a7eb6b8cc34d97f9c7 (patch)
tree3568dec644063ecf18f636b6b1582bef16344b45
parent44eadeaa160152616152cd33f8181d7ab1fa3359 (diff)
downloadvaadin-framework-85efc3bff1bdbe6ca19316a7eb6b8cc34d97f9c7.tar.gz
vaadin-framework-85efc3bff1bdbe6ca19316a7eb6b8cc34d97f9c7.zip
Fix broken TB2 tests
Change-Id: I1ce52065e529d471876e8aae1b53b5808089cc53
-rw-r--r--uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html122
-rw-r--r--uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html2
-rw-r--r--uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.html24
3 files changed, 13 insertions, 135 deletions
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html
deleted file mode 100644
index f7c57baf1f..0000000000
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html
+++ /dev/null
@@ -1,122 +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>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/run/com.vaadin.tests.components.menubar.MenuBarToolTips?restartApplication</td>
- <td></td>
-</tr>
-<tr>
- <td>showTooltip</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
- <td>0,0</td>
-</tr>
-<tr>
- <td>pause</td>
- <td>1000</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td>File menu</td>
-</tr>
-<tr>
- <td>mouseOut</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item0</td>
- <td>18,11</td>
-</tr>
-<tr>
- <td>showTooltip</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VOverlay[0]/VMenuBar[0]#item0</td>
- <td>0,0</td>
-</tr>
-<tr>
- <td>pause</td>
- <td>1000</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td>File - Foo menu</td>
-</tr>
-<tr>
- <td>mouseOut</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::/VVerticalLayout[0]/domChild[1]</td>
- <td>830,200</td>
-</tr>
-<tr>
- <td>showTooltip</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item1</td>
- <td>0,0</td>
-</tr>
-<tr>
- <td>pause</td>
- <td>1000</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td>Edit menu</td>
-</tr>
-<tr>
- <td>mouseOut</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::/VVerticalLayout[0]/domChild[1]</td>
- <td>625,184</td>
-</tr>
-<tr>
- <td>mouseClick</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VMenuBar[0]#item1</td>
- <td>9,6</td>
-</tr>
-<tr>
- <td>showTooltip</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VOverlay[0]/VMenuBar[0]#item1</td>
- <td>0,0</td>
-</tr>
-<tr>
- <td>pause</td>
- <td>1000</td>
- <td></td>
-</tr>
-<tr>
- <td>assertText</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td>Edit - Bar menu</td>
-</tr>
-<tr>
- <td>mouseOut</td>
- <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarToolTips::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html b/uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html
index 806e7d1b44..6014f557e7 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html
@@ -64,7 +64,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runcomvaadintestscomponentssliderSliderTest::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
</tbody></table>
diff --git a/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.html b/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.html
index 2df9fb678c..4c2dec9784 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.html
@@ -46,7 +46,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--Button tooltip-->
<tr>
@@ -77,7 +77,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--TextField tooltip-->
<tr>
@@ -108,7 +108,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--Cell and row tooltips-->
<tr>
@@ -145,7 +145,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--Button tooltip-->
<tr>
@@ -176,7 +176,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--TextField tooltip-->
<tr>
@@ -207,7 +207,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--Row and Component tooltips-->
<tr>
@@ -249,7 +249,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--Button tooltip-->
<tr>
@@ -280,7 +280,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--TextField tooltip-->
<tr>
@@ -311,7 +311,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--Row tooltips-->
<tr>
@@ -348,7 +348,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--Button tooltip-->
<tr>
@@ -379,7 +379,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
<!--TextField tooltip-->
<tr>
@@ -410,7 +410,7 @@
<tr>
<td>assertElementPositionLeft</td>
<td>vaadin=runTableItemDescriptionGeneratorTest::Root/VTooltip[0]</td>
- <td>-1000</td>
+ <td>-5000</td>
</tr>
</tbody></table>