Date/time issues are fixed in the tests.

- 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: I5e62c09da579e9f6eb2a58a87253618d3f30b2e9

2 files changed, 7 insertions, 1 deletions

diff --git a/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
index 5db5bf2cd4..1ed0ad7c6b 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
@@ -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);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
index 2122f7acd5..4b332226c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
@@ -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();