Merged (partly by hand) [9451],[9466]

svn changeset:9576/svn branch:6.2

diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html b/tests/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
index c476374a70c1da01a9e04f76f34f24ced474ff45..d133ab99373889909e848cba9779d988a7c6f6c4 100644 (file)
--- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
+++ b/tests/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
@@ -24,7 +24,7 @@
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td></td>
+       <td>no-tooltip</td>
 </tr>
 <tr>
        <td>click</td>
@@ -37,29 +37,29 @@
        <td></td>
 </tr>
 <tr>
-       <td>mouseOver</td>
+       <td>showTooltip</td>
        <td>vaadin=runcomvaadintestscomponentstabsheetTabsheetTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
-       <td></td>
+       <td>0,0</td>
 </tr>
 <tr>
-       <td>pause</td>
-       <td>1000</td>
+       <td>waitForVaadin</td>
+       <td></td>
        <td></td>
 </tr>
 <tr>
-       <td>waitForVaadin</td>
-       <td></td>
+       <td>pause</td>
+       <td>100</td>
        <td></td>
 </tr>
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td></td>
+       <td>tooltip-tab1</td>
 </tr>
 <tr>
-       <td>mouseOver</td>
+       <td>showTooltip</td>
        <td>vaadin=runcomvaadintestscomponentstabsheetTabsheetTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
-       <td></td>
+       <td>0,0</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
@@ -68,13 +68,13 @@
 </tr>
 <tr>
        <td>pause</td>
-       <td>1000</td>
+       <td>100</td>
        <td></td>
 </tr>
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td></td>
+       <td>tooltip-tab2</td>
 </tr>
 
 </tbody></table>