From 66254e0030451de43339753df12191776a0809a3 Mon Sep 17 00:00:00 2001 From: Christian Kadner Date: Mon, 20 Jun 2016 13:38:34 -0700 Subject: [PATCH] set correct TimeZone in test cases "to UTC timestamp" and "from UTC timestamp" --- .../sql/catalyst/util/DateTimeUtilsSuite.scala | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala index f9cb97629fcf3..cd31176f071e5 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala @@ -485,8 +485,10 @@ class DateTimeUtilsSuite extends SparkFunSuite { test("from UTC timestamp") { def test(utc: String, tz: String, expected: String): Unit = { - assert(toJavaTimestamp(fromUTCTime(fromJavaTimestamp(Timestamp.valueOf(utc)), tz)).toString - === expected) + DateTimeTestUtils.withDefaultTimeZone(TimeZone.getTimeZone("UTC")) { + assert(toJavaTimestamp(fromUTCTime(fromJavaTimestamp(Timestamp.valueOf(utc)), tz)).toString + === expected) + } } test("2011-12-25 09:00:00.123456", "UTC", "2011-12-25 09:00:00.123456") test("2011-12-25 09:00:00.123456", "JST", "2011-12-25 18:00:00.123456") @@ -502,9 +504,11 @@ class DateTimeUtilsSuite extends SparkFunSuite { } test("to UTC timestamp") { - def test(utc: String, tz: String, expected: String): Unit = { - assert(toJavaTimestamp(toUTCTime(fromJavaTimestamp(Timestamp.valueOf(utc)), tz)).toString - === expected) + def test(ts: String, tz: String, expected: String): Unit = { + DateTimeTestUtils.withDefaultTimeZone(TimeZone.getTimeZone(tz)) { + assert(toJavaTimestamp(toUTCTime(fromJavaTimestamp(Timestamp.valueOf(ts)), tz)).toString + === expected) + } } test("2011-12-25 09:00:00.123456", "UTC", "2011-12-25 09:00:00.123456") test("2011-12-25 18:00:00.123456", "JST", "2011-12-25 09:00:00.123456")