Skip to content

[SPARK-25670][TEST] Reduce number of tested timezones in JsonExpressionsSuite #22657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MaxGekk wants to merge 5 commits into from
Closed

[SPARK-25670][TEST] Reduce number of tested timezones in JsonExpressionsSuite #22657

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7d17d2
Reduce number of timezones in the test
MaxGekk Oct 6, 2018
5f8bf79
Taking a few out of all timezones for testing
MaxGekk Oct 10, 2018
778629d
Moving timezones to SparkFunSuite
MaxGekk Oct 10, 2018
4322897
Merge remote-tracking branch 'origin/master' into json-timezone-test
MaxGekk Oct 11, 2018
30be9f3
Moving back to DataTimeTestUtils
MaxGekk Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...alyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.catalyst.errors.TreeNodeException
import org.apache.spark.sql.catalyst.plans.PlanTestBase
import org.apache.spark.sql.catalyst.util.{ArrayBasedMapData, DateTimeTestUtils, DateTimeUtils, GenericArrayData, PermissiveMode}
import org.apache.spark.sql.catalyst.util._
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.types._
import org.apache.spark.unsafe.types.UTF8String
Expand Down Expand Up @@ -510,7 +510,7 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper with
)

val jsonData2 = """{"t": "2016-01-01T00:00:00"}"""
for (tz <- DateTimeTestUtils.ALL_TIMEZONES) {
for (tz <- DateTimeTestUtils.TIMEZONES) {
c = Calendar.getInstance(tz)
c.set(2016, 0, 1, 0, 0, 0)
c.set(Calendar.MILLISECOND, 0)
Expand Down
10 changes: 10 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ object DateTimeTestUtils {

val ALL_TIMEZONES: Seq[TimeZone] = TimeZone.getAvailableIDs.toSeq.map(TimeZone.getTimeZone)

val TIMEZONES = Seq(
Copy link
Contributor

@cloud-fan cloud-fan Oct 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we move it to SparkFunSuite and name it like outstandingTimezones?

Copy link
Member Author

@MaxGekk MaxGekk Oct 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems it should be useful across a few test suites. I will do that.

TimeZone.getTimeZone("UTC"),
TimeZone.getTimeZone("PST"),
TimeZone.getTimeZone("CET"),
TimeZone.getTimeZone("Africa/Dakar"),
TimeZone.getTimeZone("America/Los_Angeles"),
TimeZone.getTimeZone("Antarctica/Vostok"),
TimeZone.getTimeZone("Asia/Hong_Kong"),
TimeZone.getTimeZone("Europe/Amsterdam"))

def withDefaultTimeZone[T](newDefaultTimeZone: TimeZone)(block: => T): T = {
val originalDefaultTimeZone = TimeZone.getDefault
try {
Expand Down