You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2017/11/10 17:24:27 UTC
spark git commit: [SPARK-22473][TEST] Replace deprecated
AsyncAssertions.Waiter and methods of java.sql.Date
Repository: spark
Updated Branches:
refs/heads/master 1c923d7d6 -> 5b41cbf13
[SPARK-22473][TEST] Replace deprecated AsyncAssertions.Waiter and methods of java.sql.Date
## What changes were proposed in this pull request?
In `spark-sql` module tests there are deprecations warnings caused by the usage of deprecated methods of `java.sql.Date` and the usage of the deprecated `AsyncAssertions.Waiter` class.
This PR replace the deprecated methods of `java.sql.Date` with non-deprecated ones (using `Calendar` where needed). It replaces also the deprecated `org.scalatest.concurrent.AsyncAssertions.Waiter` with `org.scalatest.concurrent.Waiters._`.
## How was this patch tested?
existing UTs
Author: Marco Gaido <mg...@hortonworks.com>
Closes #19696 from mgaido91/SPARK-22473.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5b41cbf1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5b41cbf1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5b41cbf1
Branch: refs/heads/master
Commit: 5b41cbf13b6d6f47b8f8f1ffcc7a3348018627ca
Parents: 1c923d7
Author: Marco Gaido <mg...@hortonworks.com>
Authored: Fri Nov 10 11:24:24 2017 -0600
Committer: Sean Owen <so...@cloudera.com>
Committed: Fri Nov 10 11:24:24 2017 -0600
----------------------------------------------------------------------
.../src/test/scala/org/apache/spark/sql/DatasetSuite.scala | 4 ++--
.../spark/sql/execution/streaming/HDFSMetadataLogSuite.scala | 4 ++--
.../apache/spark/sql/streaming/EventTimeWatermarkSuite.scala | 8 ++++++--
.../spark/sql/streaming/StreamingQueryListenerSuite.scala | 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/5b41cbf1/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
index 6e13a5d..b02db77 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
@@ -1274,8 +1274,8 @@ class DatasetSuite extends QueryTest with SharedSQLContext {
assert(spark.range(1).map { x => scala.math.BigDecimal(1, 18) }.head ==
scala.math.BigDecimal(1, 18))
- assert(spark.range(1).map { x => new java.sql.Date(2016, 12, 12) }.head ==
- new java.sql.Date(2016, 12, 12))
+ assert(spark.range(1).map { x => java.sql.Date.valueOf("2016-12-12") }.head ==
+ java.sql.Date.valueOf("2016-12-12"))
assert(spark.range(1).map { x => new java.sql.Timestamp(100000) }.head ==
new java.sql.Timestamp(100000))
http://git-wip-us.apache.org/repos/asf/spark/blob/5b41cbf1/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
index 48e70e4..4677769 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
@@ -26,10 +26,10 @@ import scala.util.Random
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs._
-import org.scalatest.concurrent.AsyncAssertions._
+import org.scalatest.concurrent.Waiters._
import org.scalatest.time.SpanSugar._
-import org.apache.spark.{SparkConf, SparkFunSuite}
+import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.execution.streaming.FakeFileSystem._
import org.apache.spark.sql.execution.streaming.HDFSMetadataLog.{FileContextManager, FileManager, FileSystemManager}
import org.apache.spark.sql.test.SharedSQLContext
http://git-wip-us.apache.org/repos/asf/spark/blob/5b41cbf1/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
index f3e8cf9..47bc452 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/streaming/EventTimeWatermarkSuite.scala
@@ -19,7 +19,7 @@ package org.apache.spark.sql.streaming
import java.{util => ju}
import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.{Calendar, Date}
import org.scalatest.{BeforeAndAfter, Matchers}
@@ -218,7 +218,11 @@ class EventTimeWatermarkSuite extends StreamTest with BeforeAndAfter with Matche
.agg(count("*") as 'count)
.select($"window".getField("start").cast("long").as[Long], $"count".as[Long])
- def monthsSinceEpoch(date: Date): Int = { date.getYear * 12 + date.getMonth }
+ def monthsSinceEpoch(date: Date): Int = {
+ val cal = Calendar.getInstance()
+ cal.setTime(date)
+ cal.get(Calendar.YEAR) * 12 + cal.get(Calendar.MONTH)
+ }
testStream(aggWithWatermark)(
AddData(input, currentTimeMs / 1000),
http://git-wip-us.apache.org/repos/asf/spark/blob/5b41cbf1/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingQueryListenerSuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingQueryListenerSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingQueryListenerSuite.scala
index 1fe639f..9ff02de 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingQueryListenerSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingQueryListenerSuite.scala
@@ -25,8 +25,8 @@ import scala.language.reflectiveCalls
import org.scalactic.TolerantNumerics
import org.scalatest.BeforeAndAfter
import org.scalatest.PrivateMethodTester._
-import org.scalatest.concurrent.AsyncAssertions.Waiter
import org.scalatest.concurrent.PatienceConfiguration.Timeout
+import org.scalatest.concurrent.Waiters.Waiter
import org.apache.spark.SparkException
import org.apache.spark.scheduler._
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org