From 14f4091791f91d28c3a827148f4af848642bc3bd Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 14 Sep 2010 16:42:06 +0000 Subject: [PATCH] Fixed minor problems in test and added input prompt svn changeset:14916/svn branch:6.4 --- .../datefield/PopupDateFieldResolutions.html | 170 ++++++++++++++---- .../components/datefield/PopupDateFields.java | 44 ++++- 2 files changed, 170 insertions(+), 44 deletions(-) diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html b/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html index 4c36f3af2b..dd0c24bfca 100644 --- a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html +++ b/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html @@ -350,44 +350,39 @@ 1970 - assertText - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] - 1971 + mouseClick + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0] + 37,12 assertText vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] - 1974 + 1971 mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0] 37,12 mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] - 13,11 - - - mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] - 44,9 + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0] + 37,12 mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1] - 173,31 + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0] + 37,12 - mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] - 12,10 + assertText + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] + 1974 mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]/domChild[0] - 284,10 + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] + 37,12 assertValue @@ -409,6 +404,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1] 202,40 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -419,21 +419,41 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] 2010 + + mouseClick + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0] + 22,9 + assertText vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] 2009 + + mouseClick + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0] + 22,9 + assertText vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] 2010 + + mouseClick + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0] + 22,9 + assertValue vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 2011 + + mouseClick + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1] + 129,26 + select @@ -443,7 +463,7 @@ assertValue vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] - 5/10 + 5/11 mouseClick @@ -453,17 +473,17 @@ assertText vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] - May 2010 + May 2011 mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[2] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[3] 10,14 assertText vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] - June 2010 + June 2011 mouseClick @@ -473,7 +493,7 @@ assertText vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] - June 2011 + June 2012 mouseClick @@ -483,7 +503,7 @@ assertValue vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] - 6/11 + 6/12 mouseClick @@ -495,6 +515,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 1/09 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -507,8 +532,8 @@ mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[2] - 13,9 + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[3] + 13,7 assertText @@ -525,17 +550,37 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 2/09 + + mouseClick + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1] + 129,26 + select vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[4]/VNativeSelect[0]/domChild[0] label=Day + + enterCharacter + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] + 5/23/70 + + + mouseClick + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2] + 478,1 + assertValue vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 5/23/70 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -548,12 +593,12 @@ assertCSSClass - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[22] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[8] v-datefield-calendarpanel-day-selected mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[2] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[3] 11,11 @@ -577,8 +622,13 @@ 193,12 - assertText + assertValue vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] + 5/23/70 + + + pause + 100 @@ -611,11 +661,26 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 6/30/71 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] 5,13 + + assertText + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0] + June 1971 + + + assertCSSClass + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[29] + v-datefield-calendarpanel-day-selected + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[3] @@ -631,6 +696,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 5/31/71 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -651,6 +721,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 4/30/71 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -663,7 +738,7 @@ assertCSSClass - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[0] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[29] v-datefield-calendarpanel-day-selected @@ -673,7 +748,7 @@ mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[0] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[29] 17,9 @@ -681,6 +756,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 4/1/72 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -693,7 +773,7 @@ mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[29] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[0] 15,4 @@ -701,6 +781,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 3/1/72 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -713,7 +798,7 @@ mouseClick - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[27] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[0] 17,9 @@ -731,6 +816,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 1/15/02 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -743,7 +833,7 @@ assertCSSClass - vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[13] + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[16] v-datefield-calendarpanel-day-selected @@ -776,6 +866,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0] 1/15/02 + + pause + 100 + + mouseClick vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1] @@ -791,6 +886,11 @@ vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[14] v-datefield-calendarpanel-day-selected + + mouseClick + vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1] + 364,32 + diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFields.java b/tests/src/com/vaadin/tests/components/datefield/PopupDateFields.java index c49b0013fa..bafee0847c 100644 --- a/tests/src/com/vaadin/tests/components/datefield/PopupDateFields.java +++ b/tests/src/com/vaadin/tests/components/datefield/PopupDateFields.java @@ -62,7 +62,8 @@ public class PopupDateFields extends ComponentTestCase { actions.add(createEnabledAction(true)); actions.add(createRequiredAction(false)); actions.add(createReadonlyAction(false)); - actions.add(createResolutionSelectAction(false)); + actions.add(createResolutionSelectAction()); + actions.add(createInputPromptSelectAction()); return actions; } @@ -106,7 +107,7 @@ public class PopupDateFields extends ComponentTestCase { } protected Component createRequiredAction(boolean initialState) { - return createCheckboxAction("Readonly", initialState, + return createCheckboxAction("Required", initialState, new Command() { public void execute(PopupDateField c, Boolean enabled) { c.setRequired(enabled); @@ -114,7 +115,7 @@ public class PopupDateFields extends ComponentTestCase { }); } - private Component createResolutionSelectAction(boolean b) { + private Component createResolutionSelectAction() { LinkedHashMap options = new LinkedHashMap(); options.put("Year", DateField.RESOLUTION_YEAR); options.put("Month", DateField.RESOLUTION_MONTH); @@ -123,8 +124,7 @@ public class PopupDateFields extends ComponentTestCase { options.put("Min", DateField.RESOLUTION_MIN); options.put("Sec", DateField.RESOLUTION_SEC); options.put("Msec", DateField.RESOLUTION_MSEC); - return createSelectAction("Resolution", options, - DateField.RESOLUTION_YEAR, + return createSelectAction("Resolution", options, "Year", new Command() { public void execute(PopupDateField c, Integer value) { @@ -134,24 +134,50 @@ public class PopupDateFields extends ComponentTestCase { }); } + private Component createInputPromptSelectAction() { + LinkedHashMap options = new LinkedHashMap(); + options.put("", null); + options.put("Please enter date", "Please enter date"); + options.put("åäöÅÄÖ", "åäöÅÄÖ"); + + return createSelectAction("Input prompt", options, "", + new Command() { + + public void execute(PopupDateField c, String value) { + c.setInputPrompt(value); + + } + }); + } + private Component createSelectAction(String caption, - LinkedHashMap options, int initialValue, + LinkedHashMap options, String initialValue, final Command command) { final String CAPTION = "caption"; + final String VALUE = "value"; - NativeSelect select = new NativeSelect(caption); + final NativeSelect select = new NativeSelect(caption); select.addContainerProperty(CAPTION, String.class, ""); + select.addContainerProperty(VALUE, Object.class, ""); select.setItemCaptionPropertyId(CAPTION); select.setNullSelectionAllowed(false); for (String itemCaption : options.keySet()) { - Item i = select.addItem(options.get(itemCaption)); + Object itemId = new Object(); + Item i = select.addItem(itemId); i.getItemProperty(CAPTION).setValue(itemCaption); + i.getItemProperty(VALUE).setValue(options.get(itemCaption)); + if (itemCaption.equals(initialValue)) { + select.setValue(itemId); + } } select.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { - doCommand(command, (T) event.getProperty().getValue()); + Object itemId = event.getProperty().getValue(); + Item item = select.getItem(itemId); + T value = (T) item.getItemProperty(VALUE).getValue(); + doCommand(command, value); } }); -- 2.39.5