tests for PrimaryServiceProxy

ie3-institute · Feb 21, 2024 · ffaa520 · ffaa520
1 parent 5765cdc
commit ffaa520
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 20 deletions.
diff --git a/src/main/scala/edu/ie3/simona/service/primary/PrimaryServiceProxy.scala b/src/main/scala/edu/ie3/simona/service/primary/PrimaryServiceProxy.scala
@@ -114,7 +114,8 @@ case class PrimaryServiceProxy(
                                 simulationStart: ZonedDateTime,
                                 extSimulation: Option[ActorRef]
                               ): Try[PrimaryServiceStateData] = {
-    var serviceStateData = PrimaryServiceStateData(Map.empty, Map.empty, simulationStart, primaryConfig, null)
+
+
     createSources(primaryConfig).map {
       case (mappingSource, metaInformationSource) =>
         val modelToTimeSeries = mappingSource.getMapping.asScala.toMap
@@ -142,22 +143,26 @@ case class PrimaryServiceProxy(
             }
           }
           .toMap
-        serviceStateData = PrimaryServiceStateData(
-          modelToTimeSeries,
-          timeSeriesToSourceRef,
-          simulationStart,
-          primaryConfig,
-          mappingSource
-        )
-    }
-    if (extSimulation.isDefined) {
-      // Ask ExtPrimaryDataService which UUIDs should be substituted
-      Success(serviceStateData.copy(
-        extSubscribers = getSubscribers,
-        extPrimaryDataService = extSimulation
-      ))
-    } else {
-      Success(serviceStateData)
+        if (extSimulation.isDefined) {
+          // Ask ExtPrimaryDataService which UUIDs should be substituted
+          PrimaryServiceStateData(
+            modelToTimeSeries,
+            timeSeriesToSourceRef,
+            simulationStart,
+            primaryConfig,
+            mappingSource,
+            getSubscribers(),
+            extSimulation
+          )
+       } else {
+          PrimaryServiceStateData(
+            modelToTimeSeries,
+            timeSeriesToSourceRef,
+            simulationStart,
+            primaryConfig,
+            mappingSource
+          )
+       }
     }
   }
 

diff --git a/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySpec.scala b/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySpec.scala
@@ -129,6 +129,12 @@ class PrimaryServiceProxySpec
 
   private val scheduler: TestProbe = TestProbe("scheduler")
 
+  val validExtPrimaryDataService = TestActorRef(
+    new ExtPrimaryDataService(
+      scheduler.ref
+    )
+  )
+
   "Testing a primary service config" should {
     "lead to complaining about too much source definitions" in {
       val maliciousConfig = PrimaryConfig(
@@ -260,7 +266,8 @@ class PrimaryServiceProxySpec
 
       proxy invokePrivate prepareStateData(
         maliciousConfig,
-        simulationStart
+        simulationStart,
+        Option.empty
       ) match {
         case Success(_) =>
           fail("Building state data with missing config should fail")
@@ -280,7 +287,8 @@ class PrimaryServiceProxySpec
 
       proxy invokePrivate prepareStateData(
         maliciousConfig,
-        simulationStart
+        simulationStart,
+        Option.empty
       ) match {
         case Success(_) =>
           fail("Building state data with missing config should fail")
@@ -293,7 +301,8 @@ class PrimaryServiceProxySpec
     "result in correct data" in {
       proxy invokePrivate prepareStateData(
         validPrimaryConfig,
-        simulationStart
+        simulationStart,
+        Option.empty
       ) match {
         case Success(
               PrimaryServiceStateData(
@@ -341,6 +350,29 @@ class PrimaryServiceProxySpec
           )
       }
     }
+
+    "build proxy correctly when there is an external simulation" in {
+      proxy invokePrivate prepareStateData(
+        validPrimaryConfig,
+        simulationStart,
+        Some(validExtPrimaryDataService)
+      ) match {
+        case Success(
+        PrimaryServiceStateData(
+        modelToTimeSeries,
+        timeSeriesToSourceRef,
+        simulationStart,
+        primaryConfig,
+        mappingSource,
+        extSubscribers,
+        extPrimaryDataService
+        )
+        ) => extPrimaryDataService should contain (validExtPrimaryDataService)
+          extSubscribers shouldBe Iterable.empty
+      }
+    }
+
+
   }
 
   "Sending initialization information to an uninitialized actor" should {