- legacy DateField declarative format tests are fixed (day light saving time is taken into account). - CalendarMonthViewDndEvent UI because you are not supposed to work on Sundays (when the test is broken). Backported from master branch (Vaadin 8). Change-Id: I5e62c09da579e9f6eb2a58a87253618d3f30b2e9tags/7.7.4
@@ -45,7 +45,8 @@ public class DateFieldDeclarativeTest extends DeclarativeTestBase<DateField> { | |||
} | |||
private String getTimezoneDesign() { | |||
String timeZone = new SimpleDateFormat("Z").format(new Date()); | |||
String timeZone = new SimpleDateFormat("Z") | |||
.format(new Date(2014 - 1900, 5 - 1, 5)); | |||
return String.format( | |||
"<vaadin-date-field range-start=\"2014-05-05 00:00:00%1$s\" range-end=\"2014-06-05 00:00:00%1$s\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient show-iso-week-numbers parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00%1$s\"/>", | |||
timeZone); |
@@ -40,6 +40,11 @@ public class CalendarMonthViewDndEvent extends AbstractTestUI { | |||
protected void setup(VaadinRequest request) { | |||
final Calendar calendar = new Calendar("Test calendar"); | |||
final java.util.Calendar cal = getAdjustedCalendar(); | |||
if (cal.get( | |||
java.util.Calendar.DAY_OF_WEEK) == java.util.Calendar.SUNDAY) { | |||
// don't use Sunday: no space to move event on the left | |||
cal.add(java.util.Calendar.DAY_OF_MONTH, 1); | |||
} | |||
Date from = cal.getTime(); | |||