2 files changed, 77 insertions, 18 deletions
diff --git a/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.html b/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.html
index 51cfe86485..b61b464f97 100644
--- a/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.html
+++ b/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
+<link rel="selenium.base" href="http://localhost:8080/" />
 <title>SetTabIndex</title>
 </head>
 <body>
@@ -19,7 +19,7 @@
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-	<td>122,10</td>
+	<td>39,10</td>
 </tr>
 <tr>
 	<td>enterCharacter</td>
@@ -27,11 +27,6 @@
 	<td>111</td>
 </tr>
 <tr>
-	<td>pressSpecialKey</td>
-	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-	<td>enter</td>
-</tr>
-<tr>
 	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextField[0]</td>
 	<td>222</td>
@@ -42,19 +37,29 @@
 	<td>333</td>
 </tr>
 <tr>
-	<td>drag</td>
-	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-	<td></td>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+	<td>444</td>
 </tr>
 <tr>
-	<td>drop</td>
-	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]</td>
-	<td>4,64</td>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VCheckBox[0]/domChild[0]</td>
+	<td>enter</td>
 </tr>
 <tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
-	<td>-14,13</td>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>
+	<td>333</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextField[0]</td>
+	<td>222</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+	<td>444</td>
 </tr>
 <tr>
 	<td>assertValue</td>
@@ -62,14 +67,64 @@
 	<td>111</td>
 </tr>
 <tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VCheckBox[0]/domChild[0]</td>
+	<td>-22,-191</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>readonly</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VCheckBox[0]/domChild[0]</td>
+	<td>8,11</td>
+</tr>
+<tr>
 	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+	<td>444</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+	<td>555</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
 	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>
-	<td>333</td>
+	<td>666</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextField[0]</td>
+	<td>777</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>888</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+	<td>555</td>
 </tr>
 <tr>
 	<td>assertValue</td>
 	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VTextField[0]</td>
-	<td>222</td>
+	<td>777</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VTextField[0]</td>
+	<td>666</td>
+</tr>
+<tr>
+	<td>assertValue</td>
+	<td>vaadin=runcomvaadintestscomponentstextfieldSetTabIndex::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>888</td>
 </tr>
 
 </tbody></table>
diff --git a/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.java b/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.java
index 1904c8e7a3..d81d26591a 100644
--- a/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.java
+++ b/tests/src/com/vaadin/tests/components/textfield/SetTabIndex.java
@@ -22,6 +22,9 @@ public class SetTabIndex extends TestBase {
         field2.setTabIndex(2);
         addComponent(field2);
 
+        final TextField field0 = new TextField("Field2 (tabindex 0)");
+        addComponent(field0);
+
         final CheckBox readonly = new CheckBox("Readonly");
         readonly.setImmediate(true);
         readonly.addListener(new Property.ValueChangeListener() {
@@ -31,6 +34,7 @@ public class SetTabIndex extends TestBase {
                 field1.setReadOnly(readonly);
                 field2.setReadOnly(readonly);
                 field3.setReadOnly(readonly);
+                field0.setReadOnly(readonly);
             }
         });
         addComponent(readonly);