diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b9f880e..67b22ca 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ object Version { val mockito = "1.5.17" val scala = "2.12.11" val crossScala = List(scala, "2.11.12", "2.13.1") - val scalaTest = "3.0.8" + val scalaTest = "3.2.1" val slf4j = "1.7.30" } diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala index f97d6c6..f864f62 100644 --- a/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala +++ b/src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala @@ -21,8 +21,9 @@ import java.io._ import org.mockito.ArgumentMatchers._ import org.mockito.Mockito._ import org.slf4j.{ Logger => Underlying } -import org.scalatest.{ Matchers, WordSpec } import org.scalatestplus.mockito.MockitoSugar +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec trait Varargs { // TODO: we used to wrap in List(...): _*, which I assume was to force the varags method to be chosen. @@ -30,7 +31,7 @@ trait Varargs { def forceVarargs[T](xs: T*): scala.Seq[T] = scala.Seq(xs: _*) } -class LoggerSpec extends WordSpec with Matchers with MockitoSugar with Varargs { +class LoggerSpec extends AnyWordSpec with Matchers with MockitoSugar with Varargs { // Error diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala index fe5fca8..7b3e8a8 100644 --- a/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala +++ b/src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala @@ -3,10 +3,11 @@ package com.typesafe.scalalogging import org.mockito.ArgumentMatchers._ import org.mockito.Mockito._ import org.scalatestplus.mockito.MockitoSugar -import org.scalatest.{ Matchers, WordSpec } import org.slf4j.{ Logger => Underlying } +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec -class LoggerTakingImplicitSpec extends WordSpec with Matchers with MockitoSugar with Varargs { +class LoggerTakingImplicitSpec extends AnyWordSpec with Matchers with MockitoSugar with Varargs { case class CorrelationId(value: String) diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala index 21c20c2..5090324 100644 --- a/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala +++ b/src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala @@ -21,8 +21,9 @@ import org.mockito.ArgumentMatchers._ import org.mockito.Mockito._ import org.slf4j.{ Logger => Underlying } import org.slf4j.Marker -import org.scalatest.{ Matchers, WordSpec } import org.scalatestplus.mockito.MockitoSugar +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec object DummyMarker extends Marker { def add(childMarker: Marker): Unit = {} @@ -39,7 +40,7 @@ object DummyMarker extends Marker { def remove(child: Marker): Boolean = false } -class LoggerWithMarkerSpec extends WordSpec with Matchers with MockitoSugar with Varargs { +class LoggerWithMarkerSpec extends AnyWordSpec with Matchers with MockitoSugar with Varargs { // Error diff --git a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala index e6f6d0f..873312b 100644 --- a/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala +++ b/src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala @@ -1,12 +1,13 @@ package com.typesafe.scalalogging -import org.scalatest.{ Matchers, WordSpec } import java.lang.ClassCastException import org.slf4j.{ Logger => Underlying } import org.scalatestplus.mockito.MockitoSugar import org.mockito.ArgumentMatchers._ import org.mockito.Mockito._ +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec object tag { @@ -20,7 +21,7 @@ object tag { } } -class LoggerWithTaggedAargsSpec extends WordSpec with MockitoSugar with Matchers with Varargs { +class LoggerWithTaggedAargsSpec extends AnyWordSpec with MockitoSugar with Matchers with Varargs { trait Tag