diff --git a/build.sbt b/build.sbt index 829b4ca1..a6260b9a 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,8 @@ lazy val stdlib = (project in file(".")) %%("shapeless", V.shapeless), %%("scalatest", V.scalatest), %%("scalacheck", V.scalacheck), - "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless + "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless, + "org.scalatestplus" %% "scalatestplus-scalacheck" % V.scalatestplusScheck ) ) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 1dbaa17b..a97cc3b3 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -18,7 +18,8 @@ object ProjectPlugin extends AutoPlugin { lazy val V = new { val scala212: String = "2.12.10" val shapeless: String = "2.3.3" - val scalatest: String = "3.0.8" + val scalatest: String = "3.1.0" + val scalatestplusScheck: String = "3.1.0.0-RC2" val scalacheck: String = "1.14.2" val scalacheckShapeless: String = "1.2.3" } diff --git a/src/main/scala/stdlib/Asserts.scala b/src/main/scala/stdlib/Asserts.scala index 9ff24fd5..918716ae 100644 --- a/src/main/scala/stdlib/Asserts.scala +++ b/src/main/scala/stdlib/Asserts.scala @@ -6,11 +6,12 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name asserts */ -object Asserts extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Asserts extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** ScalaTest makes three assertions available by default in any style trait. You can use: * diff --git a/src/main/scala/stdlib/ByNameParameter.scala b/src/main/scala/stdlib/ByNameParameter.scala index 2fe6f9cf..b007d441 100644 --- a/src/main/scala/stdlib/ByNameParameter.scala +++ b/src/main/scala/stdlib/ByNameParameter.scala @@ -6,11 +6,15 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name byname_parameter */ -object ByNameParameter extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object ByNameParameter + extends AnyFlatSpec + with Matchers + with org.scalaexercises.definitions.Section { /** `() => Int` is a Function type that takes a `Unit` type. `Unit` is known as `void` to a Java programmer. The function returns an `Int`. You can place this as a method parameter so that you can you use it as a block, but still it doesn't look quite right: */ diff --git a/src/main/scala/stdlib/CaseClasses.scala b/src/main/scala/stdlib/CaseClasses.scala index acccc9bf..fad8523b 100644 --- a/src/main/scala/stdlib/CaseClasses.scala +++ b/src/main/scala/stdlib/CaseClasses.scala @@ -6,11 +6,12 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name case_classes */ -object CaseClasses extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object CaseClasses extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** Scala supports the notion of ''case classes''. Case classes are regular classes which export their constructor parameters and which provide a recursive decomposition mechanism via pattern matching. * diff --git a/src/main/scala/stdlib/Classes.scala b/src/main/scala/stdlib/Classes.scala index f3d2fc30..7e59520b 100644 --- a/src/main/scala/stdlib/Classes.scala +++ b/src/main/scala/stdlib/Classes.scala @@ -6,11 +6,12 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name classes */ -object Classes extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Classes extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** Classes in Scala are static templates that can be instantiated into many objects at runtime. * Here is a class definition which defines a class Point: diff --git a/src/main/scala/stdlib/EmptyValues.scala b/src/main/scala/stdlib/EmptyValues.scala index 21464a15..f5141877 100644 --- a/src/main/scala/stdlib/EmptyValues.scala +++ b/src/main/scala/stdlib/EmptyValues.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name empty_values * */ -object EmptyValues extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object EmptyValues extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** ==null== * diff --git a/src/main/scala/stdlib/Enumerations.scala b/src/main/scala/stdlib/Enumerations.scala index 0647c699..e73e6b10 100644 --- a/src/main/scala/stdlib/Enumerations.scala +++ b/src/main/scala/stdlib/Enumerations.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name enumerations * */ -object Enumerations extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Enumerations extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** To create an enumeration, create an object that extends the abstract class `Enumeration`, and set a `val` variable to the method `Value`. This is a trick to give values to each `val`. * diff --git a/src/main/scala/stdlib/Extractors.scala b/src/main/scala/stdlib/Extractors.scala index 96944c16..607b821a 100644 --- a/src/main/scala/stdlib/Extractors.scala +++ b/src/main/scala/stdlib/Extractors.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name extractors * */ -object Extractors extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Extractors extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** In Scala, patterns can be defined independently of case classes. To this end, a method named `unapply` is defined to yield a so-called extractor. * diff --git a/src/main/scala/stdlib/ForExpressions.scala b/src/main/scala/stdlib/ForExpressions.scala index 39b53c23..440124a1 100644 --- a/src/main/scala/stdlib/ForExpressions.scala +++ b/src/main/scala/stdlib/ForExpressions.scala @@ -6,12 +6,16 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name for_expressions * */ -object ForExpressions extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object ForExpressions + extends AnyFlatSpec + with Matchers + with org.scalaexercises.definitions.Section { /** `for` expressions can nest, with later generators varying more rapidly than earlier ones: */ diff --git a/src/main/scala/stdlib/Formatting.scala b/src/main/scala/stdlib/Formatting.scala index 4bac8356..a6d35b4f 100644 --- a/src/main/scala/stdlib/Formatting.scala +++ b/src/main/scala/stdlib/Formatting.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name formatting * */ -object Formatting extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Formatting extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** String can be placed in format: */ diff --git a/src/main/scala/stdlib/HigherOrderFunctions.scala b/src/main/scala/stdlib/HigherOrderFunctions.scala index edf4f31c..13763800 100644 --- a/src/main/scala/stdlib/HigherOrderFunctions.scala +++ b/src/main/scala/stdlib/HigherOrderFunctions.scala @@ -6,13 +6,14 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name higher_order_functions * */ object HigherOrderFunctions - extends FlatSpec + extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { diff --git a/src/main/scala/stdlib/Implicits.scala b/src/main/scala/stdlib/Implicits.scala index be51b5ba..2a267efd 100644 --- a/src/main/scala/stdlib/Implicits.scala +++ b/src/main/scala/stdlib/Implicits.scala @@ -6,13 +6,14 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import scala.language.implicitConversions /** @param name implicits * */ -object Implicits extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Implicits extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** The actual arguments that are eligible to be passed to an implicit parameter fall into two categories: * diff --git a/src/main/scala/stdlib/InfixPrefixandPostfixOperators.scala b/src/main/scala/stdlib/InfixPrefixandPostfixOperators.scala index 76d84793..f350116f 100644 --- a/src/main/scala/stdlib/InfixPrefixandPostfixOperators.scala +++ b/src/main/scala/stdlib/InfixPrefixandPostfixOperators.scala @@ -6,14 +6,15 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import scala.language.postfixOps /** @param name infix_prefix_and_postfix_operators * */ object InfixPrefixandPostfixOperators - extends FlatSpec + extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { diff --git a/src/main/scala/stdlib/InfixTypes.scala b/src/main/scala/stdlib/InfixTypes.scala index 4f5915ef..5dae5fca 100644 --- a/src/main/scala/stdlib/InfixTypes.scala +++ b/src/main/scala/stdlib/InfixTypes.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name infix_types * */ -object InfixTypes extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object InfixTypes extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** An infix type `T1 op T2` consists of an infix operator `op` which gets applied to two * type operands `T1` and `T2`. The type is equivalent to the type application `op[T1,T2]`. diff --git a/src/main/scala/stdlib/Iterables.scala b/src/main/scala/stdlib/Iterables.scala index 5f5daf59..3c2c9481 100644 --- a/src/main/scala/stdlib/Iterables.scala +++ b/src/main/scala/stdlib/Iterables.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name iterables * */ -object Iterables extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Iterables extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** The next trait from the top in the collections hierarchy is `Iterable`. All methods in this trait are defined in terms of an abstract method, `iterator`, which yields the collection's elements one by one. The `foreach` method from trait `Traversable` is implemented in `Iterable` in terms of `iterator`. Here is the actual implementation: * diff --git a/src/main/scala/stdlib/Lists.scala b/src/main/scala/stdlib/Lists.scala index 155d0d3f..0bb95d8d 100644 --- a/src/main/scala/stdlib/Lists.scala +++ b/src/main/scala/stdlib/Lists.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name lists * */ -object Lists extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Lists extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** Scala Lists are quite similar to arrays, which means all the elements of a list have the same type - but there are two important differences. First, lists are immutable, which means elements of a list cannot be changed by assignment. Second, lists represent a linked list whereas arrays are flat. The type of a list that has elements of type `T` is written as `List[T]`. * diff --git a/src/main/scala/stdlib/LiteralBooleans.scala b/src/main/scala/stdlib/LiteralBooleans.scala index c0ef1cf2..185d92bf 100644 --- a/src/main/scala/stdlib/LiteralBooleans.scala +++ b/src/main/scala/stdlib/LiteralBooleans.scala @@ -6,12 +6,16 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name literal_booleans * */ -object LiteralBooleans extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object LiteralBooleans + extends AnyFlatSpec + with Matchers + with org.scalaexercises.definitions.Section { /** Boolean literals are either true or false, using the `true` or `false` keyword: */ diff --git a/src/main/scala/stdlib/LiteralNumbers.scala b/src/main/scala/stdlib/LiteralNumbers.scala index 9360184e..adec9efc 100644 --- a/src/main/scala/stdlib/LiteralNumbers.scala +++ b/src/main/scala/stdlib/LiteralNumbers.scala @@ -6,12 +6,16 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name literal_numbers * */ -object LiteralNumbers extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object LiteralNumbers + extends AnyFlatSpec + with Matchers + with org.scalaexercises.definitions.Section { /** Integer literals are 32-bit and can be created from decimals as well as hexadecimals: */ diff --git a/src/main/scala/stdlib/LiteralStrings.scala b/src/main/scala/stdlib/LiteralStrings.scala index bcc0b5c3..6dcb3aaf 100644 --- a/src/main/scala/stdlib/LiteralStrings.scala +++ b/src/main/scala/stdlib/LiteralStrings.scala @@ -6,12 +6,16 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name literal_strings * */ -object LiteralStrings extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object LiteralStrings + extends AnyFlatSpec + with Matchers + with org.scalaexercises.definitions.Section { /** Character literals are quoted with single quotes: */ diff --git a/src/main/scala/stdlib/Maps.scala b/src/main/scala/stdlib/Maps.scala index c7abca41..7f54f396 100644 --- a/src/main/scala/stdlib/Maps.scala +++ b/src/main/scala/stdlib/Maps.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name maps * */ -object Maps extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Maps extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** A `Map` is an `Iterable` consisting of pairs of keys and values (also named mappings or associations). Scala's Predef class offers an implicit conversion that lets you write `key -> value` as an alternate syntax for the pair `(key, value)`. For instance `Map("x" -> 24, "y" -> 25, "z" -> 26)` means exactly the same as `Map(("x", 24), ("y", 25), ("z", 26))`, but reads better. * diff --git a/src/main/scala/stdlib/NamedandDefaultArguments.scala b/src/main/scala/stdlib/NamedandDefaultArguments.scala index 3015047a..c28cdf99 100644 --- a/src/main/scala/stdlib/NamedandDefaultArguments.scala +++ b/src/main/scala/stdlib/NamedandDefaultArguments.scala @@ -7,13 +7,14 @@ package stdlib import NamedandDefaultArgumentsHelper._ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name named_and_default_arguments * */ object NamedandDefaultArguments - extends FlatSpec + extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { diff --git a/src/main/scala/stdlib/Objects.scala b/src/main/scala/stdlib/Objects.scala index df6dd0d7..6efffbc2 100644 --- a/src/main/scala/stdlib/Objects.scala +++ b/src/main/scala/stdlib/Objects.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name objects * */ -object Objects extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Objects extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** An object is a singleton. One object, that's it. This object is a replacement of static in Java, and is called upon much in the same way: */ diff --git a/src/main/scala/stdlib/Options.scala b/src/main/scala/stdlib/Options.scala index 223aa6fb..dfc175c3 100644 --- a/src/main/scala/stdlib/Options.scala +++ b/src/main/scala/stdlib/Options.scala @@ -7,12 +7,13 @@ package stdlib import OptionsHelper._ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name options * */ -object Options extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Options extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** If you have worked with Java at all in the past, it is very likely that you have come across a `NullPointerException` at some time (other languages will throw similarly named errors in such a case). Usually this happens because some method returns null when you were not expecting it and thus not dealing with that possibility in your client code. A value of `null` is often abused to represent an absent optional value. * diff --git a/src/main/scala/stdlib/ParentClasses.scala b/src/main/scala/stdlib/ParentClasses.scala index 1631bb2b..976cbf9e 100644 --- a/src/main/scala/stdlib/ParentClasses.scala +++ b/src/main/scala/stdlib/ParentClasses.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name parent_classes * */ -object ParentClasses extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object ParentClasses extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** In contrast to Java, all values in Scala are objects (including numerical values and functions). Since Scala is class-based, all values are instances of a class. * diff --git a/src/main/scala/stdlib/PartialFunctions.scala b/src/main/scala/stdlib/PartialFunctions.scala index 746c6514..491737ef 100644 --- a/src/main/scala/stdlib/PartialFunctions.scala +++ b/src/main/scala/stdlib/PartialFunctions.scala @@ -6,12 +6,16 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name partial_functions * */ -object PartialFunctions extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object PartialFunctions + extends AnyFlatSpec + with Matchers + with org.scalaexercises.definitions.Section { /** A partial function is a `trait` that when implemented can be used as building blocks to determine a solution. The trait `PartialFunction` requires that the method `isDefinedAt` and `apply` be implemented: */ diff --git a/src/main/scala/stdlib/PartiallyAppliedFunctions.scala b/src/main/scala/stdlib/PartiallyAppliedFunctions.scala index aef5975f..4a6af327 100644 --- a/src/main/scala/stdlib/PartiallyAppliedFunctions.scala +++ b/src/main/scala/stdlib/PartiallyAppliedFunctions.scala @@ -6,13 +6,14 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name partially_applied_functions * */ object PartiallyAppliedFunctions - extends FlatSpec + extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { diff --git a/src/main/scala/stdlib/PatternMatching.scala b/src/main/scala/stdlib/PatternMatching.scala index 19c9d976..63159527 100644 --- a/src/main/scala/stdlib/PatternMatching.scala +++ b/src/main/scala/stdlib/PatternMatching.scala @@ -6,12 +6,16 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name pattern_matching * */ -object PatternMatching extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object PatternMatching + extends AnyFlatSpec + with Matchers + with org.scalaexercises.definitions.Section { /** Scala has a built-in general pattern matching mechanism. It allows to match on any sort of data with a first-match policy. * Here is a small example which shows how to match against an integer value: diff --git a/src/main/scala/stdlib/Ranges.scala b/src/main/scala/stdlib/Ranges.scala index 77d5c23b..f1c67a20 100644 --- a/src/main/scala/stdlib/Ranges.scala +++ b/src/main/scala/stdlib/Ranges.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name ranges * */ -object Ranges extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Ranges extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** A Range is an ordered sequence of integers that are equally spaced apart. For example, "1, 2, 3" is a range, as is "5, 8, 11, 14". To create a range in Scala, use the predefined methods `to`, `until`, and `by`. `1 to 3` generates "1, 2, 3" and `5 to 14 by 3` generates "5, 8, 11, 14". * diff --git a/src/main/scala/stdlib/RepeatedParameters.scala b/src/main/scala/stdlib/RepeatedParameters.scala index 3cb882ba..1cb8d276 100644 --- a/src/main/scala/stdlib/RepeatedParameters.scala +++ b/src/main/scala/stdlib/RepeatedParameters.scala @@ -7,13 +7,14 @@ package stdlib import RepeatedParametersHelper._ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name repeated_parameters * */ object RepeatedParameters - extends FlatSpec + extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { diff --git a/src/main/scala/stdlib/SequencesandArrays.scala b/src/main/scala/stdlib/SequencesandArrays.scala index 9f7b3ce4..d55f7533 100644 --- a/src/main/scala/stdlib/SequencesandArrays.scala +++ b/src/main/scala/stdlib/SequencesandArrays.scala @@ -6,13 +6,14 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name sequences_and_arrays * */ object SequencesandArrays - extends FlatSpec + extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { diff --git a/src/main/scala/stdlib/Sets.scala b/src/main/scala/stdlib/Sets.scala index fbedad52..1eafbe31 100644 --- a/src/main/scala/stdlib/Sets.scala +++ b/src/main/scala/stdlib/Sets.scala @@ -6,12 +6,13 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name sets * */ -object Sets extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Sets extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** `Set`s are `Iterable`s that contain no duplicate elements. The operations on sets are summarized in the following table for general sets and in the table after that for mutable sets. They fall into the following categories: * diff --git a/src/main/scala/stdlib/Traits.scala b/src/main/scala/stdlib/Traits.scala index 8d287438..9c7471af 100644 --- a/src/main/scala/stdlib/Traits.scala +++ b/src/main/scala/stdlib/Traits.scala @@ -6,11 +6,12 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name traits */ -object Traits extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Traits extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** Similar to interfaces in Java, traits are used to define object types by specifying the signature of the supported methods. In traits methods can have default implementations. In contrast to classes, traits may not have constructor parameters. * diff --git a/src/main/scala/stdlib/Traversables.scala b/src/main/scala/stdlib/Traversables.scala index e671470e..8e228855 100644 --- a/src/main/scala/stdlib/Traversables.scala +++ b/src/main/scala/stdlib/Traversables.scala @@ -6,14 +6,15 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import scala.language.postfixOps import Stream.cons /** @param name traversables */ -object Traversables extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Traversables extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** At the top of the collection hierarchy is the trait `Traversable`. Its only abstract operation is `foreach`: * diff --git a/src/main/scala/stdlib/Tuples.scala b/src/main/scala/stdlib/Tuples.scala index 48de657c..2bb1bcf1 100644 --- a/src/main/scala/stdlib/Tuples.scala +++ b/src/main/scala/stdlib/Tuples.scala @@ -8,12 +8,13 @@ package stdlib import java.util.Date -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name tuples * */ -object Tuples extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object Tuples extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** Scala tuple combines a fixed number of items together so that they can be passed around as a whole. They are one-indexed. Unlike an array or list, a tuple can hold objects with different types but they are also immutable. Here is an example of a tuple holding an integer, a string, and the console: * diff --git a/src/main/scala/stdlib/TypeSignatures.scala b/src/main/scala/stdlib/TypeSignatures.scala index 77f629fc..da0b3e3f 100644 --- a/src/main/scala/stdlib/TypeSignatures.scala +++ b/src/main/scala/stdlib/TypeSignatures.scala @@ -6,11 +6,15 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name type_signatures */ -object TypeSignatures extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object TypeSignatures + extends AnyFlatSpec + with Matchers + with org.scalaexercises.definitions.Section { /** A method's type signature comprises its name; the number, order, and types of its parameters, if any; and its result type. The type signature of a class, trait, or singleton object comprises its name, the type signatures of all of its members and constructors, and its declared inheritance and mixin relations. * diff --git a/src/main/scala/stdlib/TypeVariance.scala b/src/main/scala/stdlib/TypeVariance.scala index e43e2153..58485cf7 100644 --- a/src/main/scala/stdlib/TypeVariance.scala +++ b/src/main/scala/stdlib/TypeVariance.scala @@ -7,11 +7,12 @@ package stdlib import TypeVarianceHelper._ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name type_variance */ -object TypeVariance extends FlatSpec with Matchers with org.scalaexercises.definitions.Section { +object TypeVariance extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section { /** A traditional objection to static typing is that it has much syntactic overhead. Scala alleviates this by providing type inference. * diff --git a/src/main/scala/stdlib/UniformAccessPrinciple.scala b/src/main/scala/stdlib/UniformAccessPrinciple.scala index 4e65d550..ccbaa3d6 100644 --- a/src/main/scala/stdlib/UniformAccessPrinciple.scala +++ b/src/main/scala/stdlib/UniformAccessPrinciple.scala @@ -6,13 +6,14 @@ package stdlib -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers /** @param name uniform_access_principle * */ object UniformAccessPrinciple - extends FlatSpec + extends AnyFlatSpec with Matchers with org.scalaexercises.definitions.Section {