update testkit for grpc services

Author: fupelaqu

build.sbt

@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "scheduler"
 
-ThisBuild / version := "0.1.1"
+ThisBuild / version := "0.1.2"
 
 ThisBuild / scalaVersion := "2.12.15"
 

testkit/src/main/scala/app/softnetwork/scheduler/api/SchedulerGrpcServer.scala

@@ -9,5 +9,5 @@ trait SchedulerGrpcServer
     extends PersistenceScalatestGrpcTest
     with SchedulerGrpcServices
     with InMemoryPersistenceTestKit { _: Suite with SchedulerGuardian =>
-  override lazy val additionalConfig: String = grpcConfig
+  override lazy val additionalConfig: String = schedulerGrpcConfig
 }

testkit/src/main/scala/app/softnetwork/scheduler/api/SchedulerGrpcServices.scala

@@ -15,11 +15,15 @@ trait SchedulerGrpcServices extends GrpcServices {
 
   def port: Int
 
-  final override def grpcServices
+  override def grpcServices
+    : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] =
+    schedulerGrpcServices
+
+  def schedulerGrpcServices
     : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] = system =>
     Seq(SchedulerServiceApiHandler.partial(schedulerServer(system))(system))
 
-  def grpcConfig: String = s"""
+  def schedulerGrpcConfig: String = s"""
                               |# Important: enable HTTP/2 in ActorSystem's config
                               |akka.http.server.preview.enable-http2 = on
                               |akka.grpc.client."${SchedulerClient.name}"{

testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerTestKit.scala

@@ -2,14 +2,14 @@ package app.softnetwork.scheduler.scalatest
 
 import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.query.InMemoryJournalProvider
-import app.softnetwork.scheduler.api.SchedulerGrpcServer
+import app.softnetwork.persistence.scalatest.InMemoryPersistenceTestKit
 import app.softnetwork.scheduler.config.SchedulerSettings
 import app.softnetwork.scheduler.handlers.SchedulerHandler
 import app.softnetwork.scheduler.launch.SchedulerGuardian
 import app.softnetwork.scheduler.persistence.query.Entity2SchedulerProcessorStream
 import org.scalatest.Suite
 
-trait SchedulerTestKit extends SchedulerGuardian with SchedulerGrpcServer {
+trait SchedulerTestKit extends SchedulerGuardian with InMemoryPersistenceTestKit {
   _: Suite =>
 
   /** @return

testkit/src/test/scala/app/softnetwork/scheduler/api/SchedulerClientSpec.scala

@@ -4,7 +4,7 @@ import app.softnetwork.scheduler.scalatest.SchedulerTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import org.softnetwork.akka.model.Schedule
 
-class SchedulerClientSpec extends AnyWordSpecLike with SchedulerTestKit {
+class SchedulerClientSpec extends AnyWordSpecLike with SchedulerTestKit with SchedulerGrpcServer {
 
   lazy val client: SchedulerClient = SchedulerClient(typedSystem())