Test correct amount of converted models

ckittl · ckittl · commit 443839b86c75 · 2021-08-29T15:13:46.000+02:00
diff --git a/src/main/scala/edu/ie3/simbench/actor/LoadConverter.scala b/src/main/scala/edu/ie3/simbench/actor/LoadConverter.scala
@@ -93,7 +93,7 @@ case object LoadConverter
       /* Stop the children and myself, if all conversions are done. */
       if (remainingConversions.isEmpty) {
         ctx.stop(workerPool)
-        converter ! Converter.LoadsConverted(converted)
+        converter ! Converter.LoadsConverted(updatedConverted)
         Behaviors.stopped
       }
       converting(remainingConversions, updatedConverted, workerPool, converter)
diff --git a/src/main/scala/edu/ie3/simbench/actor/PowerPlantConverter.scala b/src/main/scala/edu/ie3/simbench/actor/PowerPlantConverter.scala
@@ -100,7 +100,7 @@ case object PowerPlantConverter
       /* Stop the children and myself, if all conversions are done. */
       if (remainingConversions.isEmpty) {
         ctx.stop(workerPool)
-        converter ! Converter.PowerPlantsConverted(converted)
+        converter ! Converter.PowerPlantsConverted(updatedConverted)
         Behaviors.stopped
       }
       converting(remainingConversions, updatedConverted, workerPool, converter)
diff --git a/src/main/scala/edu/ie3/simbench/actor/ResConverter.scala b/src/main/scala/edu/ie3/simbench/actor/ResConverter.scala
@@ -91,7 +91,7 @@ case object ResConverter
       /* Stop the children and myself, if all conversions are done. */
       if (remainingConversions.isEmpty) {
         ctx.stop(workerPool)
-        converter ! Converter.ResConverted(converted)
+        converter ! Converter.ResConverted(updatedConverted)
         Behaviors.stopped
       }
       converting(remainingConversions, updatedConverted, workerPool, converter)
diff --git a/src/main/scala/edu/ie3/simbench/main/RunSimbench.scala b/src/main/scala/edu/ie3/simbench/main/RunSimbench.scala
@@ -26,27 +26,5 @@ object RunSimbench extends SimbenchHelper {
       "Coordinator"
     )
     actorSystem ! Start(simbenchConfig)
-
-//    simbenchConfig.io.simbenchCodes.foreach { simbenchCode =>
-//      logger.info(s"$simbenchCode - Converting to PowerSystemDataModel")
-//      val (
-//        jointGridContainer,
-//        timeSeries,
-//        timeSeriesMapping,
-//        powerFlowResults
-//      ) =
-//        GridConverter.convert(
-//          simbenchCode,
-//          simbenchModel,
-//          simbenchConfig.conversion.removeSwitches
-//        )
-//
-//      logger.info(s"$simbenchCode - Writing converted data set to files")
-//
-//      csvSink.persistJointGrid(jointGridContainer)
-//      timeSeries.foreach(csvSink.persistTimeSeries(_))
-//      csvSink.persistAllIgnoreNested(timeSeriesMapping.asJava)
-//      csvSink.persistAll(powerFlowResults.asJava)
-//    }
   }
 }
diff --git a/src/test/scala/edu/ie3/simbench/convert/ConverterSpec.scala b/src/test/scala/edu/ie3/simbench/convert/ConverterSpec.scala
@@ -0,0 +1,106 @@
+package edu.ie3.simbench.convert
+
+import akka.actor.testkit.typed.scaladsl.{ActorTestKit, TestProbe}
+import akka.actor.typed.ActorRef
+import edu.ie3.simbench.actor.{Converter, Coordinator, Mutator, WorkerMessage}
+import edu.ie3.simbench.actor.Mutator.{
+  MutatorMessage,
+  PersistGridStructure,
+  PersistNodalResults,
+  PersistTimeSeriesMapping
+}
+import edu.ie3.test.common.UnitSpec
+import org.scalatest.BeforeAndAfterAll
+
+import scala.concurrent.duration.FiniteDuration
+
+class ConverterSpec extends UnitSpec with BeforeAndAfterAll {
+  val akkaTestKit: ActorTestKit = ActorTestKit()
+
+  override protected def afterAll(): Unit = {
+    akkaTestKit.shutdownTestKit()
+    super.afterAll()
+  }
+
+  val coordinator: TestProbe[Coordinator.CoordinatorMessage] =
+    akkaTestKit.createTestProbe[Coordinator.CoordinatorMessage]("coordinator")
+  val mutator: TestProbe[MutatorMessage] =
+    akkaTestKit.createTestProbe[Mutator.MutatorMessage]("mutator")
+  val converter: ActorRef[Converter.ConverterMessage] = akkaTestKit.spawn(
+    Converter.idle(
+      Converter.StateData(
+        "1-LV-rural1--0-no_sw",
+        "src/test/resources/gridData/1-LV-rural1--0-no_sw",
+        "http://141.51.193.167/simbench/gui/usecase/download",
+        failOnExistingFiles = false,
+        ".csv",
+        "UTF-8",
+        ";",
+        removeSwitches = false,
+        20,
+        mutator.ref,
+        coordinator.ref
+      )
+    ),
+    "converter"
+  )
+
+  "Converting a full grid model" should {
+    converter ! Converter.Convert("1-LV-rural1--0-no_sw")
+    "provide correct amount of converted models" in {
+
+      /* Receive 17 time series messages and reply completion */
+      (1 to 17).foldLeft(List.empty[Mutator.PersistTimeSeries]) {
+        case (messages, _) =>
+          val message = mutator.expectMessageType[Mutator.PersistTimeSeries](
+            FiniteDuration(60, "s")
+          )
+          message.replyTo ! WorkerMessage.TimeSeriesPersisted(
+            message.timeSeries.getUuid
+          )
+          messages :+ message
+      }
+
+      /* Receive all all other awaited messages */
+      mutator.expectMessageType[Mutator.PersistGridStructure](
+        FiniteDuration(60, "s")
+      ) match {
+        case Mutator.PersistGridStructure(
+            simBenchCode,
+            nodes,
+            lines,
+            transformers2w,
+            transformers3w,
+            switches,
+            measurements,
+            loads,
+            fixedFeedIns,
+            _
+            ) =>
+          simBenchCode shouldBe "1-LV-rural1--0-no_sw"
+          nodes.size shouldBe 15
+          lines.size shouldBe 13
+          transformers2w.size shouldBe 1
+          transformers3w.size shouldBe 0
+          switches.size shouldBe 0
+          measurements.size shouldBe 0
+          loads.size shouldBe 13
+          fixedFeedIns.size shouldBe 4
+      }
+
+      mutator.expectMessageType[Mutator.PersistTimeSeriesMapping](
+        FiniteDuration(60, "s")
+      ) match {
+        case Mutator.PersistTimeSeriesMapping(mapping, _) =>
+          mapping.size shouldBe 17
+      }
+
+      mutator.expectMessageType[Mutator.PersistNodalResults](
+        FiniteDuration(60, "s")
+      ) match {
+        case Mutator.PersistNodalResults(results, _) =>
+          results.size shouldBe 15
+      }
+    }
+  }
+}
diff --git a/src/test/scala/edu/ie3/simbench/convert/GridConverterSpec.scala b/src/test/scala/edu/ie3/simbench/convert/GridConverterSpec.scala
@@ -194,12 +194,6 @@ class GridConverterSpec
             measurements.size shouldBe 0
         }
       }
-      /* TODO: Test amount of converted participants
-     *  4 x FixedFeedInInput
-     *  13 x LoadInput
-     *  17 x Time Series and Mapping
-     *  All participants have a corresponding time series
-     */
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ case object LoadConverter`
`93`	`93`	`/* Stop the children and myself, if all conversions are done. */`
`94`	`94`	`if (remainingConversions.isEmpty) {`
`95`	`95`	`ctx.stop(workerPool)`
`96`		`- converter ! Converter.LoadsConverted(converted)`
	`96`	`+ converter ! Converter.LoadsConverted(updatedConverted)`
`97`	`97`	`Behaviors.stopped`
`98`	`98`	`}`
`99`	`99`	`converting(remainingConversions, updatedConverted, workerPool, converter)`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ case object PowerPlantConverter`
`100`	`100`	`/* Stop the children and myself, if all conversions are done. */`
`101`	`101`	`if (remainingConversions.isEmpty) {`
`102`	`102`	`ctx.stop(workerPool)`
`103`		`- converter ! Converter.PowerPlantsConverted(converted)`
	`103`	`+ converter ! Converter.PowerPlantsConverted(updatedConverted)`
`104`	`104`	`Behaviors.stopped`
`105`	`105`	`}`
`106`	`106`	`converting(remainingConversions, updatedConverted, workerPool, converter)`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ case object ResConverter`
`91`	`91`	`/* Stop the children and myself, if all conversions are done. */`
`92`	`92`	`if (remainingConversions.isEmpty) {`
`93`	`93`	`ctx.stop(workerPool)`
`94`		`- converter ! Converter.ResConverted(converted)`
	`94`	`+ converter ! Converter.ResConverted(updatedConverted)`
`95`	`95`	`Behaviors.stopped`
`96`	`96`	`}`
`97`	`97`	`converting(remainingConversions, updatedConverted, workerPool, converter)`
Original file line number	Diff line number	Diff line change
`@@ -194,12 +194,6 @@ class GridConverterSpec`
`194`	`194`	`measurements.size shouldBe 0`
`195`	`195`	`}`
`196`	`196`	`}`
`197`		`- /* TODO: Test amount of converted participants`
`198`		`- * 4 x FixedFeedInInput`
`199`		`- * 13 x LoadInput`
`200`		`- * 17 x Time Series and Mapping`
`201`		`- * All participants have a corresponding time series`
`202`		`- */`
`203`	`197`	`}`
`204`	`198`	`}`
`205`	`199`	`}`