Make tests pass in any timezone

Change-Id: Ic81205bca5e25d0f525ae5fa0cbe20d0bd736a58

3 files changed, 13 insertions, 5 deletions

diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java
index 2dbdaceb3b..02b36d3e4a 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java
@@ -19,7 +19,9 @@ public class DateToLongConverterTest {
 
     @Test
     public void testValueConversion() {
-        Assert.assertEquals(Long.valueOf(946677600000l),
-                converter.convertToModel(new Date(100, 0, 1), Long.class, null));
+        Date d = new Date(100, 0, 1);
+        Assert.assertEquals(
+                Long.valueOf(946677600000l + (d.getTimezoneOffset() + 120) * 60 * 1000L),
+                converter.convertToModel(d, Long.class, null));
     }
 }
diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
index 047ed8a79f..2bbcf43e2d 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
@@ -75,7 +75,9 @@ public class DefaultConverterFactoryTest {
     @SuppressWarnings("deprecation")
     @Test
     public void longToDate() {
-        assertConverter(1413061200000L, new Date(2014 - 1900, 10 - 1, 12));
+        Date d = new Date(2014 - 1900, 10 - 1, 12);
+        assertConverter(
+                1413061200000L + (d.getTimezoneOffset() + 180) * 60 * 1000L, d);
     }
 
     public enum Foo {
diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
index 16bb5b1a64..ea5af1efd9 100644
--- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
@@ -17,14 +17,18 @@ public class StringToBooleanConverterTest {
     StringToBooleanConverter localeConverter = new StringToBooleanConverter() {
         @Override
         public String getFalseString(Locale locale) {
+            Date d = new Date(3000000000000L);
             return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,
-                    locale).format(new Date(3000000000000L));
+                    locale).format(
+                    d.getTime() + (d.getTimezoneOffset() + 120) * 60 * 1000L);
         }
 
         @Override
         public String getTrueString(Locale locale) {
+            Date d = new Date(2000000000000L);
             return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,
-                    locale).format(new Date(2000000000000L));
+                    locale).format(
+                    d.getTime() + (d.getTimezoneOffset() + 120) * 60 * 1000L);
         }
     };