Fixed minor problems in test and added input prompt

svn changeset:14916/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html b/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
index 4c36f3af2baeeff30ff05037dcfd0871aef6bb31..dd0c24bfcac9f6ff25ca8ddf44593ee9c08f285b 100644 (file)
--- a/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
+++ b/tests/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
@@ -350,44 +350,39 @@
        <td>1970</td>\r
 </tr>\r
 <tr>\r
-       <td>assertText</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
-       <td>1971</td>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]</td>\r
+       <td>37,12</td>\r
 </tr>\r
 <tr>\r
        <td>assertText</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
-       <td>1974</td>\r
+       <td>1971</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]</td>\r
        <td>37,12</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
-       <td>13,11</td>\r
-</tr>\r
-<tr>\r
-       <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
-       <td>44,9</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]</td>\r
+       <td>37,12</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>\r
-       <td>173,31</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]</td>\r
+       <td>37,12</td>\r
 </tr>\r
 <tr>\r
-       <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
-       <td>12,10</td>\r
+       <td>assertText</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
+       <td>1974</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]/domChild[0]</td>\r
-       <td>284,10</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
+       <td>37,12</td>\r
 </tr>\r
 <tr>\r
        <td>assertValue</td>\r
@@ -409,6 +404,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>\r
        <td>202,40</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -419,21 +419,41 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
        <td>2010</td>\r
 </tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>\r
+       <td>22,9</td>\r
+</tr>\r
 <tr>\r
        <td>assertText</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
        <td>2009</td>\r
 </tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]</td>\r
+       <td>22,9</td>\r
+</tr>\r
 <tr>\r
        <td>assertText</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
        <td>2010</td>\r
 </tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]</td>\r
+       <td>22,9</td>\r
+</tr>\r
 <tr>\r
        <td>assertValue</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>2011</td>\r
 </tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>\r
+       <td>129,26</td>\r
+</tr>\r
 <!--Check resolution month functionality-->\r
 <tr>\r
        <td>select</td>\r
@@ -443,7 +463,7 @@
 <tr>\r
        <td>assertValue</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
-       <td>5/10</td>\r
+       <td>5/11</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
@@ -453,17 +473,17 @@
 <tr>\r
        <td>assertText</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
-       <td>May 2010</td>\r
+       <td>May 2011</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[2]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[3]</td>\r
        <td>10,14</td>\r
 </tr>\r
 <tr>\r
        <td>assertText</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
-       <td>June 2010</td>\r
+       <td>June 2011</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
@@ -473,7 +493,7 @@
 <tr>\r
        <td>assertText</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
-       <td>June 2011</td>\r
+       <td>June 2012</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
@@ -483,7 +503,7 @@
 <tr>\r
        <td>assertValue</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
-       <td>6/11</td>\r
+       <td>6/12</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
@@ -495,6 +515,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>1/09</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -507,8 +532,8 @@
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[2]</td>\r
-       <td>13,9</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[3]</td>\r
+       <td>13,7</td>\r
 </tr>\r
 <tr>\r
        <td>assertText</td>\r
@@ -525,17 +550,37 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>2/09</td>\r
 </tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>\r
+       <td>129,26</td>\r
+</tr>\r
 <!--Check resolution day functionality-->\r
 <tr>\r
        <td>select</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[4]/VNativeSelect[0]/domChild[0]</td>\r
        <td>label=Day</td>\r
 </tr>\r
+<tr>\r
+       <td>enterCharacter</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
+       <td>5/23/70</td>\r
+</tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[2]</td>\r
+       <td>478,1</td>\r
+</tr>\r
 <tr>\r
        <td>assertValue</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>5/23/70</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -548,12 +593,12 @@
 </tr>\r
 <tr>\r
        <td>assertCSSClass</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[22]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[8]</td>\r
        <td>v-datefield-calendarpanel-day-selected</td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[2]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[3]</td>\r
        <td>11,11</td>\r
 </tr>\r
 <tr>\r
@@ -577,8 +622,13 @@
        <td>193,12</td>\r
 </tr>\r
 <tr>\r
-       <td>assertText</td>\r
+       <td>assertValue</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
+       <td>5/23/70</td>\r
+</tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
        <td></td>\r
 </tr>\r
 <tr>\r
@@ -611,11 +661,26 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>6/30/71</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
        <td>5,13</td>\r
 </tr>\r
+<tr>\r
+       <td>assertText</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]</td>\r
+       <td>June 1971</td>\r
+</tr>\r
+<tr>\r
+       <td>assertCSSClass</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[29]</td>\r
+       <td>v-datefield-calendarpanel-day-selected</td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/VCalendarPanel$VEventButton[3]</td>\r
@@ -631,6 +696,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>5/31/71</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -651,6 +721,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>4/30/71</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -663,7 +738,7 @@
 </tr>\r
 <tr>\r
        <td>assertCSSClass</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[0]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[29]</td>\r
        <td>v-datefield-calendarpanel-day-selected</td>\r
 </tr>\r
 <tr>\r
@@ -673,7 +748,7 @@
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[0]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[29]</td>\r
        <td>17,9</td>\r
 </tr>\r
 <tr>\r
@@ -681,6 +756,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>4/1/72</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -693,7 +773,7 @@
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[29]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[0]</td>\r
        <td>15,4</td>\r
 </tr>\r
 <tr>\r
@@ -701,6 +781,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>3/1/72</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -713,7 +798,7 @@
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[27]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[0]</td>\r
        <td>17,9</td>\r
 </tr>\r
 <tr>\r
@@ -731,6 +816,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>1/15/02</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -743,7 +833,7 @@
 </tr>\r
 <tr>\r
        <td>assertCSSClass</td>\r
-       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[13]</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[16]</td>\r
        <td>v-datefield-calendarpanel-day-selected</td>\r
 </tr>\r
 <tr>\r
@@ -776,6 +866,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[0]</td>\r
        <td>1/15/02</td>\r
 </tr>\r
+<tr>\r
+       <td>pause</td>\r
+       <td>100</td>\r
+       <td></td>\r
+</tr>\r
 <tr>\r
        <td>mouseClick</td>\r
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VPopupCalendar[0]/domChild[1]</td>\r
@@ -791,6 +886,11 @@
        <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::Root/VOverlay[0]/VCalendarPanel[0]/FlexTable[0]/VCalendarPanel$Day[14]</td>\r
        <td>v-datefield-calendarpanel-day-selected</td>\r
 </tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentsdatefieldPopupDateFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>\r
+       <td>364,32</td>\r
+</tr>\r
 </tbody></table>\r
 </body>\r
 </html>\r

diff --git a/tests/src/com/vaadin/tests/components/datefield/PopupDateFields.java b/tests/src/com/vaadin/tests/components/datefield/PopupDateFields.java
index c49b0013faf87bb198c6167cdad8a924069bae63..bafee0847cd6f0aef0cc9f78f82f822043201b4b 100644 (file)
--- 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<PopupDateField> {
         actions.add(createEnabledAction(true));\r
         actions.add(createRequiredAction(false));\r
         actions.add(createReadonlyAction(false));\r
-        actions.add(createResolutionSelectAction(false));\r
+        actions.add(createResolutionSelectAction());\r
+        actions.add(createInputPromptSelectAction());\r
 \r
         return actions;\r
     }\r
@@ -106,7 +107,7 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> {
     }\r
 \r
     protected Component createRequiredAction(boolean initialState) {\r
-        return createCheckboxAction("Readonly", initialState,\r
+        return createCheckboxAction("Required", initialState,\r
                 new Command<PopupDateField, Boolean>() {\r
                     public void execute(PopupDateField c, Boolean enabled) {\r
                         c.setRequired(enabled);\r
@@ -114,7 +115,7 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> {
                 });\r
     }\r
 \r
-    private Component createResolutionSelectAction(boolean b) {\r
+    private Component createResolutionSelectAction() {\r
         LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>();\r
         options.put("Year", DateField.RESOLUTION_YEAR);\r
         options.put("Month", DateField.RESOLUTION_MONTH);\r
@@ -123,8 +124,7 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> {
         options.put("Min", DateField.RESOLUTION_MIN);\r
         options.put("Sec", DateField.RESOLUTION_SEC);\r
         options.put("Msec", DateField.RESOLUTION_MSEC);\r
-        return createSelectAction("Resolution", options,\r
-                DateField.RESOLUTION_YEAR,\r
+        return createSelectAction("Resolution", options, "Year",\r
                 new Command<PopupDateField, Integer>() {\r
 \r
                     public void execute(PopupDateField c, Integer value) {\r
@@ -134,24 +134,50 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> {
                 });\r
     }\r
 \r
+    private Component createInputPromptSelectAction() {\r
+        LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();\r
+        options.put("<none>", null);\r
+        options.put("Please enter date", "Please enter date");\r
+        options.put("åäöÅÄÖ", "åäöÅÄÖ");\r
+\r
+        return createSelectAction("Input prompt", options, "<none>",\r
+                new Command<PopupDateField, String>() {\r
+\r
+                    public void execute(PopupDateField c, String value) {\r
+                        c.setInputPrompt(value);\r
+\r
+                    }\r
+                });\r
+    }\r
+\r
     private <T> Component createSelectAction(String caption,\r
-            LinkedHashMap<String, T> options, int initialValue,\r
+            LinkedHashMap<String, T> options, String initialValue,\r
             final Command<PopupDateField, T> command) {\r
         final String CAPTION = "caption";\r
+        final String VALUE = "value";\r
 \r
-        NativeSelect select = new NativeSelect(caption);\r
+        final NativeSelect select = new NativeSelect(caption);\r
         select.addContainerProperty(CAPTION, String.class, "");\r
+        select.addContainerProperty(VALUE, Object.class, "");\r
         select.setItemCaptionPropertyId(CAPTION);\r
         select.setNullSelectionAllowed(false);\r
         for (String itemCaption : options.keySet()) {\r
-            Item i = select.addItem(options.get(itemCaption));\r
+            Object itemId = new Object();\r
+            Item i = select.addItem(itemId);\r
             i.getItemProperty(CAPTION).setValue(itemCaption);\r
+            i.getItemProperty(VALUE).setValue(options.get(itemCaption));\r
+            if (itemCaption.equals(initialValue)) {\r
+                select.setValue(itemId);\r
+            }\r
 \r
         }\r
         select.addListener(new Property.ValueChangeListener() {\r
 \r
             public void valueChange(ValueChangeEvent event) {\r
-                doCommand(command, (T) event.getProperty().getValue());\r
+                Object itemId = event.getProperty().getValue();\r
+                Item item = select.getItem(itemId);\r
+                T value = (T) item.getItemProperty(VALUE).getValue();\r
+                doCommand(command, value);\r
 \r
             }\r
         });\r