Merge pull request #12 from zalando/issue11

Fix issue 11: Tests work in arbitrary timezones

Author: Jan-M

pom.xml

@@ -144,6 +144,12 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.cthul</groupId>
+            <artifactId>cthul-matchers</artifactId>
+            <version>1.1.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.jolbox</groupId>
             <artifactId>bonecp</artifactId>

src/test/java/de/zalando/typemapper/core/fieldMapper/DateFieldMapperTest.java

@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.sql.Date;
 
@@ -19,10 +20,17 @@
 @RunWith(Theories.class)
 public class DateFieldMapperTest {
 
+    private static final int MS_PER_HOUR = 1000*60*60;
+    private static final int MS_PER_MINUTE = 1000*60;
+    private static final int rawOffset = java.util.TimeZone.getDefault().getRawOffset();
+    private static final int offsetHours = rawOffset / MS_PER_HOUR;
+    private static final int offsetMinutes = (rawOffset % MS_PER_HOUR) / MS_PER_MINUTE;
+    private static final String sign = offsetHours > 0 ? "+" : "-";
+
     @DataPoints
     public static final String[][] DATES_RESULTS = {
-        {"2011-11-11 11:11:11", "2011-11-11 11:11:11.000+0100"},
-        {"2011-11-11", "2011-11-11 00:00:00.000+0100"},
+        {"2011-11-11 11:11:11", String.format("2011-11-11 11:11:11.000%s%02d%02d", sign, offsetHours, offsetMinutes)},
+        {"2011-11-11", String.format("2011-11-11 00:00:00.000%s%02d%02d", sign, offsetHours, offsetMinutes)},
         {"2011-11-11 11:11:11 +02:00", "2011-11-11 10:11:11.000+0100"},
         {"2011-11-11 11:11:11 -02:00", "2011-11-11 14:11:11.000+0100"},
         {"2011-11-11 11:11:11.123 -02:00", "2011-11-11 14:11:11.123+0100"}
@@ -39,6 +47,13 @@ public void parseAble(final String[] string, final Class<?> clazz) throws Except
         assertNotNull(result);
         assertTrue(clazz.isAssignableFrom(result.getClass()));
 
-        assertEquals(string[1], new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSZ", Locale.GERMANY).format(result));
+        java.util.Date shouldBe = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSZ", Locale.GERMANY).parse(string[1]);
+        if (result instanceof java.sql.Date) {
+            assertEquals(((Date) result).getTime(), shouldBe.getTime());
+        } else if (result instanceof java.sql.Timestamp) {
+            assertEquals(((java.sql.Timestamp) result).getTime(), shouldBe.getTime());
+        } else {
+            fail(String.format("Unknown type for result: %s (%s)", result, result.getClass()));
+        }
     }
 }

src/test/java/de/zalando/typemapper/postgres/PgSerializerTest.java

@@ -1,7 +1,7 @@
 package de.zalando.typemapper.postgres;
 
 import static org.hamcrest.CoreMatchers.is;
-
+import static org.cthul.matchers.CthulMatchers.*;
 import static org.junit.Assert.assertThat;
 
 import static de.zalando.typemapper.postgres.PgArray.ARRAY;
@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
+import java.util.regex.Pattern;
 
 import org.junit.Test;
 
@@ -26,16 +27,27 @@ public class PgSerializerTest {
     // Fields
     private Object objectToSerialize;
     private String expectedString;
+    private Pattern expectedPattern;
 
     /*
      * Constructor. The JUnit test runner will instantiate this class once for
      * every element in the Collection returned by the method annotated with
      *
      * @Parameters.
      */
-    public PgSerializerTest(final Object objectToSerialize, final String expectedString) {
+    public PgSerializerTest(final Object objectToSerialize, final Object expected) {
         this.objectToSerialize = objectToSerialize;
-        this.expectedString = expectedString;
+        if (expected instanceof String) {
+            this.expectedString = (String) expected;
+            this.expectedPattern = null;
+        } else if (expected instanceof Pattern) {
+            this.expectedString = null;
+            this.expectedPattern = (Pattern) expected;
+        } else {
+           throw new IllegalArgumentException(String.format(
+                   "Expected either a String or a Pattern, got: %s (%s)",
+                   expected, expected == null ? null : expected.getClass()));
+        }
     }
 
     /*
@@ -49,10 +61,10 @@ public PgSerializerTest(final Object objectToSerialize, final String expectedStr
     public static Collection<Object[]> generateData() throws SQLException {
         return Arrays.asList(
                 new Object[][] {
-                    {new Date(112, 11, 1, 6, 6, 6), "2012-12-01 06:06:06.000000 +01:00:00"},
-                    {new Date(112, 9, 1, 6, 6, 6), "2012-10-01 06:06:06.000000 +02:00:00"},
+                    {new Date(112, 11, 1, 6, 6, 6), Pattern.compile("2012-12-01 06:06:06.000000 [+-]?\\d{2}:\\d{2}:00")},
+                    {new Date(112, 9, 1, 6, 6, 6), Pattern.compile("2012-10-01 06:06:06.000000 [+-]?\\d{2}:\\d{2}:00")},
                     {1, "1"},
-                    {Integer.valueOf(69), "69"},
+                    {69, "69"},
                     {true, "t"},
                     {new int[] {1, 2, 3, 4}, "{1,2,3,4}"},
                     {new Integer[] {null, 2, 3, 4}, "{NULL,2,3,4}"},
@@ -78,12 +90,15 @@ public static Collection<Object[]> generateData() throws SQLException {
 
     /**
      * Test how SerializationUtils.toPgString() method works.
-     *
-     * @throws  SerializationError
      */
     @Test
     public void serializationTest() {
-        assertThat(PgTypeHelper.toPgString(this.objectToSerialize), is(this.expectedString));
+        String result = PgTypeHelper.toPgString(this.objectToSerialize);
+        if (this.expectedString != null) {
+            assertThat(result, is(this.expectedString));
+        } else {
+            assertThat(result, matchesPattern(this.expectedPattern));
+        }
     }
 
 }