OY-4964 Fix PermissionResourceSpec. As a sidenote, these tests are a bit weird and confusing. Initialization order matters, but why are we even initializing multiple paths?

Author: msiukola

suoritusrekisteri/src/test/scala/fi/vm/sade/hakurekisteri/rest/PermissionResourceSpec.scala

@@ -19,24 +19,22 @@ import fi.vm.sade.hakurekisteri.web.permission.{PermissionCheckResponse, Permiss
 import fi.vm.sade.hakurekisteri.web.rest.support.HakurekisteriSwagger
 import org.joda.time.{DateTime, LocalDate}
 import org.json4s.jackson.Serialization._
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import org.scalatestplus.mockito.MockitoSugar
 import org.scalatra.swagger.Swagger
-import org.scalatra.test.ScalatraTests
+import org.scalatra.test.scalatest.ScalatraFunSuite
 
 import scala.concurrent.duration._
 import scala.concurrent.{Await, ExecutionContext, Future}
 
 class PermissionResourceSpec
-    extends AnyFunSuite
+    extends ScalatraFunSuite
     with MockitoSugar
-    with BeforeAndAfterAll
     with Matchers
-    with ScalatraTests {
+    {
 
   implicit val system = ActorSystem("permission-test-system")
+
   implicit val format = HakurekisteriJsonSupport.format
   implicit val ec: ExecutionContext = system.dispatcher
   implicit val swagger: Swagger = new HakurekisteriSwagger
@@ -93,6 +91,16 @@ class PermissionResourceSpec
     })))
   }
 
+  addServlet(
+    new PermissionResource(
+      suoritusActor,
+      opiskelijaActor,
+      hakemusBasedPermissionCheckerActor = noPermissionForOrgsMockPermissionChecker,
+      Some(1.seconds)
+    ),
+    "/noPermission/"
+  )
+
   addServlet(
     new PermissionResource(
       suoritusActor,
@@ -202,15 +210,6 @@ class PermissionResourceSpec
   }
 
   test("should return true if matching suoritus found, despite no hakemus based permission") {
-    addServlet(
-      new PermissionResource(
-        suoritusActor,
-        opiskelijaActor,
-        hakemusBasedPermissionCheckerActor = noPermissionForOrgsMockPermissionChecker,
-        Some(1.seconds)
-      ),
-      "/noPermission/"
-    )
     val json =
       """{
         |  "personOidsForSamePerson": ["1.2.246.562.24.1"],