Bump scalatest version to 3.2.7

jad-hamza · jad-hamza · commit be112cb56b98 · 2021-04-22T11:30:05.000+02:00
diff --git a/build.sbt b/build.sbt
@@ -37,7 +37,7 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.scalatest" %% "scalatest" % "3.0.1" % "test;it",
+  "org.scalatest" %% "scalatest" % "3.2.7" % "test;it",
   "org.apache.commons" % "commons-lang3" % "3.4",
   "org.scala-lang" % "scala-reflect" % scalaVersion.value,
   "uuverifiers" %% "princess" % "2018-02-26"
diff --git a/src/it/scala/inox/ResourceUtils.scala b/src/it/scala/inox/ResourceUtils.scala
@@ -2,7 +2,7 @@
 
 package inox
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.concurrent._
 
 import java.io.File
diff --git a/src/it/scala/inox/TestSuite.scala b/src/it/scala/inox/TestSuite.scala
@@ -2,12 +2,15 @@
 
 package inox
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.concurrent._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.Tag
+import org.scalatest.exceptions
 
 import utils._
 
-trait TestSuite extends FunSuite with Matchers with TimeLimits {
+trait TestSuite extends AnyFunSuite with Matchers with TimeLimits {
 
   protected def configurations: Seq[Seq[OptionValue[_]]] = Seq(Seq.empty)
 
diff --git a/src/it/scala/inox/tip/TipPrintingSuite.scala b/src/it/scala/inox/tip/TipPrintingSuite.scala
@@ -3,9 +3,9 @@
 package inox
 package tip
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class TipPrintingSuite extends FunSuite with ResourceUtils {
+class TipPrintingSuite extends AnyFunSuite with ResourceUtils {
   import inox.trees._
 
   val ctx = TestContext.empty
diff --git a/src/it/scala/inox/tip/TipSerializationSuite.scala b/src/it/scala/inox/tip/TipSerializationSuite.scala
@@ -3,9 +3,9 @@
 package inox
 package tip
 
-import org.scalatest._
+import org.scalatest.funspec.AnyFunSpec
 
-class TipSerializationSuite extends FunSpec with ResourceUtils {
+class TipSerializationSuite extends AnyFunSpec with ResourceUtils {
   import inox.trees._
 
   val ctx = TestContext.empty
diff --git a/src/test/scala/inox/ast/ExprOpsSuite.scala b/src/test/scala/inox/ast/ExprOpsSuite.scala
@@ -3,9 +3,9 @@
 package inox
 package ast
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class ExprOpsSuite extends FunSuite {
+class ExprOpsSuite extends AnyFunSuite {
   import inox.trees._
   import inox.trees.exprOps._
 
diff --git a/src/test/scala/inox/ast/ExtractorsSuite.scala b/src/test/scala/inox/ast/ExtractorsSuite.scala
@@ -3,9 +3,9 @@
 package inox
 package ast
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class ExtractorsSuite extends FunSuite {
+class ExtractorsSuite extends AnyFunSuite {
   import inox.trees._
 
   test("Extractors do not simplify basic arithmetic") {
diff --git a/src/test/scala/inox/ast/TreeTestsSuite.scala b/src/test/scala/inox/ast/TreeTestsSuite.scala
@@ -3,11 +3,11 @@
 package inox
 package ast
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
 import inox.trees._
 
-class TreeTestsSuite extends FunSuite {
+class TreeTestsSuite extends AnyFunSuite {
 
   test("And- and Or- simplifications") {
     val x = Variable.fresh("x", BooleanType())
diff --git a/src/test/scala/inox/evaluators/EvaluatorSuite.scala b/src/test/scala/inox/evaluators/EvaluatorSuite.scala
@@ -3,9 +3,9 @@
 package inox
 package evaluators
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class EvaluatorSuite extends FunSuite {
+class EvaluatorSuite extends AnyFunSuite {
   import inox.trees._
 
   val ctx = TestContext.empty
diff --git a/src/test/scala/inox/parsing/ArithmeticParserSuite.scala b/src/test/scala/inox/parsing/ArithmeticParserSuite.scala
@@ -1,9 +1,9 @@
 package inox
 package parsing
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class ArithmeticParserSuite extends FunSuite {
+class ArithmeticParserSuite extends AnyFunSuite {
 
   import inox.trees._
   import interpolator._
diff --git a/src/test/scala/inox/parsing/BooleanOperationsParserSuite.scala b/src/test/scala/inox/parsing/BooleanOperationsParserSuite.scala
@@ -1,9 +1,9 @@
 package inox
 package parsing
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class BooleanOperationsParserSuite extends FunSuite {
+class BooleanOperationsParserSuite extends AnyFunSuite {
 
   import inox.trees._
   import interpolator._
diff --git a/src/test/scala/inox/parsing/ComparisonOperationsParserSuite.scala b/src/test/scala/inox/parsing/ComparisonOperationsParserSuite.scala
@@ -1,9 +1,9 @@
 package inox
 package parsing
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class ComparisonOperationsParserSuite extends FunSuite {
+class ComparisonOperationsParserSuite extends AnyFunSuite {
 
   import inox.trees._
   import interpolator._
diff --git a/src/test/scala/inox/parsing/ExprLiteralParserSuite.scala b/src/test/scala/inox/parsing/ExprLiteralParserSuite.scala
@@ -2,9 +2,9 @@ package inox
 package parsing
 
 import scala.collection.BitSet
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class ExprLiteralParserSuite extends FunSuite {
+class ExprLiteralParserSuite extends AnyFunSuite {
 
   import inox.trees._
   import interpolator._
diff --git a/src/test/scala/inox/parsing/ExtractorSuite.scala b/src/test/scala/inox/parsing/ExtractorSuite.scala
@@ -1,9 +1,9 @@
 package inox
 package parsing
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class ExtractorSuite extends FunSuite {
+class ExtractorSuite extends AnyFunSuite {
 
   import inox.trees._
   import interpolator._
diff --git a/src/test/scala/inox/parsing/OperationsPrecedenceParserSuite.scala b/src/test/scala/inox/parsing/OperationsPrecedenceParserSuite.scala
@@ -1,9 +1,9 @@
 package inox
 package parsing
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class OperationsPrecedenceParserSuite extends FunSuite {
+class OperationsPrecedenceParserSuite extends AnyFunSuite {
 
   import inox.trees._
   import interpolator._
diff --git a/src/test/scala/inox/parsing/QuantifierParserSuite.scala b/src/test/scala/inox/parsing/QuantifierParserSuite.scala
@@ -1,9 +1,9 @@
 package inox
 package parsing
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class QuantifierParserSuite extends FunSuite {
+class QuantifierParserSuite extends AnyFunSuite {
 
   import inox.trees._
   import interpolator._
diff --git a/src/test/scala/inox/parsing/TypeParserSuite.scala b/src/test/scala/inox/parsing/TypeParserSuite.scala
@@ -1,9 +1,9 @@
 package inox
 package parsing
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class TypeParserSuite extends FunSuite {
+class TypeParserSuite extends AnyFunSuite {
 
   import inox.trees._
   import interpolator._
diff --git a/src/test/scala/inox/solvers/SemanticsSuite.scala b/src/test/scala/inox/solvers/SemanticsSuite.scala
@@ -3,9 +3,10 @@
 package inox
 package solvers
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatest.Tag
 
-class SemanticsSuite extends FunSuite {
+class SemanticsSuite extends AnyFunSuite {
   import inox.trees._
   import inox.trees.dsl._
   import SolverResponses._
diff --git a/src/test/scala/inox/solvers/SolverPoolSuite.scala b/src/test/scala/inox/solvers/SolverPoolSuite.scala
@@ -3,11 +3,11 @@
 package inox
 package solvers
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
 import inox.solvers.combinators._
 
-class SolverPoolSuite extends FunSuite {
+class SolverPoolSuite extends AnyFunSuite {
   import inox.trees._
   import SolverResponses._
 
diff --git a/src/test/scala/inox/solvers/SolversSuite.scala b/src/test/scala/inox/solvers/SolversSuite.scala
@@ -3,9 +3,9 @@
 package inox
 package solvers
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class SolversSuite extends FunSuite {
+class SolversSuite extends AnyFunSuite {
   import inox.trees._
   import SolverResponses._
 
diff --git a/src/test/scala/inox/solvers/TimeoutSolverSuite.scala b/src/test/scala/inox/solvers/TimeoutSolverSuite.scala
@@ -3,9 +3,9 @@
 package inox
 package solvers
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class TimeoutSolverSuite extends FunSuite {
+class TimeoutSolverSuite extends AnyFunSuite {
   import inox.trees._
   import dsl._
 
diff --git a/src/test/scala/inox/utils/BijectionSuite.scala b/src/test/scala/inox/utils/BijectionSuite.scala
@@ -2,9 +2,9 @@
 
 package inox.utils
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class BijectionSuite extends FunSuite {
+class BijectionSuite extends AnyFunSuite {
 
   test("Empty Bijection returns None") {
     val b = new Bijection[Int, Int]
diff --git a/src/test/scala/inox/utils/GraphsSuite.scala b/src/test/scala/inox/utils/GraphsSuite.scala
@@ -2,11 +2,11 @@
 
 package inox.utils
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
 import Graphs._
 
-class GraphsSuite extends FunSuite {
+class GraphsSuite extends AnyFunSuite {
   abstract class Node
   case object A extends Node
   case object B extends Node
diff --git a/src/test/scala/inox/utils/IncrementalBijectionSuite.scala b/src/test/scala/inox/utils/IncrementalBijectionSuite.scala
@@ -2,9 +2,9 @@
 
 package inox.utils
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class IncrementalBijectionSuite extends FunSuite {
+class IncrementalBijectionSuite extends AnyFunSuite {
 
   test("Empty IncrementalBijection returns None") {
     val b = new IncrementalBijection[Int, Int]
diff --git a/src/test/scala/inox/utils/StreamsSuite.scala b/src/test/scala/inox/utils/StreamsSuite.scala
@@ -2,11 +2,11 @@
 
 package inox.utils
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
 import StreamUtils._
 
-class StreamsSuite extends FunSuite {
+class StreamsSuite extends AnyFunSuite {
 
   test("Cartesian Product 1") {
     val s1 = 1 #::
diff --git a/src/test/scala/inox/utils/UtilsSuite.scala b/src/test/scala/inox/utils/UtilsSuite.scala
@@ -2,9 +2,9 @@
 
 package inox.utils
 
-import org.scalatest._
+import org.scalatest.funsuite.AnyFunSuite
 
-class UtilsSuite extends FunSuite {
+class UtilsSuite extends AnyFunSuite {
 
   test("fixpoint computes correct fixpoint of function that increments up to a max") {
     def f(x: Int): Int = if(x < 10) x + 1 else 10

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ resolvers ++= Seq(`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`libraryDependencies ++= Seq(`
`40`		`- "org.scalatest" %% "scalatest" % "3.0.1" % "test;it",`
	`40`	`+ "org.scalatest" %% "scalatest" % "3.2.7" % "test;it",`
`41`	`41`	`"org.apache.commons" % "commons-lang3" % "3.4",`
`42`	`42`	`"org.scala-lang" % "scala-reflect" % scalaVersion.value,`
`43`	`43`	`"uuverifiers" %% "princess" % "2018-02-26"`