update notification testkit

fupelaqu · fupelaqu · commit 3eb92750e14c · 2023-12-02T10:12:33.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "notification"
 
-ThisBuild / version := "0.6.0"
+ThisBuild / version := "0.6.1"
 
 ThisBuild / scalaVersion := "2.12.18"
 
diff --git a/project/Versions.scala b/project/Versions.scala
@@ -2,7 +2,7 @@ object Versions {
 
   val genericPersistence = "0.6.0"
 
-  val scheduler = "0.6.0"
+  val scheduler = "0.6.1"
 
   val scalatest = "3.2.16"
 }
diff --git a/testkit/src/main/scala/app/softnetwork/notification/scalatest/AllNotificationsTestKit.scala b/testkit/src/main/scala/app/softnetwork/notification/scalatest/AllNotificationsTestKit.scala
@@ -20,16 +20,14 @@ import app.softnetwork.notification.persistence.typed.{
 import app.softnetwork.notification.spi.FcmMockProvider
 import app.softnetwork.persistence.query.{InMemoryJournalProvider, InMemoryOffsetProvider}
 import app.softnetwork.scheduler.config.SchedulerSettings
-import app.softnetwork.session.service.SessionMaterials
 import com.typesafe.config.Config
 import org.scalatest.Suite
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 trait AllNotificationsTestKit
     extends NotificationGrpcServer[Notification]
     with NotificationTestKit[Notification]
-    with ApnsToken { _: Suite with SessionMaterials[Session] =>
+    with ApnsToken { _: Suite =>
 
   lazy val apnsPort: Int = availablePort
 
@@ -50,7 +48,7 @@ trait AllNotificationsTestKit
     assert(
       new ApnsMockServer with InternalConfig {
         lazy val log: Logger = LoggerFactory getLogger getClass.getName
-        override implicit def system: ActorSystem[_] = ts
+        override implicit def system: ActorSystem[_] = asystem
 
         override def serverPort: Int = apnsPort
 
@@ -60,7 +58,7 @@ trait AllNotificationsTestKit
     assert(
       new SMSMockServer with InternalConfig {
         lazy val log: Logger = LoggerFactory getLogger getClass.getName
-        override implicit def system: ActorSystem[_] = ts
+        override implicit def system: ActorSystem[_] = asystem
 
         override def serverPort: Int = smsPort
 
@@ -70,7 +68,7 @@ trait AllNotificationsTestKit
     assert(
       new SmtpMockServer with InternalConfig {
         lazy val log: Logger = LoggerFactory getLogger getClass.getName
-        override implicit def system: ActorSystem[_] = ts
+        override implicit def system: ActorSystem[_] = asystem
 
         override def serverPort: Int = smtpPort
 
diff --git a/testkit/src/main/scala/app/softnetwork/notification/scalatest/ApnsNotificationsTestKit.scala b/testkit/src/main/scala/app/softnetwork/notification/scalatest/ApnsNotificationsTestKit.scala
@@ -21,14 +21,12 @@ import app.softnetwork.scheduler.config.SchedulerSettings
 import com.typesafe.config.Config
 import org.scalatest.Suite
 import app.softnetwork.notification.model.Push
-import app.softnetwork.session.service.SessionMaterials
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 trait ApnsNotificationsTestKit
     extends NotificationGrpcServer[Push]
     with NotificationTestKit[Push]
-    with ApnsToken { _: Suite with SessionMaterials[Session] =>
+    with ApnsToken { _: Suite =>
 
   lazy val apnsPort: Int = availablePort
 
@@ -42,7 +40,7 @@ trait ApnsNotificationsTestKit
     assert(
       new ApnsMockServer with InternalConfig {
         lazy val log: Logger = LoggerFactory getLogger getClass.getName
-        override implicit def system: ActorSystem[_] = ts
+        override implicit def system: ActorSystem[_] = asystem
 
         override def serverPort: Int = apnsPort
 
diff --git a/testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmAndApnsNotificationsTestKit.scala b/testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmAndApnsNotificationsTestKit.scala
@@ -22,14 +22,12 @@ import app.softnetwork.scheduler.config.SchedulerSettings
 import com.typesafe.config.Config
 import org.scalatest.Suite
 import app.softnetwork.notification.model.Push
-import app.softnetwork.session.service.SessionMaterials
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 trait FcmAndApnsNotificationsTestKit
     extends NotificationGrpcServer[Push]
     with NotificationTestKit[Push]
-    with ApnsToken { _: Suite with SessionMaterials[Session] =>
+    with ApnsToken { _: Suite =>
 
   lazy val apnsPort: Int = availablePort
 
@@ -43,7 +41,7 @@ trait FcmAndApnsNotificationsTestKit
     assert(
       new ApnsMockServer with InternalConfig {
         lazy val log: Logger = LoggerFactory getLogger getClass.getName
-        override implicit def system: ActorSystem[_] = ts
+        override implicit def system: ActorSystem[_] = asystem
 
         override def serverPort: Int = apnsPort
 
diff --git a/testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmNotificationsTestKit.scala b/testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmNotificationsTestKit.scala
@@ -22,12 +22,10 @@ import app.softnetwork.scheduler.config.SchedulerSettings
 import com.typesafe.config.Config
 import org.scalatest.Suite
 import app.softnetwork.notification.model.Push
-import app.softnetwork.session.service.SessionMaterials
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 trait FcmNotificationsTestKit extends NotificationGrpcServer[Push] with NotificationTestKit[Push] {
-  _: Suite with SessionMaterials[Session] =>
+  _: Suite =>
 
   override def notificationBehaviors: ActorSystem[_] => Seq[NotificationBehavior[Push]] = _ =>
     Seq(
diff --git a/testkit/src/main/scala/app/softnetwork/notification/scalatest/NotificationTestKit.scala b/testkit/src/main/scala/app/softnetwork/notification/scalatest/NotificationTestKit.scala
@@ -24,7 +24,6 @@ import org.scalatest.Suite
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.query.EventProcessorStream
 import app.softnetwork.session.config.Settings
-import app.softnetwork.session.service.SessionMaterials
 import org.softnetwork.session.model.Session
 
 import java.net.ServerSocket
@@ -33,10 +32,9 @@ import java.nio.file.{Files, Path}
 trait NotificationTestKit[T <: Notification]
     extends SchedulerTestKit
     with NotificationGuardian[T]
-    with ApnsToken {
-  _: Suite with SessionMaterials[Session] =>
+    with ApnsToken { _: Suite =>
 
-  override implicit def ts: ActorSystem[_] = typedSystem()
+  implicit def asystem: ActorSystem[_] = typedSystem()
 
   override protected def sessionType: Session.SessionType =
     Settings.Session.SessionContinuityAndTransport
@@ -93,9 +91,9 @@ trait NotificationTestKit[T <: Notification]
 
   val probe: TestProbe[Schedule4NotificationTriggered] =
     createTestProbe[Schedule4NotificationTriggered]()
-  ts.eventStream.tell(Subscribe(probe.ref))
+  asystem.eventStream.tell(Subscribe(probe.ref))
 
-  lazy val client: NotificationClient = NotificationClient(ts)
+  lazy val client: NotificationClient = NotificationClient(asystem)
 
   override def entities: ActorSystem[_] => Seq[PersistentEntity[_, _, _, _]] = sys =>
     schedulerEntities(sys) ++ notificationEntities(sys)
diff --git a/testkit/src/main/scala/app/softnetwork/notification/scalatest/SMSModeNotificationsTestKit.scala b/testkit/src/main/scala/app/softnetwork/notification/scalatest/SMSModeNotificationsTestKit.scala
@@ -21,13 +21,11 @@ import app.softnetwork.scheduler.config.SchedulerSettings
 import com.typesafe.config.Config
 import org.scalatest.Suite
 import app.softnetwork.notification.model.SMS
-import app.softnetwork.session.service.SessionMaterials
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 trait SMSModeNotificationsTestKit
     extends NotificationGrpcServer[SMS]
-    with NotificationTestKit[SMS] { _: Suite with SessionMaterials[Session] =>
+    with NotificationTestKit[SMS] { _: Suite =>
 
   lazy val smsPort: Int = availablePort
 
@@ -41,7 +39,7 @@ trait SMSModeNotificationsTestKit
     assert(
       new SMSMockServer with InternalConfig {
         lazy val log: Logger = LoggerFactory getLogger getClass.getName
-        override implicit def system: ActorSystem[_] = ts
+        override implicit def system: ActorSystem[_] = asystem
 
         override def serverPort: Int = smsPort
 
diff --git a/testkit/src/main/scala/app/softnetwork/notification/scalatest/SimpleMailNotificationsTestKit.scala b/testkit/src/main/scala/app/softnetwork/notification/scalatest/SimpleMailNotificationsTestKit.scala
@@ -21,13 +21,11 @@ import app.softnetwork.scheduler.config.SchedulerSettings
 import com.typesafe.config.Config
 import org.scalatest.Suite
 import app.softnetwork.notification.model.Mail
-import app.softnetwork.session.service.SessionMaterials
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 trait SimpleMailNotificationsTestKit
     extends NotificationGrpcServer[Mail]
-    with NotificationTestKit[Mail] { _: Suite with SessionMaterials[Session] =>
+    with NotificationTestKit[Mail] { _: Suite =>
 
   lazy val smtpPort: Int = availablePort
 
@@ -42,7 +40,7 @@ trait SimpleMailNotificationsTestKit
     assert(
       new SmtpMockServer with InternalConfig {
         lazy val log: Logger = LoggerFactory getLogger getClass.getName
-        override implicit def system: ActorSystem[_] = ts
+        override implicit def system: ActorSystem[_] = asystem
 
         override def serverPort: Int = smtpPort
 
diff --git a/testkit/src/test/scala/app/softnetwork/notification/handlers/AllNotificationsHandlerSpec.scala b/testkit/src/test/scala/app/softnetwork/notification/handlers/AllNotificationsHandlerSpec.scala
@@ -3,11 +3,7 @@ package app.softnetwork.notification.handlers
 import org.scalatest.wordspec.AnyWordSpecLike
 import app.softnetwork.notification.message._
 import app.softnetwork.notification.scalatest.AllNotificationsTestKit
-import app.softnetwork.session.handlers.SessionRefreshTokenDao
-import app.softnetwork.session.service.BasicSessionMaterials
-import com.softwaremill.session.RefreshTokenStorage
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 import scala.util.{Failure, Success}
 
@@ -16,12 +12,7 @@ import scala.util.{Failure, Success}
 class AllNotificationsHandlerSpec
     extends AllNotificationsHandler
     with AnyWordSpecLike
-    with AllNotificationsTestKit
-    with BasicSessionMaterials[Session] {
-
-  override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
-    ts
-  )
+    with AllNotificationsTestKit {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
diff --git a/testkit/src/test/scala/app/softnetwork/notification/handlers/ApnsNotificationsHandlerSpec.scala b/testkit/src/test/scala/app/softnetwork/notification/handlers/ApnsNotificationsHandlerSpec.scala
@@ -4,23 +4,14 @@ import app.softnetwork.notification.message._
 import app.softnetwork.notification.scalatest.ApnsNotificationsTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import app.softnetwork.notification.model.NotificationStatus
-import app.softnetwork.session.handlers.SessionRefreshTokenDao
-import app.softnetwork.session.service.BasicSessionMaterials
-import com.softwaremill.session.RefreshTokenStorage
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 /** Created by smanciot on 07/12/2022.
   */
 class ApnsNotificationsHandlerSpec
     extends ApnsNotificationsHandler
     with AnyWordSpecLike
-    with ApnsNotificationsTestKit
-    with BasicSessionMaterials[Session] {
-
-  override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
-    ts
-  )
+    with ApnsNotificationsTestKit {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
diff --git a/testkit/src/test/scala/app/softnetwork/notification/handlers/FcmAndApnsNotificationsHandlerSpec.scala b/testkit/src/test/scala/app/softnetwork/notification/handlers/FcmAndApnsNotificationsHandlerSpec.scala
@@ -4,23 +4,14 @@ import app.softnetwork.notification.message._
 import app.softnetwork.notification.scalatest.FcmAndApnsNotificationsTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import app.softnetwork.notification.model.NotificationStatus
-import app.softnetwork.session.handlers.SessionRefreshTokenDao
-import app.softnetwork.session.service.BasicSessionMaterials
-import com.softwaremill.session.RefreshTokenStorage
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 /** Created by smanciot on 07/12/2022.
   */
 class FcmAndApnsNotificationsHandlerSpec
     extends FcmAndApnsNotificationsHandler
     with AnyWordSpecLike
-    with FcmAndApnsNotificationsTestKit
-    with BasicSessionMaterials[Session] {
-
-  override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
-    ts
-  )
+    with FcmAndApnsNotificationsTestKit {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
diff --git a/testkit/src/test/scala/app/softnetwork/notification/handlers/FcmNotificationsHandlerSpec.scala b/testkit/src/test/scala/app/softnetwork/notification/handlers/FcmNotificationsHandlerSpec.scala
@@ -4,23 +4,14 @@ import app.softnetwork.notification.message._
 import app.softnetwork.notification.scalatest.FcmNotificationsTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import app.softnetwork.notification.model.NotificationStatus
-import app.softnetwork.session.handlers.SessionRefreshTokenDao
-import app.softnetwork.session.service.BasicSessionMaterials
-import com.softwaremill.session.RefreshTokenStorage
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 /** Created by smanciot on 07/12/2022.
   */
 class FcmNotificationsHandlerSpec
     extends FcmNotificationsHandler
     with AnyWordSpecLike
-    with FcmNotificationsTestKit
-    with BasicSessionMaterials[Session] {
-
-  override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
-    ts
-  )
+    with FcmNotificationsTestKit {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
diff --git a/testkit/src/test/scala/app/softnetwork/notification/handlers/SMSModeNotificationsHandlerSpec.scala b/testkit/src/test/scala/app/softnetwork/notification/handlers/SMSModeNotificationsHandlerSpec.scala
@@ -2,24 +2,15 @@ package app.softnetwork.notification.handlers
 
 import app.softnetwork.notification.message._
 import app.softnetwork.notification.scalatest.SMSModeNotificationsTestKit
-import app.softnetwork.session.handlers.SessionRefreshTokenDao
-import app.softnetwork.session.service.BasicSessionMaterials
-import com.softwaremill.session.RefreshTokenStorage
 import org.scalatest.wordspec.AnyWordSpecLike
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 /** Created by smanciot on 07/12/2022.
   */
 class SMSModeNotificationsHandlerSpec
     extends SMSModeNotificationsHandler
     with AnyWordSpecLike
-    with SMSModeNotificationsTestKit
-    with BasicSessionMaterials[Session] {
-
-  override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
-    ts
-  )
+    with SMSModeNotificationsTestKit {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
diff --git a/testkit/src/test/scala/app/softnetwork/notification/handlers/SimpleMailNotificationsHandlerSpec.scala b/testkit/src/test/scala/app/softnetwork/notification/handlers/SimpleMailNotificationsHandlerSpec.scala
@@ -3,12 +3,8 @@ package app.softnetwork.notification.handlers
 import app.softnetwork.notification.message._
 import app.softnetwork.notification.model.Attachment
 import app.softnetwork.notification.scalatest.SimpleMailNotificationsTestKit
-import app.softnetwork.session.handlers.SessionRefreshTokenDao
-import app.softnetwork.session.service.BasicSessionMaterials
-import com.softwaremill.session.RefreshTokenStorage
 import org.scalatest.wordspec.AnyWordSpecLike
 import org.slf4j.{Logger, LoggerFactory}
-import org.softnetwork.session.model.Session
 
 import java.nio.file.Paths
 
@@ -17,12 +13,7 @@ import java.nio.file.Paths
 class SimpleMailNotificationsHandlerSpec
     extends SimpleMailNotificationsHandler
     with AnyWordSpecLike
-    with SimpleMailNotificationsTestKit
-    with BasicSessionMaterials[Session] {
-
-  override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
-    ts
-  )
+    with SimpleMailNotificationsTestKit {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ object Versions {`
`2`	`2`
`3`	`3`	`val genericPersistence = "0.6.0"`
`4`	`4`
`5`		`- val scheduler = "0.6.0"`
	`5`	`+ val scheduler = "0.6.1"`
`6`	`6`
`7`	`7`	`val scalatest = "3.2.16"`
`8`	`8`	`}`