Merged test updates from 6.1

svn changeset:9285/svn branch:6.2

diff --git a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 61aa100a3689ac3e9f936e5ab21a88c69785cfbf..9e529836b6e47f776a800beda5f726b6eaf4c0e2 100644 (file)
--- a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
+++ b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
@@ -58,16 +58,7 @@
        <td></td>
        <td></td>
 </tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-       <td>79,15</td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
+<!--Hide 'Col1' using button-->
 <tr>
        <td>enterCharacter</td>
        <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
@@ -78,17 +69,6 @@
        <td></td>
        <td></td>
 </tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
-       <td>221,457</td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
-<!--Hide 'Col1' using button-->
 <tr>
        <td>click</td>
        <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
@@ -104,31 +84,26 @@
        <td></td>
        <td>col1-col2-hidden</td>
 </tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-       <td>55,14</td>
-</tr>
+<!--Show 'col2' using action handler-->
 <tr>
        <td>waitForVaadin</td>
        <td></td>
        <td></td>
 </tr>
 <tr>
-       <td>enterCharacter</td>
-       <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-       <td>Col2</td>
+       <td>contextmenu</td>
+       <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+       <td></td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
        <td></td>
        <td></td>
 </tr>
-<!--Show 'col2' using button-->
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VContextMenu[0]#option0</td>
+       <td>11,6</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
@@ -136,9 +111,9 @@
        <td></td>
 </tr>
 <tr>
-       <td>mouseClick</td>
+       <td>enterCharacter</td>
        <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-       <td>70,16</td>
+       <td>Col2</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
@@ -150,16 +125,7 @@
        <td></td>
        <td>col1-hidden</td>
 </tr>
-<tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-       <td>45,19</td>
-</tr>
-<tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
-</tr>
+<!--Show 'Col1' using button-->
 <tr>
        <td>enterCharacter</td>
        <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
@@ -170,7 +136,6 @@
        <td></td>
        <td></td>
 </tr>
-<!--Show 'Col1' using button-->
 <tr>
        <td>click</td>
        <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>