From f5cea66b3bada0afa07b73691753bdc9c983e86d Mon Sep 17 00:00:00 2001 From: Daoyuan Wang Date: Tue, 21 Jun 2016 02:54:39 +0800 Subject: [PATCH] set test runtime timezone for DateTimeUtilSuite --- .../spark/sql/catalyst/util/DateTimeUtilsSuite.scala | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 f9cb97629fcf..64391fb90ebb 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 @@ -21,17 +21,27 @@ import java.sql.{Date, Timestamp} import java.text.SimpleDateFormat import java.util.{Calendar, TimeZone} +import org.scalatest.BeforeAndAfterAll + import org.apache.spark.SparkFunSuite import org.apache.spark.sql.catalyst.util.DateTimeUtils._ import org.apache.spark.unsafe.types.UTF8String -class DateTimeUtilsSuite extends SparkFunSuite { +class DateTimeUtilsSuite extends SparkFunSuite with BeforeAndAfterAll { private[this] def getInUTCDays(timestamp: Long): Int = { val tz = TimeZone.getDefault ((timestamp + tz.getOffset(timestamp)) / MILLIS_PER_DAY).toInt } + private val originalTimeZone = TimeZone.getDefault + override def beforeAll(): Unit = { + TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")) + } + override def afterAll(): Unit = { + TimeZone.setDefault(originalTimeZone) + } + test("timestamp and us") { val now = new Timestamp(System.currentTimeMillis()) now.setNanos(1000)