Fixed test (gwt-id-X not stable)

Change-Id: I4def9e78d3985d6f1c28fe7eb816120615cec057

diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 261d1939cd32a5ecd6791a565b67375526e5ddb8..4dc63721a18980a7c4b9e0d35bec14c832c3df03 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
@@ -29,9 +29,9 @@
 </tr>
 <!--Hide 'col2' through table interface-->
 <tr>
-       <td>click</td>
-       <td>//td[@id='gwt-uid-7']/span/div</td>
-       <td></td>
+       <td>mouseClick</td>
+       <td>//tr[2]/td/span/div</td>
+       <td>23,2</td>
 </tr>
 <tr>
        <td>screenCapture</td>

diff --git a/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.html b/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.html
index 5170d4408f5922857f2a64268500032e0ada7b61..c1734481c6b38c598b1e6659b738bcb5775dc130 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.html
+++ b/uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.html
@@ -29,12 +29,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td>This is a short tooltip</td>
 </tr>
 <tr>
@@ -44,7 +44,7 @@
 </tr>
 <tr>
        <td>assertElementNotPresent</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td></td>
 </tr>
 <!--Long close delay-->
@@ -60,12 +60,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td>This is a short tooltip</td>
 </tr>
 <tr>
@@ -75,7 +75,7 @@
 </tr>
 <tr>
        <td>assertElementPresent</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td></td>
 </tr>
 <tr>
@@ -96,12 +96,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertElementWidth</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td>500</td>
 </tr>
 <tr>
@@ -122,12 +122,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertElementWidth</td>
-       <td>id=gwt-uid-3</td>
+       <td>vaadin=runcomvaadintestscomponentsuiTooltipConfiguration::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
        <td>100</td>
 </tr>
 </tbody></table>

diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.html b/uitest/src/com/vaadin/tests/push/BasicPush.html
index f69a573425f7b14915a6112b4c687b92a47d517e..173ec90674aea73943c305f73b638fa851f31b45 100644 (file)
--- a/uitest/src/com/vaadin/tests/push/BasicPush.html
+++ b/uitest/src/com/vaadin/tests/push/BasicPush.html
@@ -19,7 +19,7 @@
 <!--Test client initiated push -->
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-5</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
        <td>0</td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-5</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
        <td>1</td>
 </tr>
 <tr>
@@ -49,7 +49,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-5</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
        <td>4</td>
 </tr>
 <!--Test server initiated push-->
@@ -60,7 +60,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-7</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
        <td>0</td>
 </tr>
 <tr>
@@ -70,7 +70,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-7</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
        <td>1</td>
 </tr>
 <tr>
@@ -80,7 +80,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-7</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
        <td>2</td>
 </tr>
 </tbody></table>

diff --git a/uitest/src/com/vaadin/tests/push/StreamingPush.html b/uitest/src/com/vaadin/tests/push/StreamingPush.html
index 533f571b9ca5c2409d979d9e5b3aca769212a92a..cf94a09c63c85eed91953687f387c66b36c97f99 100644 (file)
--- a/uitest/src/com/vaadin/tests/push/StreamingPush.html
+++ b/uitest/src/com/vaadin/tests/push/StreamingPush.html
@@ -19,7 +19,7 @@
 <!--Test client initiated push -->
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-5</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
        <td>0</td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-5</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
        <td>1</td>
 </tr>
 <tr>
@@ -49,7 +49,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-5</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
        <td>4</td>
 </tr>
 <!--Test server initiated push-->
@@ -60,7 +60,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-7</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
        <td>0</td>
 </tr>
 <tr>
@@ -70,7 +70,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-7</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
        <td>1</td>
 </tr>
 <tr>
@@ -80,7 +80,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>id=gwt-uid-7</td>
+       <td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
        <td>2</td>
 </tr>
 </tbody></table>