This is an automated email from the ASF dual-hosted git repository. rubenql pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git
The following commit(s) were added to refs/heads/main by this push: new b57eb7cd3 [CALCITE-5494] Time zone tests in DateTimeUtilsTest should pass in Europe/London b57eb7cd3 is described below commit b57eb7cd31a90d3f46b65c13832b398be5b0dad9 Author: Greg Hart <greg.h...@protegrity.com> AuthorDate: Tue Jan 24 14:48:34 2023 -0800 [CALCITE-5494] Time zone tests in DateTimeUtilsTest should pass in Europe/London --- .../calcite/avatica/util/DateTimeUtilsTest.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/test/java/org/apache/calcite/avatica/util/DateTimeUtilsTest.java b/core/src/test/java/org/apache/calcite/avatica/util/DateTimeUtilsTest.java index acc08949e..7b03a64ac 100644 --- a/core/src/test/java/org/apache/calcite/avatica/util/DateTimeUtilsTest.java +++ b/core/src/test/java/org/apache/calcite/avatica/util/DateTimeUtilsTest.java @@ -1110,12 +1110,12 @@ public class DateTimeUtilsTest { assertThat(sqlDateToUnixDate(new java.sql.Date(utcCal.getTimeInMillis()), utcCal), is(0)); final TimeZone minusDayZone = TimeZone.getDefault(); - minusDayZone.setRawOffset((int) (minusDayZone.getOffset(0L) - MILLIS_PER_DAY)); + minusDayZone.setRawOffset((int) (minusDayZone.getRawOffset() - MILLIS_PER_DAY)); final Calendar minusDayCal = Calendar.getInstance(minusDayZone, Locale.ROOT); assertThat(sqlDateToUnixDate(epoch, minusDayCal), is(-1)); final TimeZone plusDayZone = TimeZone.getDefault(); - plusDayZone.setRawOffset((int) (plusDayZone.getOffset(0L) + MILLIS_PER_DAY)); + plusDayZone.setRawOffset((int) (plusDayZone.getRawOffset() + MILLIS_PER_DAY)); final Calendar plusDayCal = Calendar.getInstance(plusDayZone, Locale.ROOT); assertThat(sqlDateToUnixDate(epoch, plusDayCal), is(1)); } @@ -1358,12 +1358,12 @@ public class DateTimeUtilsTest { assertThat(sqlTimeToUnixTime(new Time(utcCal.getTimeInMillis()), utcCal), is(0)); final TimeZone minusFiveZone = TimeZone.getDefault(); - minusFiveZone.setRawOffset((int) (minusFiveZone.getOffset(0L) - 5 * MILLIS_PER_HOUR)); + minusFiveZone.setRawOffset((int) (minusFiveZone.getRawOffset() - 5 * MILLIS_PER_HOUR)); final Calendar minusFiveCal = Calendar.getInstance(minusFiveZone, Locale.ROOT); assertEquals(19 * MILLIS_PER_HOUR, sqlTimeToUnixTime(epoch, minusFiveCal)); final TimeZone plusFiveZone = TimeZone.getDefault(); - plusFiveZone.setRawOffset((int) (plusFiveZone.getOffset(0L) + 5 * MILLIS_PER_HOUR)); + plusFiveZone.setRawOffset((int) (plusFiveZone.getRawOffset() + 5 * MILLIS_PER_HOUR)); final Calendar plusFiveCal = Calendar.getInstance(plusFiveZone, Locale.ROOT); assertEquals(5 * MILLIS_PER_HOUR, sqlTimeToUnixTime(epoch, plusFiveCal)); } @@ -1399,12 +1399,12 @@ public class DateTimeUtilsTest { assertThat(unixTimeToSqlTime(0, utcCal).getTime(), is(utcCal.getTimeInMillis())); final TimeZone minusFiveZone = TimeZone.getDefault(); - minusFiveZone.setRawOffset((int) (minusFiveZone.getOffset(0L) - 5 * MILLIS_PER_HOUR)); + minusFiveZone.setRawOffset((int) (minusFiveZone.getRawOffset() - 5 * MILLIS_PER_HOUR)); final Calendar minusFiveCal = Calendar.getInstance(minusFiveZone, Locale.ROOT); assertThat(unixTimeToSqlTime(0, minusFiveCal).toString(), is("05:00:00")); final TimeZone plusFiveZone = TimeZone.getDefault(); - plusFiveZone.setRawOffset((int) (plusFiveZone.getOffset(0L) + 5 * MILLIS_PER_HOUR)); + plusFiveZone.setRawOffset((int) (plusFiveZone.getRawOffset() + 5 * MILLIS_PER_HOUR)); final Calendar plusFiveCal = Calendar.getInstance(plusFiveZone, Locale.ROOT); assertThat(unixTimeToSqlTime(0, plusFiveCal).toString(), is("19:00:00")); } @@ -1451,13 +1451,13 @@ public class DateTimeUtilsTest { is(0L)); final TimeZone minusFiveZone = TimeZone.getDefault(); - minusFiveZone.setRawOffset((int) (minusFiveZone.getOffset(0L) - 5 * MILLIS_PER_HOUR)); + minusFiveZone.setRawOffset((int) (minusFiveZone.getRawOffset() - 5 * MILLIS_PER_HOUR)); final Calendar minusFiveCal = Calendar.getInstance(minusFiveZone, Locale.ROOT); assertThat(sqlTimestampToUnixTimestamp(epoch, minusFiveCal), is(-5 * MILLIS_PER_HOUR)); final TimeZone plusFiveZone = TimeZone.getDefault(); - plusFiveZone.setRawOffset((int) (plusFiveZone.getOffset(0L) + 5 * MILLIS_PER_HOUR)); + plusFiveZone.setRawOffset((int) (plusFiveZone.getRawOffset() + 5 * MILLIS_PER_HOUR)); final Calendar plusFiveCal = Calendar.getInstance(plusFiveZone, Locale.ROOT); assertThat(sqlTimestampToUnixTimestamp(epoch, plusFiveCal), is(5 * MILLIS_PER_HOUR)); @@ -1557,13 +1557,13 @@ public class DateTimeUtilsTest { assertThat(unixTimestampToSqlTimestamp(0L, utcCal).getTime(), is(utcCal.getTimeInMillis())); final TimeZone minusFiveZone = TimeZone.getDefault(); - minusFiveZone.setRawOffset((int) (minusFiveZone.getOffset(0L) - 5 * MILLIS_PER_HOUR)); + minusFiveZone.setRawOffset((int) (minusFiveZone.getRawOffset() - 5 * MILLIS_PER_HOUR)); final Calendar minusFiveCal = Calendar.getInstance(minusFiveZone, Locale.ROOT); assertThat(unixTimestampToSqlTimestamp(0L, minusFiveCal), is(Timestamp.valueOf("1970-01-01 05:00:00"))); final TimeZone plusFiveZone = TimeZone.getDefault(); - plusFiveZone.setRawOffset((int) (plusFiveZone.getOffset(0L) + 5 * MILLIS_PER_HOUR)); + plusFiveZone.setRawOffset((int) (plusFiveZone.getRawOffset() + 5 * MILLIS_PER_HOUR)); final Calendar plusFiveCal = Calendar.getInstance(plusFiveZone, Locale.ROOT); assertThat(unixTimestampToSqlTimestamp(0L, plusFiveCal), is(Timestamp.valueOf("1969-12-31 19:00:00")));