Skip to content

Commit 5d4e0e3

Browse files
committed
Updated ScalaTest 3.1.0
1 parent 221b513 commit 5d4e0e3

10 files changed

+28
-18
lines changed

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ lazy val fpinscala = (project in file("."))
1313
%%("shapeless", V.shapeless),
1414
%%("scalatest", V.scalatest),
1515
%%("scalacheck", V.scalacheck),
16-
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless
16+
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless,
17+
"org.scalatestplus" %% "scalatestplus-scalacheck" % V.scalatestplusScheck
1718
)
1819
)
1920

project/ProjectPlugin.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ object ProjectPlugin extends AutoPlugin {
1717
lazy val V = new {
1818
val scala212: String = "2.12.10"
1919
val shapeless: String = "2.3.3"
20-
val scalatest: String = "3.0.8"
20+
val scalatest: String = "3.1.0"
21+
val scalatestplusScheck: String = "3.1.0.0-RC2"
2122
val scalacheck: String = "1.14.2"
2223
val scalacheckShapeless: String = "1.2.3"
2324
}

src/main/scala/fpinscalalib/ErrorHandlingSection.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ package fpinscalalib
99
import fpinscalalib.customlib.errorhandling._
1010
import fpinscalalib.customlib.errorhandling.Option._
1111
import fpinscalalib.customlib.errorhandling.ExampleHelper._
12-
import org.scalatest.{FlatSpec, Matchers}
12+
import org.scalatest.flatspec.AnyFlatSpec
13+
import org.scalatest.matchers.should.Matchers
1314

1415
import scala.util.{Success, Try}
1516

1617
/** @param name handling_error_without_exceptions
1718
*/
1819
object ErrorHandlingSection
19-
extends FlatSpec
20+
extends AnyFlatSpec
2021
with Matchers
2122
with org.scalaexercises.definitions.Section {
2223

src/main/scala/fpinscalalib/FunctionalDataStructuresSection.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66

77
package fpinscalalib
88

9-
import org.scalatest.{FlatSpec, Matchers}
9+
import org.scalatest.flatspec.AnyFlatSpec
10+
import org.scalatest.matchers.should.Matchers
1011
import fpinscalalib.customlib.functionaldatastructures._
1112
import fpinscalalib.customlib.functionaldatastructures.List._
1213
import Tree._
1314

1415
/** @param name functional_data_structures
1516
*/
1617
object FunctionalDataStructuresSection
17-
extends FlatSpec
18+
extends AnyFlatSpec
1819
with Matchers
1920
with org.scalaexercises.definitions.Section {
2021

src/main/scala/fpinscalalib/FunctionalParallelismSection.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ package fpinscalalib
88

99
import fpinscalalib.customlib.functionalparallelism.Par
1010
import fpinscalalib.customlib.functionalparallelism.Par._
11-
import org.scalatest.{FlatSpec, Matchers}
11+
import org.scalatest.flatspec.AnyFlatSpec
12+
import org.scalatest.matchers.should.Matchers
1213
import java.util.concurrent.Executors
1314

1415
/** @param name purely_functional_parallelism
1516
*/
1617
object FunctionalParallelismSection
17-
extends FlatSpec
18+
extends AnyFlatSpec
1819
with Matchers
1920
with org.scalaexercises.definitions.Section {
2021

src/main/scala/fpinscalalib/FunctionalStateSection.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ package fpinscalalib
88

99
import fpinscalalib.customlib.state.RNG.Simple
1010
import fpinscalalib.customlib.state.RNG._
11-
import org.scalatest.{FlatSpec, Matchers}
11+
import org.scalatest.flatspec.AnyFlatSpec
12+
import org.scalatest.matchers.should.Matchers
1213
import fpinscalalib.customlib.state._
1314

1415
/** @param name pure_functional_state
1516
*/
1617
object FunctionalStateSection
17-
extends FlatSpec
18+
extends AnyFlatSpec
1819
with Matchers
1920
with org.scalaexercises.definitions.Section {
2021

src/main/scala/fpinscalalib/GettingStartedWithFPSection.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66

77
package fpinscalalib
88

9-
import org.scalatest.{FlatSpec, Matchers}
9+
import org.scalatest.flatspec.AnyFlatSpec
10+
import org.scalatest.matchers.should.Matchers
1011

1112
/** @param name getting_started_with_functional_programming
1213
*/
1314
object GettingStartedWithFPSection
14-
extends FlatSpec
15+
extends AnyFlatSpec
1516
with Matchers
1617
with org.scalaexercises.definitions.Section {
1718

src/main/scala/fpinscalalib/ParserCombinatorsSection.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
package fpinscalalib
88

9-
import org.scalatest.{FlatSpec, Matchers}
9+
import org.scalatest.flatspec.AnyFlatSpec
10+
import org.scalatest.matchers.should.Matchers
1011
import fpinscalalib.customlib.parsing.{JSON, ParseError, Reference}
1112
import fpinscalalib.customlib.parsing.ReferenceTypes._
1213
import Reference._
@@ -15,7 +16,7 @@ import scala.util.matching.Regex
1516
/** @param name parser_combinatorss
1617
*/
1718
object ParserCombinatorsSection
18-
extends FlatSpec
19+
extends AnyFlatSpec
1920
with Matchers
2021
with org.scalaexercises.definitions.Section
2122
with ReferenceHelper {

src/main/scala/fpinscalalib/PropertyBasedTestingSection.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77
package fpinscalalib
88

99
import fpinscalalib.customlib.state.{RNG, State}
10-
import org.scalatest.{FlatSpec, Matchers}
10+
import org.scalatest.flatspec.AnyFlatSpec
11+
import org.scalatest.matchers.should.Matchers
1112
import fpinscalalib.customlib.testing.{Gen, SGen}
1213
import fpinscalalib.customlib.testing.Gen._
1314
import fpinscalalib.customlib.testing.Prop._
1415

1516
/** @param name property_based_testing
1617
*/
1718
object PropertyBasedTestingSection
18-
extends FlatSpec
19+
extends AnyFlatSpec
1920
with Matchers
2021
with org.scalaexercises.definitions.Section {
2122

src/main/scala/fpinscalalib/StrictnessAndLazinessSection.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ package fpinscalalib
99
import fpinscalalib.customlib.laziness._
1010
import fpinscalalib.customlib.laziness.Stream
1111
import fpinscalalib.customlib.laziness.Stream._
12-
import org.scalatest.{FlatSpec, Matchers}
12+
import org.scalatest.flatspec.AnyFlatSpec
13+
import org.scalatest.matchers.should.Matchers
1314

1415
/** @param name strictness_and_laziness
1516
*/
1617
object StrictnessAndLazinessSection
17-
extends FlatSpec
18+
extends AnyFlatSpec
1819
with Matchers
1920
with org.scalaexercises.definitions.Section {
2021

0 commit comments

Comments
 (0)