Make tests pass in any timezone

Change-Id: Ieccb77cedb2a4444e5bc814bb79bc8e076351aaf

3 files changed, 49 insertions, 23 deletions

diff --git a/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java b/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java
index d767430cc1..0ca1cf2ab3 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java
@@ -15,7 +15,9 @@ public class DateToLongConverterTest extends TestCase {
     }
 
     public void testValueConversion() {
-        assertEquals(Long.valueOf(946677600000l),
-                converter.convertToModel(new Date(100, 0, 1), Long.class, null));
+        Date d = new Date(100, 0, 1);
+        assertEquals(
+            Long.valueOf(946677600000l + (d.getTimezoneOffset() + 120) * 60 * 1000L),
+            converter.convertToModel(d, Long.class, null));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java b/server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
index 047ed8a79f..2bbcf43e2d 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
+++ b/server/tests/src/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/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
index 6e81af97a3..71670815c9 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
@@ -1,57 +1,79 @@
 package com.vaadin.tests.data.converter;
 
-import junit.framework.TestCase;
-
-import com.vaadin.data.util.converter.StringToBooleanConverter;
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-public class StringToBooleanConverterTest extends TestCase {
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.data.util.converter.StringToBooleanConverter;
+
+public class StringToBooleanConverterTest {
 
     StringToBooleanConverter converter = new StringToBooleanConverter();
     StringToBooleanConverter yesNoConverter = new StringToBooleanConverter("yes","no");
     StringToBooleanConverter localeConverter = new StringToBooleanConverter() {
         @Override
         public String getFalseString(Locale locale) {
-            return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,locale).format(new Date(3000000000000L));
+            Date d = new Date(3000000000000L);
+            return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,
+                    locale).format(
+                    d.getTime() + (d.getTimezoneOffset() + 120) * 60 * 1000L);
         }
 
         @Override
         public String getTrueString(Locale locale) {
-            return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,locale).format(new Date(2000000000000L));
+            Date d = new Date(2000000000000L);
+            return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,
+                    locale).format(
+                    d.getTime() + (d.getTimezoneOffset() + 120) * 60 * 1000L);
         }
     };
 
+    @Test
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, Boolean.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel(null, Boolean.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals(null, converter.convertToModel("", Boolean.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel("", Boolean.class, null));
     }
 
+    @Test
     public void testValueConversion() {
-        assertTrue(converter.convertToModel("true", Boolean.class, null));
-        assertFalse(converter.convertToModel("false", Boolean.class, null));
+        Assert.assertTrue(converter.convertToModel("true", Boolean.class, null));
+        Assert.assertFalse(converter.convertToModel("false", Boolean.class,
+                null));
     }
 
+    @Test
     public void testYesNoValueConversion() {
-        assertTrue(yesNoConverter.convertToModel("yes", Boolean.class, null));
-        assertFalse(yesNoConverter.convertToModel("no", Boolean.class, null));
+        Assert.assertTrue(yesNoConverter.convertToModel("yes", Boolean.class,
+                null));
+        Assert.assertFalse(yesNoConverter.convertToModel("no", Boolean.class,
+                null));
 
-        assertEquals("yes", yesNoConverter.convertToPresentation(true, String.class, null));
-        assertEquals("no", yesNoConverter.convertToPresentation(false, String.class, null));
+        Assert.assertEquals("yes",
+                yesNoConverter.convertToPresentation(true, String.class, null));
+        Assert.assertEquals("no",
+                yesNoConverter.convertToPresentation(false, String.class, null));
     }
 
-
+    @Test
     public void testLocale() {
-        assertEquals("May 18, 2033", localeConverter.convertToPresentation(true, String.class, Locale.US));
-        assertEquals("January 24, 2065", localeConverter.convertToPresentation(false, String.class, Locale.US));
+        Assert.assertEquals("May 18, 2033", localeConverter
+                .convertToPresentation(true, String.class, Locale.US));
+        Assert.assertEquals("January 24, 2065", localeConverter
+                .convertToPresentation(false, String.class, Locale.US));
 
-        assertEquals("18. Mai 2033", localeConverter.convertToPresentation(true, String.class, Locale.GERMANY));
-        assertEquals("24. Januar 2065", localeConverter.convertToPresentation(false, String.class, Locale.GERMANY));
+        Assert.assertEquals("18. Mai 2033", localeConverter
+                .convertToPresentation(true, String.class, Locale.GERMANY));
+        Assert.assertEquals("24. Januar 2065", localeConverter
+                .convertToPresentation(false, String.class, Locale.GERMANY));
     }
 
 }