Updated the testbench testcases that broke due to the VScrollTable DOM changes

svn changeset:18289/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html b/tests/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
index 28fe12f5a2144fd015c007b2919cb9b724725719..f7b90411341c03655fe128aab64437fa95ee5c19 100644 (file)
--- a/tests/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
+++ b/tests/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
@@ -43,7 +43,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
@@ -53,7 +53,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VNativeButton[0]</td>
+       <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VNativeButton[0]</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html b/tests/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
index 6c8a770b6aa7d9b49fd6417b488ce76b0d386d0c..ebf64e4e4ac55ed3a3717e38879cb83e9695bf7f 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
+++ b/tests/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
@@ -12,46 +12,45 @@
 <tr><td rowspan="1" colspan="3">ContainerChangeWithPartlySamePropertyIds</td></tr>
 </thead><tbody>
 <tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.table.ContainerChangeWithPartlySamePropertyIds?restartApplication</td>
-       <td></td>
+    <td>open</td>
+    <td>/run/com.vaadin.tests.components.table.ContainerChangeWithPartlySamePropertyIds?restartApplication</td>
+    <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableContainerChangeWithPartlySamePropertyIds::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
+    <td>click</td>
+    <td>vaadin=runcomvaadintestscomponentstableContainerChangeWithPartlySamePropertyIds::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+    <td></td>
 </tr>
 <tr>
-       <td>contextmenu</td>
-       <td>vaadin=runcomvaadintestscomponentstableContainerChangeWithPartlySamePropertyIds::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
-       <td></td>
+    <td>contextmenu</td>
+    <td>vaadin=runcomvaadintestscomponentstableContainerChangeWithPartlySamePropertyIds::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/domChild[1]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+    <td><br /></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>property4</td>
-       <td></td>
+    <td>verifyTextPresent</td>
+    <td>property4</td>
+    <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>value_prop4</td>
-       <td></td>
+    <td>verifyTextPresent</td>
+    <td>value_prop4</td>
+    <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableContainerChangeWithPartlySamePropertyIds::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
+    <td>click</td>
+    <td>vaadin=runcomvaadintestscomponentstableContainerChangeWithPartlySamePropertyIds::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+    <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>property1</td>
-       <td></td>
+    <td>verifyTextPresent</td>
+    <td>property1</td>
+    <td></td>
 </tr>
 <tr>
-       <td>verifyTextPresent</td>
-       <td>value1</td>
-       <td></td>
+    <td>verifyTextPresent</td>
+    <td>value1</td>
+    <td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

diff --git a/tests/src/com/vaadin/tests/components/table/EditableModeChange.html b/tests/src/com/vaadin/tests/components/table/EditableModeChange.html
index 2a7949f3bade4906e069ced01fd57b9b4a647346..fac8946cbdd8fa3c77098f9ce61963b8fb194f29 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/EditableModeChange.html
+++ b/tests/src/com/vaadin/tests/components/table/EditableModeChange.html
@@ -30,7 +30,7 @@
 <!--Update name for selected row-->\r
 <tr>\r
        <td>enterCharacter</td>\r
-       <td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VTextField[0]</td>\r
+       <td>vaadin=runcomvaadintestscomponentstableEditableModeChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VTextField[0]</td>\r
        <td>baa</td>\r
 </tr>\r
 <tr>\r

diff --git a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
index 62e3786a44ceb5cb6523c1b827c5e95486d48b05..1a87ad61e98cb324c8b4b84ee243b2097e90a415 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
+++ b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
@@ -12,117 +12,117 @@
 <tr><td rowspan="1" colspan="3">LabelEmbeddedClickThroughForTable</td></tr>
 </thead><tbody>
 <tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.table.LabelEmbeddedClickThroughForTable?restartApplication</td>
-       <td></td>
+    <td>open</td>
+    <td>/run/com.vaadin.tests.components.table.LabelEmbeddedClickThroughForTable?restartApplication</td>
+    <td></td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
-       <td>32,13</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+    <td>32,13</td>
 </tr>
 <!--  Work around for Opera issue #5597 -->
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
-       <td>30,12</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+    <td>30,12</td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
-       <td>32,13</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+    <td>32,13</td>
 </tr>
 <!--  Work around done -->
 <tr>
-       <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
-       <td>v-selected</td>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+    <td>v-selected</td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
-       <td>30,12</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+    <td>30,12</td>
 </tr>
 <tr>
-       <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
-       <td>v-selected</td>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+    <td>v-selected</td>
 </tr>
 <tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>row-2-selected</td>
+    <td>screenCapture</td>
+    <td></td>
+    <td>row-2-selected</td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[0]</td>
-       <td>32,9</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[0]</td>
+    <td>32,9</td>
 </tr>
 <!--  Moved here to avoid Opera issue #5588 -->
 <tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>row-1-selected</td>
+    <td>screenCapture</td>
+    <td></td>
+    <td>row-1-selected</td>
 </tr>
 <tr>
-       <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
-       <td>v-selected</td>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+    <td>v-selected</td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[0]</td>
-       <td>22,6</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[0]</td>
+    <td>22,6</td>
 </tr>
 <tr>
-       <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
-       <td>v-selected</td>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+    <td>v-selected</td>
 </tr>
 <tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>row-2-selected</td>
+    <td>screenCapture</td>
+    <td></td>
+    <td>row-2-selected</td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[1]/domChild[0]</td>
-       <td></td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[1]/domChild[0]</td>
+    <td></td>
 </tr>
 <tr>
-       <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
-       <td>v-selected</td>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+    <td>v-selected</td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[0]</td>
-       <td>22,6</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[0]</td>
+    <td>22,6</td>
 </tr>
 <tr>
-       <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
-       <td>v-selected</td>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+    <td>v-selected</td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VEmbedded[0]/domChild[0]</td>
-       <td>19,14</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VEmbedded[0]/domChild[0]</td>
+    <td>19,14</td>
 </tr>
 <tr>
-       <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
-       <td>v-selected</td>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+    <td>v-selected</td>
 </tr>
 <tr>
-       <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VEmbedded[0]/domChild[0]</td>
-       <td>16,15</td>
+    <td>mouseClick</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VEmbedded[0]/domChild[0]</td>
+    <td>16,15</td>
 </tr>
 <tr>
-       <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
-       <td>v-selected</td>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+    <td>v-selected</td>
 </tr>
 </tbody></table>
 </body>

diff --git a/tests/src/com/vaadin/tests/components/table/ModifyContainerProperty.html b/tests/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
index 93d97cd6984464ec438539c9f69a33bedd995352..59c0f83dffa77d20944cb2e18e563987d949d436 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
+++ b/tests/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
@@ -12,31 +12,30 @@
 <tr><td rowspan="1" colspan="3">ModifyContainerProperty</td></tr>
 </thead><tbody>
 <tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.table.ModifyContainerProperty?restartApplication</td>
-       <td></td>
+    <td>open</td>
+    <td>/run/com.vaadin.tests.components.table.ModifyContainerProperty?restartApplication</td>
+    <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableModifyContainerProperty::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
+    <td>click</td>
+    <td>vaadin=runcomvaadintestscomponentstableModifyContainerProperty::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+    <td></td>
 </tr>
 <tr>
-       <td>assertTextNotPresent</td>
-       <td>bar</td>
-       <td></td>
+    <td>assertTextNotPresent</td>
+    <td>bar</td>
+    <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableModifyContainerProperty::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-       <td></td>
+    <td>click</td>
+    <td>vaadin=runcomvaadintestscomponentstableModifyContainerProperty::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+    <td></td>
 </tr>
 <tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentstableModifyContainerProperty::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
-       <td>three</td>
+    <td>assertText</td>
+    <td>vaadin=runcomvaadintestscomponentstableModifyContainerProperty::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[1]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+    <td>three</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

diff --git a/tests/src/com/vaadin/tests/components/table/PropertyValueChange.html b/tests/src/com/vaadin/tests/components/table/PropertyValueChange.html
index 71d323cdc057ad05c368f203204a79a37b8d61de..0db553766178a522b390a2ad63863f1954f0c03c 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/PropertyValueChange.html
+++ b/tests/src/com/vaadin/tests/components/table/PropertyValueChange.html
@@ -28,7 +28,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VFilterSelect[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VFilterSelect[0]/domChild[1]</td>
        <td></td>
 </tr>
 <tr>
@@ -48,7 +48,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
        <td></td>
 </tr>
 <tr>
@@ -58,7 +58,7 @@
 </tr>
 <tr>
        <td>type</td>
-       <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
        <td>9</td>
 </tr>
 <tr>

diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.html b/tests/src/com/vaadin/tests/components/table/TableRowHeight2.html
index a440ff84fbe2a348d966cf3ae82ba98b1a1b5ee5..d7d46fcf6d4ddfffecbe6209a91d0fa22e31cd69 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.html
+++ b/tests/src/com/vaadin/tests/components/table/TableRowHeight2.html
@@ -28,7 +28,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableTableRowHeight2::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[1]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableTableRowHeight2::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[1]/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
@@ -38,7 +38,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableTableRowHeight2::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VButton[1]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableTableRowHeight2::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VButton[1]/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>

diff --git a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html b/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
index 99f8f5bf9b6c3c8af4128e948c18a4976f5d5400..01821840766776b03d51454b8139d42e8383fe6a 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
+++ b/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
@@ -34,7 +34,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableTextFieldRelativeWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[2]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableTextFieldRelativeWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[2]/VButton[0]/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
@@ -44,7 +44,7 @@
 </tr>
 <tr>
        <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableTextFieldRelativeWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[4]/VButton[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableTextFieldRelativeWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/VScrollTable$1[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[4]/VButton[0]/domChild[0]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>