From: Artur Signell Date: Fri, 25 Sep 2009 13:31:39 +0000 (+0000) Subject: Updated tests X-Git-Tag: 6.7.0.beta1~2463^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4a182dda412cf39a8a9b082464c2ab9d46b056e5;p=vaadin-framework.git 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 38f82be079..15e6a97273 100644 --- a/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html +++ b/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html @@ -22,9 +22,294 @@ - click + setSpeed + 500 + Needed because of #3409 + + + mouseClick + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + 41,10 + + + waitForVaadin + + + + + enterCharacter + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + e + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + sets + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + down + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin + + + + + pressSpecialKey vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin + + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin + + + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up waitForVaadin @@ -32,9 +317,9 @@ - keyPress + pressSpecialKey vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] - \25 + up waitForVaadin @@ -42,14 +327,19 @@ - screenCapture + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin - keyPress + pressSpecialKey vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] - \25 + up waitForVaadin @@ -57,14 +347,19 @@ - screenCapture + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin - keyPress + pressSpecialKey vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] - \24 + up waitForVaadin @@ -72,10 +367,30 @@ - screenCapture + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + up + + + waitForVaadin + + pressSpecialKey + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + enter + + + waitForVaadin + + + + + verifyValue + vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0] + Item 7 + diff --git a/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java index 46af5b07be..b057099b6e 100644 --- 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; -import java.util.Date; +import java.util.Calendar; +import java.util.Locale; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; @@ -31,10 +32,10 @@ public class DateFieldReadOnly extends TestBase { timeField.addStyleName("timeField"); // Set date so that testing always has same time - Date date = new Date(); - date.setTime((long) 1000000000000.0); + Calendar c = Calendar.getInstance(Locale.ENGLISH); + c.set(2009, 05, 12); - timeField.setValue(date); + timeField.setValue(c.getTime()); timeField.setReadOnly(true); addComponent(timeField); diff --git a/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html b/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html index 2582948eee..6c975a06f1 100644 --- a/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html +++ b/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html @@ -37,8 +37,8 @@ - click - vaadin=runcomvaadintestscomponentsdatefieldTestDatefieldYear::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1] + mouseClick + //table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[1]/button @@ -47,8 +47,8 @@ - click - //table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[1]/button + mouseClick + //table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[2]/button @@ -57,24 +57,44 @@ - screenCapture + mouseClick + //table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[2]/button + + + + waitForVaadin - click - vaadin=runcomvaadintestscomponentsdatefieldTestDatefieldYear::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1] + waitForVaadin + + + mouseClick + //table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[4]/button + 16,7 + waitForVaadin - click - //table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[2]/button + mouseClick + //table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[4]/button + -287,-85 + + + waitForVaadin + + + + mouseClick + //table[@id='PID_VAADIN_POPUPCAL']/tbody/tr/td[5]/button + 10,9 waitForVaadin