Skip to content

Commit 3eb9275

Browse files
fupelaqufupelaqu
committed
update notification testkit
1 parent c177a6d commit 3eb9275

15 files changed

Lines changed: 25 additions & 93 deletions

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
22

33
name := "notification"
44

5-
ThisBuild / version := "0.6.0"
5+
ThisBuild / version := "0.6.1"
66

77
ThisBuild / scalaVersion := "2.12.18"
88

‎project/Versions.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ object Versions {
22

33
val genericPersistence = "0.6.0"
44

5-
val scheduler = "0.6.0"
5+
val scheduler = "0.6.1"
66

77
val scalatest = "3.2.16"
88
}

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/AllNotificationsTestKit.scala‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ import app.softnetwork.notification.persistence.typed.{
2020
import app.softnetwork.notification.spi.FcmMockProvider
2121
import app.softnetwork.persistence.query.{InMemoryJournalProvider, InMemoryOffsetProvider}
2222
import app.softnetwork.scheduler.config.SchedulerSettings
23-
import app.softnetwork.session.service.SessionMaterials
2423
import com.typesafe.config.Config
2524
import org.scalatest.Suite
2625
import org.slf4j.{Logger, LoggerFactory}
27-
import org.softnetwork.session.model.Session
2826

2927
trait AllNotificationsTestKit
3028
extends NotificationGrpcServer[Notification]
3129
with NotificationTestKit[Notification]
32-
with ApnsToken { _: Suite with SessionMaterials[Session] =>
30+
with ApnsToken { _: Suite =>
3331

3432
lazy val apnsPort: Int = availablePort
3533

@@ -50,7 +48,7 @@ trait AllNotificationsTestKit
5048
assert(
5149
new ApnsMockServer with InternalConfig {
5250
lazy val log: Logger = LoggerFactory getLogger getClass.getName
53-
override implicit def system: ActorSystem[_] = ts
51+
override implicit def system: ActorSystem[_] = asystem
5452

5553
override def serverPort: Int = apnsPort
5654

@@ -60,7 +58,7 @@ trait AllNotificationsTestKit
6058
assert(
6159
new SMSMockServer with InternalConfig {
6260
lazy val log: Logger = LoggerFactory getLogger getClass.getName
63-
override implicit def system: ActorSystem[_] = ts
61+
override implicit def system: ActorSystem[_] = asystem
6462

6563
override def serverPort: Int = smsPort
6664

@@ -70,7 +68,7 @@ trait AllNotificationsTestKit
7068
assert(
7169
new SmtpMockServer with InternalConfig {
7270
lazy val log: Logger = LoggerFactory getLogger getClass.getName
73-
override implicit def system: ActorSystem[_] = ts
71+
override implicit def system: ActorSystem[_] = asystem
7472

7573
override def serverPort: Int = smtpPort
7674

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/ApnsNotificationsTestKit.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ import app.softnetwork.scheduler.config.SchedulerSettings
2121
import com.typesafe.config.Config
2222
import org.scalatest.Suite
2323
import app.softnetwork.notification.model.Push
24-
import app.softnetwork.session.service.SessionMaterials
2524
import org.slf4j.{Logger, LoggerFactory}
26-
import org.softnetwork.session.model.Session
2725

2826
trait ApnsNotificationsTestKit
2927
extends NotificationGrpcServer[Push]
3028
with NotificationTestKit[Push]
31-
with ApnsToken { _: Suite with SessionMaterials[Session] =>
29+
with ApnsToken { _: Suite =>
3230

3331
lazy val apnsPort: Int = availablePort
3432

@@ -42,7 +40,7 @@ trait ApnsNotificationsTestKit
4240
assert(
4341
new ApnsMockServer with InternalConfig {
4442
lazy val log: Logger = LoggerFactory getLogger getClass.getName
45-
override implicit def system: ActorSystem[_] = ts
43+
override implicit def system: ActorSystem[_] = asystem
4644

4745
override def serverPort: Int = apnsPort
4846

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmAndApnsNotificationsTestKit.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ import app.softnetwork.scheduler.config.SchedulerSettings
2222
import com.typesafe.config.Config
2323
import org.scalatest.Suite
2424
import app.softnetwork.notification.model.Push
25-
import app.softnetwork.session.service.SessionMaterials
2625
import org.slf4j.{Logger, LoggerFactory}
27-
import org.softnetwork.session.model.Session
2826

2927
trait FcmAndApnsNotificationsTestKit
3028
extends NotificationGrpcServer[Push]
3129
with NotificationTestKit[Push]
32-
with ApnsToken { _: Suite with SessionMaterials[Session] =>
30+
with ApnsToken { _: Suite =>
3331

3432
lazy val apnsPort: Int = availablePort
3533

@@ -43,7 +41,7 @@ trait FcmAndApnsNotificationsTestKit
4341
assert(
4442
new ApnsMockServer with InternalConfig {
4543
lazy val log: Logger = LoggerFactory getLogger getClass.getName
46-
override implicit def system: ActorSystem[_] = ts
44+
override implicit def system: ActorSystem[_] = asystem
4745

4846
override def serverPort: Int = apnsPort
4947

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmNotificationsTestKit.scala‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ import app.softnetwork.scheduler.config.SchedulerSettings
2222
import com.typesafe.config.Config
2323
import org.scalatest.Suite
2424
import app.softnetwork.notification.model.Push
25-
import app.softnetwork.session.service.SessionMaterials
2625
import org.slf4j.{Logger, LoggerFactory}
27-
import org.softnetwork.session.model.Session
2826

2927
trait FcmNotificationsTestKit extends NotificationGrpcServer[Push] with NotificationTestKit[Push] {
30-
_: Suite with SessionMaterials[Session] =>
28+
_: Suite =>
3129

3230
override def notificationBehaviors: ActorSystem[_] => Seq[NotificationBehavior[Push]] = _ =>
3331
Seq(

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/NotificationTestKit.scala‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import org.scalatest.Suite
2424
import app.softnetwork.persistence.launch.PersistentEntity
2525
import app.softnetwork.persistence.query.EventProcessorStream
2626
import app.softnetwork.session.config.Settings
27-
import app.softnetwork.session.service.SessionMaterials
2827
import org.softnetwork.session.model.Session
2928

3029
import java.net.ServerSocket
@@ -33,10 +32,9 @@ import java.nio.file.{Files, Path}
3332
trait NotificationTestKit[T <: Notification]
3433
extends SchedulerTestKit
3534
with NotificationGuardian[T]
36-
with ApnsToken {
37-
_: Suite with SessionMaterials[Session] =>
35+
with ApnsToken { _: Suite =>
3836

39-
override implicit def ts: ActorSystem[_] = typedSystem()
37+
implicit def asystem: ActorSystem[_] = typedSystem()
4038

4139
override protected def sessionType: Session.SessionType =
4240
Settings.Session.SessionContinuityAndTransport
@@ -93,9 +91,9 @@ trait NotificationTestKit[T <: Notification]
9391

9492
val probe: TestProbe[Schedule4NotificationTriggered] =
9593
createTestProbe[Schedule4NotificationTriggered]()
96-
ts.eventStream.tell(Subscribe(probe.ref))
94+
asystem.eventStream.tell(Subscribe(probe.ref))
9795

98-
lazy val client: NotificationClient = NotificationClient(ts)
96+
lazy val client: NotificationClient = NotificationClient(asystem)
9997

10098
override def entities: ActorSystem[_] => Seq[PersistentEntity[_, _, _, _]] = sys =>
10199
schedulerEntities(sys) ++ notificationEntities(sys)

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/SMSModeNotificationsTestKit.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ import app.softnetwork.scheduler.config.SchedulerSettings
2121
import com.typesafe.config.Config
2222
import org.scalatest.Suite
2323
import app.softnetwork.notification.model.SMS
24-
import app.softnetwork.session.service.SessionMaterials
2524
import org.slf4j.{Logger, LoggerFactory}
26-
import org.softnetwork.session.model.Session
2725

2826
trait SMSModeNotificationsTestKit
2927
extends NotificationGrpcServer[SMS]
30-
with NotificationTestKit[SMS] { _: Suite with SessionMaterials[Session] =>
28+
with NotificationTestKit[SMS] { _: Suite =>
3129

3230
lazy val smsPort: Int = availablePort
3331

@@ -41,7 +39,7 @@ trait SMSModeNotificationsTestKit
4139
assert(
4240
new SMSMockServer with InternalConfig {
4341
lazy val log: Logger = LoggerFactory getLogger getClass.getName
44-
override implicit def system: ActorSystem[_] = ts
42+
override implicit def system: ActorSystem[_] = asystem
4543

4644
override def serverPort: Int = smsPort
4745

‎testkit/src/main/scala/app/softnetwork/notification/scalatest/SimpleMailNotificationsTestKit.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ import app.softnetwork.scheduler.config.SchedulerSettings
2121
import com.typesafe.config.Config
2222
import org.scalatest.Suite
2323
import app.softnetwork.notification.model.Mail
24-
import app.softnetwork.session.service.SessionMaterials
2524
import org.slf4j.{Logger, LoggerFactory}
26-
import org.softnetwork.session.model.Session
2725

2826
trait SimpleMailNotificationsTestKit
2927
extends NotificationGrpcServer[Mail]
30-
with NotificationTestKit[Mail] { _: Suite with SessionMaterials[Session] =>
28+
with NotificationTestKit[Mail] { _: Suite =>
3129

3230
lazy val smtpPort: Int = availablePort
3331

@@ -42,7 +40,7 @@ trait SimpleMailNotificationsTestKit
4240
assert(
4341
new SmtpMockServer with InternalConfig {
4442
lazy val log: Logger = LoggerFactory getLogger getClass.getName
45-
override implicit def system: ActorSystem[_] = ts
43+
override implicit def system: ActorSystem[_] = asystem
4644

4745
override def serverPort: Int = smtpPort
4846

‎testkit/src/test/scala/app/softnetwork/notification/handlers/AllNotificationsHandlerSpec.scala‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ package app.softnetwork.notification.handlers
33
import org.scalatest.wordspec.AnyWordSpecLike
44
import app.softnetwork.notification.message._
55
import app.softnetwork.notification.scalatest.AllNotificationsTestKit
6-
import app.softnetwork.session.handlers.SessionRefreshTokenDao
7-
import app.softnetwork.session.service.BasicSessionMaterials
8-
import com.softwaremill.session.RefreshTokenStorage
96
import org.slf4j.{Logger, LoggerFactory}
10-
import org.softnetwork.session.model.Session
117

128
import scala.util.{Failure, Success}
139

@@ -16,12 +12,7 @@ import scala.util.{Failure, Success}
1612
class AllNotificationsHandlerSpec
1713
extends AllNotificationsHandler
1814
with AnyWordSpecLike
19-
with AllNotificationsTestKit
20-
with BasicSessionMaterials[Session] {
21-
22-
override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
23-
ts
24-
)
15+
with AllNotificationsTestKit {
2516

2617
lazy val log: Logger = LoggerFactory getLogger getClass.getName
2718

0 commit comments

Comments
 (0)