wip - migrate to play 3.0 - fix tests

MAIF · Nov 9, 2023 · dd8c434 · dd8c434
1 parent 41c1267
commit dd8c434
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/daikoku/test/daikoku/ApiControllerSpec.scala b/daikoku/test/daikoku/ApiControllerSpec.scala
@@ -3510,7 +3510,7 @@ class ApiControllerSpec()
       adminPlan.otoroshiTarget.get.otoroshiSettings mustBe OtoroshiSettingsId(
         "wiremock"
       )
-      adminPlan.otoroshiTarget.get.authorizedEntities.value.groups should contain(
+      adminPlan.otoroshiTarget.get.authorizedEntities.value.groups must contain(
         OtoroshiServiceGroupId("daikoku-admin-api-group-id")
       )
     }
@@ -4487,7 +4487,7 @@ class ApiControllerSpec()
         .findById((resp.json \ "subscription" \ "_id").as[String])
         .map {
           case Some(sub) => sub.apiKey.clientId mustBe parentApiKeyClientId
-          case None      => fail
+          case None      => fail()
         }
     }
     "be transformed in unique api key when the subscription hasn't parent" in {

diff --git a/daikoku/test/daikoku/TenantControllerSpec.scala b/daikoku/test/daikoku/TenantControllerSpec.scala
@@ -4,6 +4,7 @@ import fr.maif.otoroshi.daikoku.domain.json.SeqCmsHistoryFormat
 import fr.maif.otoroshi.daikoku.domain._
 import fr.maif.otoroshi.daikoku.login.AuthProvider
 import fr.maif.otoroshi.daikoku.tests.utils.{DaikokuSpecHelper, OneServerPerSuiteWithMyComponents}
+import fr.maif.otoroshi.daikoku.utils.IdGenerator
 import org.scalatest.concurrent.IntegrationPatience
 import org.scalatestplus.play.PlaySpec
 import play.api.libs.json._

diff --git a/daikoku/test/daikoku/suites.scala b/daikoku/test/daikoku/suites.scala
@@ -11,6 +11,8 @@ import fr.maif.otoroshi.daikoku.domain._
 import fr.maif.otoroshi.daikoku.login.AuthProvider
 import fr.maif.otoroshi.daikoku.modules.DaikokuComponentsInstances
 import fr.maif.otoroshi.daikoku.utils.IdGenerator
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.stream.Materializer
 import org.joda.time.DateTime
 import org.jsoup.nodes.Document
 import org.mindrot.jbcrypt.BCrypt
@@ -26,7 +28,7 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, StandardCopyOption}
 import java.util.concurrent.TimeUnit
 import scala.concurrent.duration._
-import scala.concurrent.{Await, Future, Promise}
+import scala.concurrent.{Await, ExecutionContext, Future, Promise}
 import scala.sys.process.ProcessLogger
 import scala.util.{Failure, Success, Try}
 
@@ -36,7 +38,7 @@ class DaikokuSuites extends Suite with BeforeAndAfterAll { thisSuite =>
 
   override protected def afterAll(): Unit = {}
 
-  override def toString: String = thisSuite.toString
+//  override def toString: String = thisSuite.toString
 }
 
 case class ApiWithPlans(api: Api, plans: Seq[UsagePlan])
@@ -63,14 +65,14 @@ object utils {
 
   trait DaikokuSpecHelper { suite: OneServerPerSuiteWithMyComponents =>
 
-    implicit val ec = daikokuComponents.env.defaultExecutionContext
-    implicit val as = daikokuComponents.env.defaultActorSystem
-    implicit val mat = daikokuComponents.env.defaultMaterializer
+    implicit val ec: ExecutionContext = daikokuComponents.env.defaultExecutionContext
+    implicit val as: ActorSystem = daikokuComponents.env.defaultActorSystem
+    implicit val mat: Materializer = daikokuComponents.env.defaultMaterializer
 
-    val logger = Logger.apply("daikoku-spec-helper")
+    val logger: Logger = Logger.apply("daikoku-spec-helper")
 
     def await(duration: FiniteDuration): Unit = {
-      val p = Promise[Unit]
+      val p = Promise[Unit]()
       daikokuComponents.env.defaultActorSystem.scheduler
         .scheduleOnce(duration) {
           p.trySuccess(())
@@ -79,7 +81,7 @@ object utils {
     }
 
     def awaitF(duration: FiniteDuration): Future[Unit] = {
-      val p = Promise[Unit]
+      val p = Promise[Unit]()
       daikokuComponents.actorSystem.scheduler.scheduleOnce(duration) {
         p.trySuccess(())
       }
@@ -598,7 +600,7 @@ object utils {
         "/Applications/Google Chrome Dev.app/Contents/MacOS/Google Chrome",
         "/Applications/Google Chrome Beta.app/Contents/MacOS/Google Chrome"
       )
-      val promise = Promise[String]
+      val promise = Promise[String]()
       execs.find { exec =>
         var stdout = Seq.empty[String]
         val log = ProcessLogger { str =>