update tests for all notifications

Author: fupelaqu

testkit/src/main/scala/app/softnetwork/notification/api/ApnsNotificationsServer.scala renamed to core/src/main/scala/app/softnetwork/notification/api/ApnsNotificationsServer.scala

@@ -1,34 +1,93 @@
 package app.softnetwork.notification.scalatest
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.notification.api.{MockAllNotificationsServer, NotificationServer}
-import app.softnetwork.notification.handlers.MockAllNotificationsHandler
+import app.softnetwork.notification.api.{
+  AllNotificationsServer,
+  NotificationGrpcServer,
+  NotificationServer
+}
+import app.softnetwork.notification.config.InternalConfig
+import app.softnetwork.notification.handlers.AllNotificationsHandler
 import app.softnetwork.notification.model.Notification
 import app.softnetwork.notification.persistence.query.{
   NotificationCommandProcessorStream,
   Scheduler2NotificationProcessorStream
 }
 import app.softnetwork.notification.persistence.typed.{
-  MockAllNotificationsBehavior,
+  AllNotificationsBehavior,
   NotificationBehavior
 }
+import app.softnetwork.notification.spi.FcmMockProvider
 import app.softnetwork.persistence.query.InMemoryJournalProvider
+import com.typesafe.config.Config
 import org.scalatest.Suite
 
-trait AllNotificationsTestKit extends NotificationTestKit[Notification] {
-  _: Suite =>
+trait AllNotificationsTestKit
+    extends NotificationTestKit[Notification]
+    with NotificationGrpcServer[Notification]
+    with ApnsToken { _: Suite =>
+
+  implicit lazy val system: ActorSystem[_] = typedSystem()
+
+  lazy val apnsPort: Int = availablePort
+
+  lazy val smsPort: Int = availablePort
+
+  lazy val smtpPort: Int = availablePort
+
+  override lazy val additionalConfig: String = grpcConfig +
+    s"""
+       |notification.mail.host = $hostname
+       |notification.mail.port = $smtpPort
+       |notification.push.mock.apns.port = $apnsPort
+       |notification.sms.mode.base-url = "http://$interface:$smsPort"
+       |""".stripMargin
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    assert(
+      new ApnsMockServer with InternalConfig {
+        override implicit def system: ActorSystem[_] = typedSystem()
+
+        override def serverPort: Int = apnsPort
+
+        override lazy val config: Config = internalConfig
+      }.initMockServer()
+    )
+    assert(
+      new SMSMockServer with InternalConfig {
+        override implicit def system: ActorSystem[_] = typedSystem()
+
+        override def serverPort: Int = smsPort
+
+        override def config: Config = internalConfig
+      }.initMockServer()
+    )
+    assert(
+      new SmtpMockServer with InternalConfig {
+        override implicit def system: ActorSystem[_] = typedSystem()
+
+        override def serverPort: Int = smtpPort
+
+        override lazy val config: Config = internalConfig
+      }.initMockServer()
+    )
+  }
 
   override def notificationBehaviors: ActorSystem[_] => Seq[NotificationBehavior[Notification]] =
-    _ => Seq(MockAllNotificationsBehavior)
+    _ =>
+      Seq(new AllNotificationsBehavior with FcmMockProvider with InternalConfig {
+        override def config: Config = internalConfig
+      })
 
   override def scheduler2NotificationProcessorStream
     : ActorSystem[_] => Option[Scheduler2NotificationProcessorStream] =
     sys =>
       Some(
         new Scheduler2NotificationProcessorStream
-          with MockAllNotificationsHandler
+          with AllNotificationsHandler
           with InMemoryJournalProvider {
-          override val tag: String = s"${MockAllNotificationsBehavior.persistenceId}-scheduler"
+          override val tag: String = s"${AllNotificationsBehavior.persistenceId}-scheduler"
           override protected val forTests: Boolean = true
           override implicit def system: ActorSystem[_] = sys
         }
@@ -39,7 +98,7 @@ trait AllNotificationsTestKit extends NotificationTestKit[Notification] {
     sys =>
       Some(
         new NotificationCommandProcessorStream
-          with MockAllNotificationsHandler
+          with AllNotificationsHandler
           with InMemoryJournalProvider {
           override val forTests: Boolean = true
           override implicit def system: ActorSystem[_] = sys
@@ -49,5 +108,5 @@ trait AllNotificationsTestKit extends NotificationTestKit[Notification] {
   /** initialize all notification servers
     */
   override def notificationServers: ActorSystem[_] => Seq[NotificationServer] = system =>
-    Seq(MockAllNotificationsServer(system))
+    Seq(AllNotificationsServer(system))
 }

testkit/src/main/scala/app/softnetwork/notification/api/FcmAndApnsNotificationsServer.scala renamed to core/src/main/scala/app/softnetwork/notification/api/FcmAndApnsNotificationsServer.scala

@@ -1,4 +1,4 @@
-package app.softnetwork.notification.spi
+package app.softnetwork.notification.scalatest
 
 import akka.Done
 import app.softnetwork.notification.config.{ApnsConfig, InternalConfig, PushSettings}
@@ -9,12 +9,12 @@ import com.eatthepath.pushy.apns.server.{
   PushNotificationHandlerFactory
 }
 
-import scala.compat.java8.FutureConverters._
+import scala.compat.java8.FutureConverters.toScala
 import scala.concurrent.Future
-import scala.language.reflectiveCalls
 import scala.util.{Failure, Success, Try}
 
-trait ApnsMockServer extends PushSettings with NotificationMockServer { _: InternalConfig =>
+trait ApnsMockServer extends PushSettings with NotificationMockServer {
+  _: InternalConfig =>
 
   override val name: String = "apns"
 
@@ -24,6 +24,7 @@ trait ApnsMockServer extends PushSettings with NotificationMockServer { _: Inter
 
   val SERVER_CERTIFICATES_FILENAME: String = "security/server-certs.pem"
   val SERVER_KEY_FILENAME: String = "security/server-key.pem"
+  val SERVER_KEY_PASSWORD: Option[String] = None
 
   def handler: PushNotificationHandlerFactory = new AcceptAllPushNotificationHandlerFactory
 
@@ -33,7 +34,7 @@ trait ApnsMockServer extends PushSettings with NotificationMockServer { _: Inter
         .setServerCredentials(
           getClass.getClassLoader.getResourceAsStream(SERVER_CERTIFICATES_FILENAME),
           getClass.getClassLoader.getResourceAsStream(SERVER_KEY_FILENAME),
-          null
+          SERVER_KEY_PASSWORD.orNull
         )
         .setTrustedClientCertificateChain(
           getClass.getClassLoader.getResourceAsStream(apnsConfig.truststore.orNull)