make tests independent

Author: halotukozak

rest/.jvm/src/test/scala/io/udash/rest/SttpRestCallTest.scala

@@ -5,7 +5,7 @@ import io.udash.rest.raw.HttpErrorException
 import io.udash.rest.raw.RawRest.HandleRequest
 import sttp.client3.SttpBackend
 
-import scala.concurrent.duration._
+import scala.concurrent.duration.*
 import scala.concurrent.{Await, Future}
 
 trait SttpClientRestTest extends ServletBasedRestApiTest {

rest/src/test/scala/io/udash/rest/RestApiTest.scala

@@ -15,15 +15,16 @@ import org.scalatest.funsuite.AnyFunSuite
 import scala.concurrent.duration.FiniteDuration
 
 abstract class RestApiTest extends AnyFunSuite with ScalaFutures {
-
   protected final val MaxConnections: Int = 1 // to timeout quickly
   protected final val Connections: Int = 10 // > MaxConnections
   protected final val CallTimeout: FiniteDuration = 300.millis // << idle timeout
 
   implicit def scheduler: Scheduler = Scheduler.global
 
+  private val impl: RestTestApi = RestTestApi.Impl
+
   final val serverHandle: RawRest.HandleRequest =
-    RawRest.asHandleRequest[RestTestApi](RestTestApi.Impl)
+    RawRest.asHandleRequest[RestTestApi](impl)
 
   def clientHandle: RawRest.HandleRequest
 
@@ -33,16 +34,16 @@ abstract class RestApiTest extends AnyFunSuite with ScalaFutures {
   def testCall[T](call: RestTestApi => Future[T])(implicit pos: Position): Unit =
     assert(
       call(proxy).wrapToTry.futureValue.map(mkDeep) ==
-        call(RestTestApi.Impl).catchFailures.wrapToTry.futureValue.map(mkDeep)
+        call(impl).catchFailures.wrapToTry.futureValue.map(mkDeep)
     )
 
   def mkDeep(value: Any): Any = value match {
     case arr: Array[_] => IArraySeq.empty[AnyRef] ++ arr.iterator.map(mkDeep)
     case _ => value
   }
 
-  def getNeverGetCounter(): Int = RestTestApi.Impl.neverGetCounter.get()
-  def resetNeverGetCounter(): Unit = RestTestApi.Impl.neverGetCounter.set(0)
+  def getNeverGetCounter(): Int = impl.neverGetCounter.get()
+  def resetNeverGetCounter(): Unit = impl.neverGetCounter.set(0)
 }
 
 trait RestApiTestScenarios extends RestApiTest {

rest/src/test/scala/io/udash/rest/RestTestApi.scala

@@ -179,7 +179,7 @@ object RestTestApi extends DefaultRestApiCompanion[RestTestApi] {
 
   import Scheduler.Implicits.global
 
-  val Impl: RestTestApi = new RestTestApi {
+  def Impl: RestTestApi = new RestTestApi {
     def trivialGet: Future[Unit] = Future.unit
     def failingGet: Future[Unit] = Future.failed(HttpErrorException.plain(503, "nie"))
     def jsonFailingGet: Future[Unit] = Future.failed(HttpErrorException(503, HttpBody.json(JsonValue(JsonStringOutput.write(ErrorWrapper("nie"))))))