Update scalatest to 3.1.1 (#64)

Co-authored-by: Ondra Pelech <[email protected]>
avast · Apr 14, 2020 · 732be3c · 732be3c
1 parent 6b67935
commit 732be3c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/akka-http/src/test/scala/com/avast/grpc/jsonbridge/akkahttp/AkkaHttpTest.scala b/akka-http/src/test/scala/com/avast/grpc/jsonbridge/akkahttp/AkkaHttpTest.scala
@@ -8,12 +8,12 @@ import cats.data.NonEmptyList
 import cats.effect.IO
 import com.avast.grpc.jsonbridge._
 import io.grpc.ServerServiceDefinition
-import org.scalatest.FunSuite
 
 import scala.concurrent.ExecutionContext
 import scala.util.Random
+import org.scalatest.funsuite.AnyFunSuite
 
-class AkkaHttpTest extends FunSuite with ScalatestRouteTest {
+class AkkaHttpTest extends AnyFunSuite with ScalatestRouteTest {
 
   val ec: ExecutionContext = implicitly[ExecutionContext]
   def bridge(ssd: ServerServiceDefinition): GrpcJsonBridge[IO] =

diff --git a/build.sbt b/build.sbt
@@ -61,7 +61,7 @@ lazy val commonSettings = Seq(
     "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.4",
     "javax.annotation" % "javax.annotation-api" % "1.3.2",
     "junit" % "junit" % "4.13" % "test",
-    "org.scalatest" %% "scalatest" % "3.0.8" % "test",
+    "org.scalatest" %% "scalatest" % "3.1.1" % "test",
     "com.novocode" % "junit-interface" % "0.11" % "test", // Required by sbt to execute JUnit tests
     "ch.qos.logback" % "logback-classic" % "1.2.3" % "test"
   ),
@@ -135,7 +135,7 @@ lazy val coreScalaPB = (project in file("core-scalapb")).settings(
     "com.thesamet.scalapb" %% "scalapb-runtime-grpc" % scalapb.compiler.Version.scalapbVersion,
     "com.thesamet.scalapb" %% "scalapb-json4s" % "0.10.1",
     "junit" % "junit" % "4.13" % "test",
-    "org.scalatest" %% "scalatest" % "3.0.8" % "test",
+    "org.scalatest" %% "scalatest" % "3.1.1" % "test",
     "com.novocode" % "junit-interface" % "0.11" % "test", // Required by sbt to execute JUnit tests
     "ch.qos.logback" % "logback-classic" % "1.2.3" % "test",
     "io.grpc" % "grpc-services" % Versions.grpcVersion % "test",

diff --git a/...est/scala/com/avast/grpc/jsonbridge/scalapbtest/ScalaPBReflectionGrpcJsonBridgeTest.scala b/...est/scala/com/avast/grpc/jsonbridge/scalapbtest/ScalaPBReflectionGrpcJsonBridgeTest.scala
@@ -8,11 +8,13 @@ import com.avast.grpc.jsonbridge.{BridgeError, GrpcJsonBridge}
 import io.grpc.inprocess.InProcessServerBuilder
 import io.grpc.protobuf.services.ProtoReflectionService
 import io.grpc.services.HealthStatusManager
-import org.scalatest.{fixture, Matchers, Outcome}
+import org.scalatest.{fixture, Outcome}
 
 import scala.concurrent.ExecutionContext.Implicits.global
+import org.scalatest.flatspec
+import org.scalatest.matchers.should.Matchers
 
-class ScalaPBReflectionGrpcJsonBridgeTest extends fixture.FlatSpec with Matchers {
+class ScalaPBReflectionGrpcJsonBridgeTest extends flatspec.FixtureAnyFlatSpec with Matchers {
 
   case class FixtureParam(bridge: GrpcJsonBridge[IO])
 

diff --git a/...st/scala/com/avast/grpc/jsonbridge/scalapbtest/ScalaPBReflectionGrpcJsonBridgeTest2.scala b/...st/scala/com/avast/grpc/jsonbridge/scalapbtest/ScalaPBReflectionGrpcJsonBridgeTest2.scala
@@ -8,11 +8,13 @@ import com.avast.grpc.jsonbridge.{BridgeError, GrpcJsonBridge}
 import io.grpc.inprocess.InProcessServerBuilder
 import io.grpc.protobuf.services.ProtoReflectionService
 import io.grpc.services.HealthStatusManager
-import org.scalatest.{fixture, Matchers, Outcome}
+import org.scalatest.{fixture, Outcome}
 
 import scala.concurrent.ExecutionContext.Implicits.global
+import org.scalatest.flatspec
+import org.scalatest.matchers.should.Matchers
 
-class ScalaPBReflectionGrpcJsonBridgeTest2 extends fixture.FlatSpec with Matchers {
+class ScalaPBReflectionGrpcJsonBridgeTest2 extends flatspec.FixtureAnyFlatSpec with Matchers {
 
   case class FixtureParam(bridge: GrpcJsonBridge[IO])
 

diff --git a/core/src/test/scala/com/avast/grpc/jsonbridge/ReflectionGrpcJsonBridgeTest.scala b/core/src/test/scala/com/avast/grpc/jsonbridge/ReflectionGrpcJsonBridgeTest.scala
@@ -5,11 +5,13 @@ import com.avast.grpc.jsonbridge.GrpcJsonBridge.GrpcMethodName
 import io.grpc.inprocess.InProcessServerBuilder
 import io.grpc.protobuf.services.ProtoReflectionService
 import io.grpc.services.HealthStatusManager
-import org.scalatest.{fixture, Matchers, Outcome}
+import org.scalatest.{fixture, Outcome}
 
 import scala.concurrent.ExecutionContext.Implicits.global
+import org.scalatest.flatspec
+import org.scalatest.matchers.should.Matchers
 
-class ReflectionGrpcJsonBridgeTest extends fixture.FlatSpec with Matchers {
+class ReflectionGrpcJsonBridgeTest extends flatspec.FixtureAnyFlatSpec with Matchers {
 
   case class FixtureParam(bridge: GrpcJsonBridge[IO])
 

diff --git a/core/src/test/scala/com/avast/grpc/jsonbridge/ReflectionGrpcJsonBridgeTest2.scala b/core/src/test/scala/com/avast/grpc/jsonbridge/ReflectionGrpcJsonBridgeTest2.scala
@@ -8,8 +8,10 @@ import io.grpc.services.HealthStatusManager
 import org.scalatest._
 
 import scala.concurrent.ExecutionContext.Implicits.global
+import org.scalatest.flatspec
+import org.scalatest.matchers.should.Matchers
 
-class ReflectionGrpcJsonBridgeTest2 extends fixture.FlatSpec with Matchers {
+class ReflectionGrpcJsonBridgeTest2 extends flatspec.FixtureAnyFlatSpec with Matchers {
 
   case class FixtureParam(bridge: GrpcJsonBridge[IO])
 

diff --git a/http4s/src/test/scala/com/avast/grpc/jsonbridge/http4s/Http4sTest.scala b/http4s/src/test/scala/com/avast/grpc/jsonbridge/http4s/Http4sTest.scala
@@ -6,14 +6,14 @@ import com.avast.grpc.jsonbridge._
 import io.grpc.ServerServiceDefinition
 import org.http4s.headers.{`Content-Length`, `Content-Type`}
 import org.http4s.{Charset, Header, Headers, MediaType, Method, Request, Uri}
-import org.scalatest.FunSuite
 import org.scalatest.concurrent.ScalaFutures
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.Random
+import org.scalatest.funsuite.AnyFunSuite
 
-class Http4sTest extends FunSuite with ScalaFutures {
+class Http4sTest extends AnyFunSuite with ScalaFutures {
 
   val ec: ExecutionContext = implicitly[ExecutionContext]
   def bridge(ssd: ServerServiceDefinition): GrpcJsonBridge[IO] =