Revert "Scalatest 3.2.2"

This reverts commit 88e49fd.

Author: kpbochenek

project/Dependencies.scala

@@ -5,7 +5,7 @@ object Version {
   val mockito   = "1.5.18"
   val scala     = "2.13.3"
   val crossScala = List(scala, "2.11.12", "2.12.12")
-  val scalaTest = "3.2.1"
+  val scalaTest = "3.0.8"
   val slf4j     = "1.7.30"
 }
 

src/test/scala/com/typesafe/scalalogging/LoggerSpec.scala

@@ -21,16 +21,16 @@ import java.io._
 import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
 import org.slf4j.{ Logger => Underlying }
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
+import org.scalatest.{ Matchers, WordSpec }
+import org.scalatestplus.mockito.MockitoSugar
 
 trait Varargs {
   // TODO: we used to wrap in List(...): _*, which I assume was to force the varags method to be chosen.
   // I encapsulated that here in something that works across 2.12/2.13.
   def forceVarargs[T](xs: T*): scala.Seq[T] = scala.Seq(xs: _*)
 }
 
-class LoggerSpec extends AnyWordSpec with Matchers with Varargs {
+class LoggerSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
 
   // Error
 
@@ -603,7 +603,7 @@ class LoggerSpec extends AnyWordSpec with Matchers with Varargs {
       val arg5ref = arg5.asInstanceOf[AnyRef]
       val arg6 = 6L
       val arg6ref = arg6.asInstanceOf[AnyRef]
-      val underlying = mock(classOf[org.slf4j.Logger])
+      val underlying = mock[org.slf4j.Logger]
       when(p(underlying)).thenReturn(isEnabled)
       val logger = Logger(underlying)
     }

src/test/scala/com/typesafe/scalalogging/LoggerTakingImplicitSpec.scala

@@ -2,11 +2,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 AnyWordSpec with Matchers with Varargs {
+class LoggerTakingImplicitSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
 
   case class CorrelationId(value: String)
 
@@ -378,14 +378,14 @@ class LoggerTakingImplicitSpec extends AnyWordSpec with Matchers with Varargs {
   def fixture(p: Underlying => Boolean, isEnabled: Boolean) =
     new {
       implicit val correlationId = CorrelationId("corrId")
-      implicit val canLogCorrelationId = mock(classOf[CanLog[CorrelationId]])
+      implicit val canLogCorrelationId = mock[CanLog[CorrelationId]]
       val msg = "msg"
       val cause = new RuntimeException("cause")
       val arg1 = "arg1"
       val arg2 = Integer.valueOf(1)
       val arg3 = "arg3"
       val logMsg = "corrId - msg"
-      val underlying = mock(classOf[org.slf4j.Logger])
+      val underlying = mock[org.slf4j.Logger]
       when(p(underlying)).thenReturn(isEnabled)
       when(canLogCorrelationId.logMessage(anyString(), any[CorrelationId])).thenReturn(logMsg)
       val logger = Logger.takingImplicit[CorrelationId](underlying)

src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala

@@ -21,8 +21,8 @@ import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
 import org.slf4j.{ Logger => Underlying }
 import org.slf4j.Marker
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
+import org.scalatest.{ Matchers, WordSpec }
+import org.scalatestplus.mockito.MockitoSugar
 
 object DummyMarker extends Marker {
   def add(childMarker: Marker): Unit = {}
@@ -39,7 +39,7 @@ object DummyMarker extends Marker {
   def remove(child: Marker): Boolean = false
 }
 
-class LoggerWithMarkerSpec extends AnyWordSpec with Matchers with Varargs {
+class LoggerWithMarkerSpec extends WordSpec with Matchers with MockitoSugar with Varargs {
 
   // Error
 
@@ -389,7 +389,7 @@ class LoggerWithMarkerSpec extends AnyWordSpec with Matchers with Varargs {
       val arg1 = "arg1"
       val arg2 = Integer.valueOf(1)
       val arg3 = "arg3"
-      val underlying = mock(classOf[org.slf4j.Logger])
+      val underlying = mock[org.slf4j.Logger]
       when(p(underlying)(marker)).thenReturn(isEnabled)
       val logger = Logger(underlying)
     }

src/test/scala/com/typesafe/scalalogging/LoggerWithTaggedArgsSpec.scala

@@ -1,9 +1,10 @@
 package com.typesafe.scalalogging
 
+import org.scalatest.{ Matchers, WordSpec }
+
 import org.slf4j.{ Logger => Underlying }
+import org.scalatestplus.mockito.MockitoSugar
 import org.mockito.Mockito._
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpec
 
 object tag {
 
@@ -17,7 +18,7 @@ object tag {
   }
 }
 
-class LoggerWithTaggedAargsSpec extends AnyWordSpec with Matchers with Varargs {
+class LoggerWithTaggedAargsSpec extends WordSpec with MockitoSugar with Matchers with Varargs {
 
   trait Tag
 
@@ -101,7 +102,7 @@ class LoggerWithTaggedAargsSpec extends AnyWordSpec with Matchers with Varargs {
     new {
       val arg1 = tag[Tag][String]("arg1")
       val arg2 = tag[Tag][Integer](Integer.valueOf(1))
-      val underlying = mock(classOf[org.slf4j.Logger])
+      val underlying = mock[org.slf4j.Logger]
       when(p(underlying)).thenReturn(isEnabled)
       val logger = Logger(underlying)
     }