summaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-04-29 14:17:42 +0300
committerVaadin Code Review <review@vaadin.com>2013-04-29 11:57:29 +0000
commit1f08e16589924841341c2145df6a1a135afb63d6 (patch)
treeb47d4fdc7224f7945992f55b422905fcd9012615 /uitest/src
parentfcad91d2c8710dd89dd2a1fb5ea11dc71cac51a1 (diff)
downloadvaadin-framework-1f08e16589924841341c2145df6a1a135afb63d6.tar.gz
vaadin-framework-1f08e16589924841341c2145df6a1a135afb63d6.zip
Fixed test (gwt-id-X not stable)
Change-Id: I4def9e78d3985d6f1c28fe7eb816120615cec057
Diffstat (limited to 'uitest/src')
-rw-r--r--uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html6
-rw-r--r--uitest/src/com/vaadin/tests/components/ui/TooltipConfiguration.html20
-rw-r--r--uitest/src/com/vaadin/tests/push/BasicPush.html12
-rw-r--r--uitest/src/com/vaadin/tests/push/StreamingPush.html12
4 files changed, 25 insertions, 25 deletions
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 261d1939cd..4dc63721a1 100644
--- 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 5170d4408f..c1734481c6 100644
--- 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 f69a573425..173ec90674 100644
--- 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 533f571b9c..cf94a09c63 100644
--- 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>