Skip to content

Commit be2eca2

Browse files
srowendongjoon-hyun
authored andcommitted
[SPARK-32398][TESTS][CORE][STREAMING][SQL][ML] Update to scalatest 3.2.0 for Scala 2.13.3+
### What changes were proposed in this pull request? Updates to scalatest 3.2.0. Though it looks large, it is 99% changes to the new location of scalatest classes. ### Why are the changes needed? 3.2.0+ has a fix that is required for Scala 2.13.3+ compatibility. ### Does this PR introduce _any_ user-facing change? No, only affects tests. ### How was this patch tested? Existing tests. Closes #29196 from srowen/SPARK-32398. Authored-by: Sean Owen <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent e7fb67c commit be2eca2

File tree

116 files changed

+270
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+270
-145
lines changed

common/sketch/src/test/scala/org/apache/spark/util/sketch/BitArraySuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package org.apache.spark.util.sketch
1919

2020
import scala.util.Random
2121

22-
import org.scalatest.FunSuite // scalastyle:ignore funsuite
22+
import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
2323

24-
class BitArraySuite extends FunSuite { // scalastyle:ignore funsuite
24+
class BitArraySuite extends AnyFunSuite { // scalastyle:ignore funsuite
2525

2626
test("error case when create BitArray") {
2727
intercept[IllegalArgumentException](new BitArray(0))

common/sketch/src/test/scala/org/apache/spark/util/sketch/BloomFilterSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
2222
import scala.reflect.ClassTag
2323
import scala.util.Random
2424

25-
import org.scalatest.FunSuite // scalastyle:ignore funsuite
25+
import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
2626

27-
class BloomFilterSuite extends FunSuite { // scalastyle:ignore funsuite
27+
class BloomFilterSuite extends AnyFunSuite { // scalastyle:ignore funsuite
2828
private final val EPSILON = 0.01
2929

3030
// Serializes and deserializes a given `BloomFilter`, then checks whether the deserialized

common/sketch/src/test/scala/org/apache/spark/util/sketch/CountMinSketchSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
2222
import scala.reflect.ClassTag
2323
import scala.util.Random
2424

25-
import org.scalatest.FunSuite // scalastyle:ignore funsuite
25+
import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
2626

27-
class CountMinSketchSuite extends FunSuite { // scalastyle:ignore funsuite
27+
class CountMinSketchSuite extends AnyFunSuite { // scalastyle:ignore funsuite
2828
private val epsOfTotalCount = 0.01
2929

3030
private val confidence = 0.9

common/unsafe/src/test/scala/org/apache/spark/unsafe/types/UTF8StringPropertyCheckSuite.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ import org.apache.commons.text.similarity.LevenshteinDistance
2121
import org.scalacheck.{Arbitrary, Gen}
2222
import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
2323
// scalastyle:off
24-
import org.scalatest.{FunSuite, Matchers}
24+
import org.scalatest.funsuite.AnyFunSuite
25+
import org.scalatest.matchers.must.Matchers
2526

2627
import org.apache.spark.unsafe.types.UTF8String.{fromString => toUTF8}
2728

2829
/**
2930
* This TestSuite utilize ScalaCheck to generate randomized inputs for UTF8String testing.
3031
*/
31-
class UTF8StringPropertyCheckSuite extends FunSuite with ScalaCheckDrivenPropertyChecks with Matchers {
32+
class UTF8StringPropertyCheckSuite extends AnyFunSuite with ScalaCheckDrivenPropertyChecks with Matchers {
3233
// scalastyle:on
3334

3435
test("toString") {

core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ class JavaSparkContext(val sc: SparkContext) extends Closeable {
727727
* @note This does not necessarily mean the caching or computation was successful.
728728
*/
729729
def getPersistentRDDs: JMap[java.lang.Integer, JavaRDD[_]] = {
730-
sc.getPersistentRDDs.mapValues(s => JavaRDD.fromRDD(s))
730+
sc.getPersistentRDDs.mapValues(s => JavaRDD.fromRDD(s)).toMap
731731
.asJava.asInstanceOf[JMap[java.lang.Integer, JavaRDD[_]]]
732732
}
733733

core/src/test/scala/org/apache/spark/AccumulatorSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import scala.collection.mutable.ArrayBuffer
2525
import scala.ref.WeakReference
2626
import scala.util.control.NonFatal
2727

28-
import org.scalatest.Matchers
2928
import org.scalatest.exceptions.TestFailedException
29+
import org.scalatest.matchers.must.Matchers
3030

3131
import org.apache.spark.scheduler._
3232
import org.apache.spark.serializer.JavaSerializer

core/src/test/scala/org/apache/spark/DistributedSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
package org.apache.spark
1919

2020
import org.scalatest.Assertions._
21-
import org.scalatest.Matchers
2221
import org.scalatest.concurrent.{Signaler, ThreadSignaler, TimeLimits}
22+
import org.scalatest.matchers.must.Matchers
2323
import org.scalatest.time.{Millis, Span}
2424

2525
import org.apache.spark.internal.config

core/src/test/scala/org/apache/spark/ExternalShuffleServiceSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package org.apache.spark
1919

2020
import org.scalatest.BeforeAndAfterAll
2121
import org.scalatest.concurrent.Eventually
22+
import org.scalatest.matchers.should.Matchers._
2223
import org.scalatest.time.SpanSugar._
2324

2425
import org.apache.spark.internal.config

core/src/test/scala/org/apache/spark/FutureActionSuite.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ package org.apache.spark
1919

2020
import scala.concurrent.duration.Duration
2121

22-
import org.scalatest.{BeforeAndAfter, Matchers}
22+
import org.scalatest.BeforeAndAfter
23+
import org.scalatest.matchers.must.Matchers
24+
import org.scalatest.matchers.should.Matchers._
2325

2426
import org.apache.spark.util.ThreadUtils
2527

core/src/test/scala/org/apache/spark/JobCancellationSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import scala.concurrent.Future
2525
import scala.concurrent.duration._
2626

2727
import org.scalatest.BeforeAndAfter
28-
import org.scalatest.Matchers
28+
import org.scalatest.matchers.must.Matchers
2929

3030
import org.apache.spark.internal.config._
3131
import org.apache.spark.internal.config.Deploy._

0 commit comments

Comments
 (0)