From 86d8c7003844f53e237a8c3c6d50020ba3136c2a Mon Sep 17 00:00:00 2001 From: Martin Mauch Date: Tue, 19 May 2020 11:18:42 +0200 Subject: [PATCH] Update Scalatest to 3.0.8 and run Scalafix --- build.sbt | 2 +- .../com/holdenkarau/spark/testing/SampleScalaCheckTest.scala | 2 +- .../1.6/scala/com/holdenkarau/spark/testing/PrettifyTest.scala | 2 +- .../holdenkarau/spark/testing/SampleDatasetGeneratorTest.scala | 2 +- .../holdenkarau/spark/testing/DatasetGeneratorSizeSpecial.scala | 2 +- .../scala/com/holdenkarau/spark/testing/MLScalaCheckTest.scala | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index dc611676..945c38d7 100644 --- a/build.sbt +++ b/build.sbt @@ -226,7 +226,7 @@ val coreTestSources = unmanagedSourceDirectories in Test := { // additional libraries lazy val commonDependencies = Seq( - "org.scalatest" %% "scalatest" % "3.0.5", + "org.scalatest" %% "scalatest" % "3.0.8", "io.github.nicolasstucki" %% "multisets" % "0.4", "org.scalacheck" %% "scalacheck" % "1.14.0", "junit" % "junit" % "4.12", diff --git a/core/src/test/1.3/scala/com/holdenkarau/spark/testing/SampleScalaCheckTest.scala b/core/src/test/1.3/scala/com/holdenkarau/spark/testing/SampleScalaCheckTest.scala index e64a1946..7391066b 100644 --- a/core/src/test/1.3/scala/com/holdenkarau/spark/testing/SampleScalaCheckTest.scala +++ b/core/src/test/1.3/scala/com/holdenkarau/spark/testing/SampleScalaCheckTest.scala @@ -22,7 +22,7 @@ import org.apache.spark.sql.types._ import org.scalacheck.{Arbitrary, Gen} import org.scalacheck.Prop.forAll import org.scalatest.FunSuite -import org.scalatest.prop.Checkers +import org.scalatestplus.scalacheck.Checkers class SampleScalaCheckTest extends FunSuite with SharedSparkContext with RDDComparisons with Checkers { diff --git a/core/src/test/1.6/scala/com/holdenkarau/spark/testing/PrettifyTest.scala b/core/src/test/1.6/scala/com/holdenkarau/spark/testing/PrettifyTest.scala index 5b41a808..3c419960 100644 --- a/core/src/test/1.6/scala/com/holdenkarau/spark/testing/PrettifyTest.scala +++ b/core/src/test/1.6/scala/com/holdenkarau/spark/testing/PrettifyTest.scala @@ -7,7 +7,7 @@ import org.scalacheck.Prop._ import org.scalacheck.util.Pretty import org.scalatest.FunSuite import org.scalatest.exceptions.GeneratorDrivenPropertyCheckFailedException -import org.scalatest.prop.Checkers +import org.scalatestplus.scalacheck.Checkers class PrettifyTest extends FunSuite with SharedSparkContext with Checkers with Prettify { implicit val propertyCheckConfig = PropertyCheckConfig(minSize = 2, maxSize = 2) diff --git a/core/src/test/1.6/scala/com/holdenkarau/spark/testing/SampleDatasetGeneratorTest.scala b/core/src/test/1.6/scala/com/holdenkarau/spark/testing/SampleDatasetGeneratorTest.scala index c703bb66..bfb65c36 100644 --- a/core/src/test/1.6/scala/com/holdenkarau/spark/testing/SampleDatasetGeneratorTest.scala +++ b/core/src/test/1.6/scala/com/holdenkarau/spark/testing/SampleDatasetGeneratorTest.scala @@ -4,7 +4,7 @@ import org.apache.spark.sql.{Dataset, SQLContext} import org.scalacheck.{Gen, Arbitrary} import org.scalacheck.Prop.forAll import org.scalatest.FunSuite -import org.scalatest.prop.Checkers +import org.scalatestplus.scalacheck.Checkers class SampleDatasetGeneratorTest extends FunSuite with SharedSparkContext with Checkers { diff --git a/core/src/test/2.0/scala/com/holdenkarau/spark/testing/DatasetGeneratorSizeSpecial.scala b/core/src/test/2.0/scala/com/holdenkarau/spark/testing/DatasetGeneratorSizeSpecial.scala index ef6ee912..7bac2d8d 100644 --- a/core/src/test/2.0/scala/com/holdenkarau/spark/testing/DatasetGeneratorSizeSpecial.scala +++ b/core/src/test/2.0/scala/com/holdenkarau/spark/testing/DatasetGeneratorSizeSpecial.scala @@ -4,7 +4,7 @@ import org.apache.spark.sql.{Dataset, SQLContext} import org.scalacheck.{Gen, Arbitrary} import org.scalacheck.Prop.forAll import org.scalatest.FunSuite -import org.scalatest.prop.Checkers +import org.scalatestplus.scalacheck.Checkers class DatasetGeneratorSizeSpecial extends FunSuite with SharedSparkContext with Checkers { diff --git a/core/src/test/2.0/scala/com/holdenkarau/spark/testing/MLScalaCheckTest.scala b/core/src/test/2.0/scala/com/holdenkarau/spark/testing/MLScalaCheckTest.scala index 578038ff..abaea76e 100644 --- a/core/src/test/2.0/scala/com/holdenkarau/spark/testing/MLScalaCheckTest.scala +++ b/core/src/test/2.0/scala/com/holdenkarau/spark/testing/MLScalaCheckTest.scala @@ -5,7 +5,7 @@ import org.apache.spark.sql.SQLContext import org.apache.spark.sql.types.{StructField, StructType} import org.scalacheck.Prop.forAll import org.scalatest.FunSuite -import org.scalatest.prop.Checkers +import org.scalatestplus.scalacheck.Checkers class MLScalaCheckTest extends FunSuite with SharedSparkContext with Checkers { // re-use the spark context