Updated tests

svn changeset:8936/svn branch:6.1

diff --git a/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html b/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
index 38f82be0799914898107f8d5b2b3423d1b67a489..15e6a9727305108e4fbc6fd16addc6e379212d9e 100644 (file)
--- a/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
@@ -22,9 +22,294 @@
        <td></td>
 </tr>
 <tr>
-       <td>click</td>
+       <td>setSpeed</td>
+       <td>500</td>
+       <td>Needed because of #3409</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>41,10</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>enterCharacter</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>e</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>sets</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
        <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
        <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
@@ -32,9 +317,9 @@
        <td></td>
 </tr>
 <tr>
-       <td>keyPress</td>
+       <td>pressSpecialKey</td>
        <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>\25</td>
+       <td>up</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
@@ -42,14 +327,19 @@
        <td></td>
 </tr>
 <tr>
-       <td>screenCapture</td>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
        <td></td>
        <td></td>
 </tr>
 <tr>
-       <td>keyPress</td>
+       <td>pressSpecialKey</td>
        <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>\25</td>
+       <td>up</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
@@ -57,14 +347,19 @@
        <td></td>
 </tr>
 <tr>
-       <td>screenCapture</td>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
        <td></td>
        <td></td>
 </tr>
 <tr>
-       <td>keyPress</td>
+       <td>pressSpecialKey</td>
        <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>\24</td>
+       <td>up</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>
@@ -72,10 +367,30 @@
        <td></td>
 </tr>
 <tr>
-       <td>screenCapture</td>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>up</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
        <td></td>
        <td></td>
 </tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>enter</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>verifyValue</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>Item 7</td>
+</tr>
 
 </tbody></table>
 </body>

diff --git a/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
index 46af5b07bebbc868ce89d4629b15065c7fd8563b..b057099b6e48784b6799800eec70504bfc83a739 100644 (file)
--- a/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
+++ b/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
@@ -1,6 +1,7 @@
 package com.vaadin.tests.components.datefield;\r
 \r
-import java.util.Date;\r
+import java.util.Calendar;\r
+import java.util.Locale;\r
 \r
 import com.vaadin.tests.components.TestBase;\r
 import com.vaadin.ui.Button;\r
@@ -31,10 +32,10 @@ public class DateFieldReadOnly extends TestBase {
         timeField.addStyleName("timeField");\r
 \r
         // Set date so that testing always has same time\r
-        Date date = new Date();\r
-        date.setTime((long) 1000000000000.0);\r
+        Calendar c = Calendar.getInstance(Locale.ENGLISH);\r
+        c.set(2009, 05, 12);\r
 \r
-        timeField.setValue(date);\r
+        timeField.setValue(c.getTime());\r
         timeField.setReadOnly(true);\r
 \r
         addComponent(timeField);\r

diff --git a/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html b/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
index 2582948eee7e6273cbb701a2150bb258af879b2d..6c975a06f1784b84ab4be875e2e448dee48cf5ea 100644 (file)
--- a/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
+++ b/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
@@ -37,8 +37,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsdatefieldTestDatefieldYear::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1]</td>
+       <td>mouseClick</td>
+       <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[1]/button</td>
        <td></td>
 </tr>
 <tr>
@@ -47,8 +47,8 @@
        <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[1]/button</td>
+       <td>mouseClick</td>
+       <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[2]/button</td>
        <td></td>
 </tr>
 <tr>
@@ -57,24 +57,44 @@
        <td></td>
 </tr>
 <tr>
-       <td>screenCapture</td>
+       <td>mouseClick</td>
+       <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[2]/button</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
        <td></td>
        <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentsdatefieldTestDatefieldYear::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1]</td>
+       <td>waitForVaadin</td>
+       <td></td>
        <td></td>
 </tr>
+<tr>
+       <td>mouseClick</td>
+       <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[4]/button</td>
+       <td>16,7</td>
+</tr>
 <tr>
        <td>waitForVaadin</td>
        <td></td>
        <td></td>
 </tr>
 <tr>
-       <td>click</td>
-       <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[2]/button</td>
+       <td>mouseClick</td>
+       <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[4]/button</td>
+       <td>-287,-85</td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
        <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[5]/button</td>
+       <td>10,9</td>
 </tr>
 <tr>
        <td>waitForVaadin</td>