From a65d77443fd31db38ec4ffd91caa5d7581456c22 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 24 Mar 2012 09:57:19 +0000 Subject: [PATCH] Fixed test case that breaks when we shift from CET -> CEST (daylight savings time) --- .../org/jooq/test/_/testcases/FunctionTests.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java index 4f7966b5bd..5e439d3103 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java @@ -115,6 +115,7 @@ import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; import java.util.Arrays; +import java.util.Calendar; import org.jooq.DatePart; import org.jooq.Field; @@ -794,10 +795,18 @@ extends BaseTest yesterday = now.sub(1); record = create().select(tomorrow, ts, yesterday).fetchOne(); + // Be sure this test doesn't fail when we switch from CET to CEST :-) + Calendar cal = Calendar.getInstance(); + long tNow = cal.getTimeInMillis(); + cal.add(Calendar.DATE, 1); + long tTomorrow = cal.getTimeInMillis(); + cal.add(Calendar.DATE, -2); + long tYesterday = cal.getTimeInMillis(); + // Ingres truncates milliseconds. Ignore this fact - assertEquals(24 * 60 * 60, + assertEquals((tNow - tYesterday) / 1000, (record.getValue(ts).getTime() / 1000 - record.getValue(yesterday).getTime() / 1000)); - assertEquals(24 * 60 * 60, + assertEquals((tTomorrow - tNow) / 1000, (record.getValue(tomorrow).getTime() / 1000 - record.getValue(ts).getTime() / 1000)); }