The lib mockito-scala-scalatest replaced with scalatestplus mockito. Scala 3 (re)added to CI

Author: peterbanda

.github/workflows/continuous-integration.yml

@@ -32,8 +32,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # cannot test or even compile tests on Scala 3.2.2 (mockito-scala-scalatest is not available)
-        scala: [ '2.12.18', '2.13.11']
+        scala: [ '2.12.18', '2.13.11', '3.2.2']
 
     steps:
       - uses: actions/checkout@v3
@@ -71,8 +70,7 @@ jobs:
       matrix:
         distribution: [ 'corretto' ]
         jdk: [ '11' ]
-        # cannot test or even compile tests on Scala 3.2.2 (mockito-scala-scalatest is not available)
-        scala: [ '2.12.18', '2.13.11']
+        scala: [ '2.12.18', '2.13.11', '3.2.2']
         experimental: [ false ]
         include:
           - jdk: '17'

build.sbt

@@ -13,6 +13,7 @@ ThisBuild / isSnapshot := false
 lazy val commonSettings = Seq(
   libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.16",
   libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.16" % Test,
+  libraryDependencies += "org.scalatestplus" %% "mockito-4-11" % "3.2.16.0" % Test,
   libraryDependencies ++= extraTestDependencies(scalaVersion.value),
   crossScalaVersions := List(scala212, scala213, scala3)
 )
@@ -21,13 +22,16 @@ def extraTestDependencies(scalaVersion: String) =
   CrossVersion.partialVersion(scalaVersion) match {
     case Some((2, 12)) =>
       Seq(
-        "org.mockito" %% "mockito-scala-scalatest" % "1.17.14" % Test,
         "com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.1" % Test
       )
 
     case Some((2, 13)) =>
       Seq(
-        "org.mockito" %% "mockito-scala-scalatest" % "1.17.14" % Test,
+        "com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.20" % Test
+      )
+
+    case Some((3, _)) =>
+      Seq(
         "com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.20" % Test
       )
 

openai-client/src/test/scala/io/cequence/openaiscala/RetryHelpersSpec.scala

@@ -3,7 +3,8 @@ package io.cequence.openaiscala
 import akka.actor.{ActorSystem, Scheduler}
 import akka.testkit.TestKit
 import io.cequence.openaiscala.RetryHelpers.{RetrySettings, delay, retry}
-import org.mockito.scalatest.MockitoSugar
+import org.mockito.Mockito._
+import org.scalatestplus.mockito.MockitoSugar
 import org.scalatest.RecoverMethods._
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers