summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2009-10-20 15:35:29 +0000
committerArtur Signell <artur.signell@itmill.com>2009-10-20 15:35:29 +0000
commitcf155a7420dc33abd7d460e81b0a5372edfd8075 (patch)
tree568750eec0647917a89ebd98bddb1f218a8ec2c0 /src/com
parentb795c8a40854fd3d0d9adf22d7042082588251ac (diff)
downloadvaadin-framework-cf155a7420dc33abd7d460e81b0a5372edfd8075.tar.gz
vaadin-framework-cf155a7420dc33abd7d460e81b0a5372edfd8075.zip
Merged test updates from 6.1
svn changeset:9285/svn branch:6.2
Diffstat (limited to 'src/com')
-rw-r--r--src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html57
1 files changed, 11 insertions, 46 deletions
diff --git a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 61aa100a36..9e529836b6 100644
--- 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>
@@ -79,17 +70,6 @@
<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>
<td></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>