diff --git a/CHANGELOG.md b/CHANGELOG.md index 92b8b0fb26..c26ee4b9c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Refactoring EM messages [#947](https://github.com/ie3-institute/simona/issues/947) - Simplifying ThermalHouse [#940](https://github.com/ie3-institute/simona/issues/940) - Prepare ThermalStorageTestData for Storage without storageVolumeLvlMin [#894](https://github.com/ie3-institute/simona/issues/894) +- Renamed `ActivityStartTrigger`, `ScheduleTriggerMessage`, `CompletionMessage` in UML Diagrams[#675](https://github.com/ie3-institute/simona/issues/675) ### Fixed - Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658) diff --git a/docs/uml/main/ExtEvSimulationClasses.puml b/docs/uml/main/ExtEvSimulationClasses.puml index 9543697f03..373387d8b8 100644 --- a/docs/uml/main/ExtEvSimulationClasses.puml +++ b/docs/uml/main/ExtEvSimulationClasses.puml @@ -165,7 +165,7 @@ package simona-api { interface ExtTriggerResponse class CompletionMessage { - - List newTriggers + - Optional nextActivation } CompletionMessage --|> ExtTriggerResponse diff --git a/docs/uml/main/ParticipantInheritance.puml b/docs/uml/main/ParticipantInheritance.puml index 7a681fcb8d..ddd87cdc3b 100644 --- a/docs/uml/main/ParticipantInheritance.puml +++ b/docs/uml/main/ParticipantInheritance.puml @@ -26,7 +26,7 @@ + getAndCheckNodalVoltage(...): ComparableQuantity[Dimensionless] + initializeParticipant(...): FSM.State[AgentState, ParticipantStateData] + {abstract} determineBaseStateData(...): BaseStateData[ApparentPower] - + determineTriggersThroughoutSimulation(...): Option[List[ScheduleTriggerMessage]] + + determineTriggersThroughoutSimulation(...): Option[List[ScheduleActivation]] + baseStateDataForExternalDataProvision(...): FromOutsideBaseStateData + queryPrimaryDataAndChangeState(...): FSM.State[AgentState, ParticipantStateData] + querySecondaryDataAndChangeState(...): FSM.State[AgentState, ParticipantStateData] diff --git a/docs/uml/protocol/ExtEvSimulationSequence.puml b/docs/uml/protocol/ExtEvSimulationSequence.puml index dde2f869d6..b5d9ff3de4 100644 --- a/docs/uml/protocol/ExtEvSimulationSequence.puml +++ b/docs/uml/protocol/ExtEvSimulationSequence.puml @@ -43,11 +43,11 @@ Scheduler -> ExtEvDataService: ! Activation(t1) deactivate Scheduler activate ExtEvDataService -ExtSimulation -> ExtSimAdapter: ! CompletionMessage(newTriggers) +ExtSimulation -> ExtSimAdapter: ! CompletionMessage(newTick) deactivate ExtSimulation activate ExtSimAdapter -ExtSimAdapter -> Scheduler: ! Completion(newTriggers) +ExtSimAdapter -> Scheduler: ! Completion(newTick) deactivate ExtSimAdapter ExtEvDataService -> EvcsAgent1: ! RegistrationSuccessfulMessage(t1) diff --git a/docs/uml/protocol/InitializationPhase.puml b/docs/uml/protocol/InitializationPhase.puml index a5cd1c48d0..b46e4b3c06 100644 --- a/docs/uml/protocol/InitializationPhase.puml +++ b/docs/uml/protocol/InitializationPhase.puml @@ -1,19 +1,19 @@ @startuml -MainController -> Listener: create() -MainController -> SimScheduler: create() -MainController -> Services: create() -MainController -> SimScheduler: ! ScheduleTriggerMessage(\n\tInitializeServiceTrigger(0),\n\tweatherActorRef) -MainController -> GridAgents: create() -MainController -> SimScheduler: ! ScheduleTriggerMessage(\n\tInitializeGridAgentTrigger(0),\n\tgridAgentInitData,\n\tgridAgentRef) -MainController -> SimScheduler: ? StartScheduleMessage() -SimScheduler -> Services: ! TriggerWithIdMessage(\n\tInitializeServiceTrigger(_),\n\ttriggerId,\n\t_) -Services --> SimScheduler: ! CompletionMessage(\n\ttriggerId,\n\tScheduleTriggerMessage[...]) -SimScheduler -> GridAgents: ! TriggerWithIdMessage(\n\tInitializeGridAgentTrigger(_),\n\ttriggerId,\n\t_) -GridAgents -> SimScheduler: ! ScheduleTriggerMessage(\n\tInitializeSystemComponentsTrigger(0),\n\tassetAgentRef) -GridAgents --> SimScheduler: ! CompletionMessage(triggerId, ScheduleTriggerMessage[...]) -SimScheduler -> ParticipantAgents: ! TriggerWithIdMessage(\n\tIInitializeSystemComponentsTrigger(_),\n\ttriggerId,\n\t_) +SimonaSim -> Listener: create() +SimonaSim -> Scheduler: create() +SimonaSim -> Services: create() +Services -> Scheduler: ! ScheduleActivation(\n\tweatherActorRef, \n\tINIT_SIM_TICK) +SimonaSim -> GridAgents: create() +GridAgents -> Scheduler: ! ScheduleActivation(\n\tgridAgentRef, \n\tINIT_SIM_TICK) +SimonaSim -> Scheduler: ? StartScheduleMessage() +Scheduler -> Services: ! Activation(\n\tINIT_SIM_TICK) +Services --> Scheduler: ! Completion(\n\tweatherActorRef, \n\ttick) +Scheduler -> GridAgents: ! Activation(\n\tINIT_SIM_TICK) +GridAgents -> Scheduler: ! ScheduleActivation(\n\tassetAgentRef, \n\tINIT_SIM_TICK) +GridAgents --> Scheduler: ! Completion(\n\tgridAgentRef,\n\ttick) +Scheduler -> ParticipantAgents: ! Activation(\n\tINIT_SIM_TICK) ParticipantAgents -> Services: ! RegisterForWeatherMessage(lat, lon) ParticipantAgents -> Services: ! RegisterFor... Services --> ParticipantAgents: ! RegistrationResponseMessages -ParticipantAgents --> SimScheduler: ! CompletionMessage(\n\ttriggerId,\n\tScheduleTriggerMessage[\n\t\tActivityStartTrigger(tick)\n\t]) +ParticipantAgents --> Scheduler: ! Completion(\n\tassetAgentRef,\n\ttick) @enduml \ No newline at end of file diff --git a/docs/uml/protocol/ParticipantTriggeredByItself.puml b/docs/uml/protocol/ParticipantTriggeredByItself.puml index 94b5f84985..b476a6e232 100644 --- a/docs/uml/protocol/ParticipantTriggeredByItself.puml +++ b/docs/uml/protocol/ParticipantTriggeredByItself.puml @@ -1,6 +1,6 @@ @startuml -SimScheduler -> ParticipantAgents: ! TriggerWithIdMessage(\n\tIInitializeSystemComponentsTrigger(_),\n\ttriggerId,\n\t_) -ParticipantAgents --> SimScheduler: ! CompletionMessage(triggerId, ScheduleTriggerMessage[...]) -SimScheduler -> ParticipantAgents: ! TriggerWithIdMessage(\n\tActivityStartTrigger(tick),\n\t_,\n\t_) -ParticipantAgents --> SimScheduler: ! CompletionMessage(triggerId, None) +Scheduler -> ParticipantAgents: ! Activation(\n\tINIT_SIM_TICK) +ParticipantAgents --> Scheduler: ! Completion(\n\tactor, tick) +Scheduler -> ParticipantAgents: ! Activation(\n\ttick) +ParticipantAgents --> Scheduler: ! Completion(\n\tactor, newTick) @enduml \ No newline at end of file diff --git a/docs/uml/protocol/ParticipantTriggeredByPrimaryData.puml b/docs/uml/protocol/ParticipantTriggeredByPrimaryData.puml index 03874b19bd..c9ee2e21bd 100644 --- a/docs/uml/protocol/ParticipantTriggeredByPrimaryData.puml +++ b/docs/uml/protocol/ParticipantTriggeredByPrimaryData.puml @@ -1,7 +1,7 @@ @startuml -SimScheduler -> PrimaryServiceWorker: ! TriggerWithIdMessage(\n\tActivityStartTrigger(tick),\n\t_,\n\t_) +Scheduler -> PrimaryServiceWorker: ! Activation(\n\tInit_SIM_TICK) PrimaryServiceWorker -> ParticipantAgents: ! ProvisionMessage -PrimaryServiceWorker --> SimScheduler: ! CompletionMessage(triggerId, None) -SimScheduler -> ParticipantAgents: ! TriggerWithIdMessage(\n\tActivityStartTrigger(tick),\n\t_,\n\t_) -ParticipantAgents --> SimScheduler: ! CompletionMessage(triggerId, None) +PrimaryServiceWorker --> Scheduler: ! Completion(\n\tactor,None) +Scheduler -> ParticipantAgents: ! Activation(\n\ttick) +ParticipantAgents --> Scheduler: ! Completion(\n\tactor, newTick) @enduml \ No newline at end of file diff --git a/docs/uml/protocol/ParticipantTriggeredBySecondaryData.puml b/docs/uml/protocol/ParticipantTriggeredBySecondaryData.puml index bf79a7e891..a3837f60fb 100644 --- a/docs/uml/protocol/ParticipantTriggeredBySecondaryData.puml +++ b/docs/uml/protocol/ParticipantTriggeredBySecondaryData.puml @@ -1,10 +1,10 @@ @startuml -SimScheduler -> Services: ! TriggerWithIdMessage(\n\tActivityStartTrigger(tick),\n\t_,\n\t_) +Scheduler -> Services: ! Activation(\n\tINIT_SIM_TICK) Services -> ParticipantAgents: ! ProvideWeatherMessage(\n\ttick,\n\tweatherData,\n\tnextDataTick) -SimScheduler -> ParticipantAgents: ! TriggerWithIdMessage(\n\tActivityStartTrigger(tick),\n\t_,\n\t_) +Scheduler -> ParticipantAgents: ! Activation(\n\ttick) Services -> ParticipantAgents: ! ProvisionMessage Services -> ParticipantAgents: ! ProvisionMessage -Services --> SimScheduler: ! CompletionMessage(triggerId, None) +Services --> Scheduler: ! Completion(\n\tactor, None) ParticipantAgents -> ParticipantAgents: ! StartCalculationTrigger(tick) -ParticipantAgents --> SimScheduler: ! CompletionMessage(triggerId, None) +ParticipantAgents --> Scheduler: ! Completion(\n\tactor, newTick) @enduml \ No newline at end of file diff --git a/src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala b/src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala index ee2d4941ff..0b0ad206e0 100644 --- a/src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala +++ b/src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala @@ -301,7 +301,7 @@ protected trait ParticipantAgentFundamentals[ awaitRegistrationResponsesFrom, ) } else { - /* Determine the next activation tick, create a ScheduleTriggerMessage and remove the recently triggered tick */ + /* Determine the next activation tick, create a ScheduleActivation and remove the recently triggered tick */ val (newTick, nextBaseStateData) = popNextActivationTrigger( baseStateData ) @@ -906,7 +906,7 @@ protected trait ParticipantAgentFundamentals[ updatedState, ) - /* In this case, without secondary data, the agent has been triggered by an ActivityStartTrigger by itself, + /* In this case, without secondary data, the agent has been triggered by an Activation(tick) by itself, * therefore pop the next one */ val baseStateDataWithUpdatedResultStore = baseStateData.copy( diff --git a/src/test/scala/edu/ie3/simona/agent/participant/EvcsAgentModelCalculationSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/EvcsAgentModelCalculationSpec.scala index 06c3e797c0..e4e9f25ff1 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/EvcsAgentModelCalculationSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/EvcsAgentModelCalculationSpec.scala @@ -368,7 +368,7 @@ class EvcsAgentModelCalculationSpec RegistrationSuccessfulMessage(evService.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] evcsAgent.stateName shouldBe Idle @@ -434,7 +434,7 @@ class EvcsAgentModelCalculationSpec RegistrationSuccessfulMessage(evService.ref, Some(0)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(evcsAgent.stateName shouldBe Idle) /* State data is tested in another test */ @@ -568,7 +568,7 @@ class EvcsAgentModelCalculationSpec RegistrationSuccessfulMessage(evService.ref, Some(0)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(evcsAgent.stateName shouldBe Idle) /* State data is tested in another test */ @@ -699,7 +699,7 @@ class EvcsAgentModelCalculationSpec RegistrationSuccessfulMessage(evService.ref, Some(10800)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(evcsAgent.stateName shouldBe Idle) @@ -744,7 +744,7 @@ class EvcsAgentModelCalculationSpec RegistrationSuccessfulMessage(evService.ref, Some(0)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the CompletionM */ scheduler.expectMsgType[Completion] awaitAssert(evcsAgent.stateName shouldBe Idle) @@ -825,7 +825,7 @@ class EvcsAgentModelCalculationSpec RegistrationSuccessfulMessage(evService.ref, Some(0)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(evcsAgent.stateName shouldBe Idle) @@ -903,7 +903,7 @@ class EvcsAgentModelCalculationSpec RegistrationSuccessfulMessage(evService.ref, Some(0)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(evcsAgent.stateName shouldBe Idle) diff --git a/src/test/scala/edu/ie3/simona/agent/participant/FixedFeedInAgentModelCalculationSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/FixedFeedInAgentModelCalculationSpec.scala index 35277823c6..bdaac6d366 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/FixedFeedInAgentModelCalculationSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/FixedFeedInAgentModelCalculationSpec.scala @@ -249,7 +249,7 @@ class FixedFeedInAgentModelCalculationSpec RegistrationFailedMessage(primaryServiceProxy.ref), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] fixedFeedAgent.stateName shouldBe Idle @@ -305,7 +305,7 @@ class FixedFeedInAgentModelCalculationSpec RegistrationFailedMessage(primaryServiceProxy.ref), ) - /* I am not interested in the CompletionMessage */ + /* I am not interested in the Completion */ scheduler.expectMsgType[Completion] awaitAssert(fixedFeedAgent.stateName shouldBe Idle) /* State data is tested in another test */ diff --git a/src/test/scala/edu/ie3/simona/agent/participant/HpAgentModelCalculationSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/HpAgentModelCalculationSpec.scala index 79e64e7a12..3ff4229ab7 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/HpAgentModelCalculationSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/HpAgentModelCalculationSpec.scala @@ -382,7 +382,7 @@ class HpAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] hpAgent.stateName shouldBe Idle @@ -446,7 +446,7 @@ class HpAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(0L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(hpAgent.stateName shouldBe Idle) /* State data is tested in another test */ @@ -577,7 +577,7 @@ class HpAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(0L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(hpAgent.stateName shouldBe Idle) @@ -706,7 +706,7 @@ class HpAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(3600L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(hpAgent.stateName shouldBe Idle) @@ -777,7 +777,7 @@ class HpAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(0L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(hpAgent.stateName shouldBe Idle) diff --git a/src/test/scala/edu/ie3/simona/agent/participant/LoadAgentFixedModelCalculationSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/LoadAgentFixedModelCalculationSpec.scala index ca26c49cb7..a93d492e4b 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/LoadAgentFixedModelCalculationSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/LoadAgentFixedModelCalculationSpec.scala @@ -243,7 +243,7 @@ class LoadAgentFixedModelCalculationSpec RegistrationFailedMessage(primaryServiceProxy.ref), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] loadAgent.stateName shouldBe Idle @@ -299,7 +299,7 @@ class LoadAgentFixedModelCalculationSpec RegistrationFailedMessage(primaryServiceProxy.ref), ) - /* I am not interested in the CompletionMessage */ + /* I am not interested in the Completion */ scheduler.expectMsgType[Completion] awaitAssert(loadAgent.stateName shouldBe Idle) /* State data is tested in another test */ diff --git a/src/test/scala/edu/ie3/simona/agent/participant/LoadAgentProfileModelCalculationSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/LoadAgentProfileModelCalculationSpec.scala index 5790868a44..2e9a180fea 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/LoadAgentProfileModelCalculationSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/LoadAgentProfileModelCalculationSpec.scala @@ -243,7 +243,7 @@ class LoadAgentProfileModelCalculationSpec RegistrationFailedMessage(primaryServiceProxy.ref), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] loadAgent.stateName shouldBe Idle @@ -299,7 +299,7 @@ class LoadAgentProfileModelCalculationSpec RegistrationFailedMessage(primaryServiceProxy.ref), ) - /* I am not interested in the CompletionMessage */ + /* I am not interested in the Completion */ scheduler.expectMsgType[Completion] awaitAssert(loadAgent.stateName shouldBe Idle) /* State data is tested in another test */ diff --git a/src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgent2ListenerSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgent2ListenerSpec.scala index a768fdb73f..b061ae512d 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgent2ListenerSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgent2ListenerSpec.scala @@ -286,7 +286,7 @@ class ParticipantAgent2ListenerSpec /* Trigger the data generation in tick 0 */ scheduler.send(mockAgent, Activation(0)) - /* Appreciate the existence of two CompletionMessages */ + /* Appreciate the existence of two Completion */ scheduler.expectMsg(Completion(mockAgent.toTyped)) /* Ask the agent for average power in tick 3000 */ diff --git a/src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgentExternalSourceSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgentExternalSourceSpec.scala index 79158df7e7..27823d38df 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgentExternalSourceSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgentExternalSourceSpec.scala @@ -247,7 +247,7 @@ class ParticipantAgentExternalSourceSpec RegistrationSuccessfulMessage(primaryServiceProxy.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(mockAgent.stateName shouldBe Idle) @@ -312,7 +312,7 @@ class ParticipantAgentExternalSourceSpec RegistrationSuccessfulMessage(primaryServiceProxy.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(mockAgent.stateName shouldBe Idle) @@ -413,7 +413,7 @@ class ParticipantAgentExternalSourceSpec RegistrationSuccessfulMessage(primaryServiceProxy.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(mockAgent.stateName shouldBe Idle) @@ -508,7 +508,7 @@ class ParticipantAgentExternalSourceSpec RegistrationSuccessfulMessage(primaryServiceProxy.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(mockAgent.stateName shouldBe Idle) @@ -624,7 +624,7 @@ class ParticipantAgentExternalSourceSpec RegistrationSuccessfulMessage(primaryServiceProxy.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(mockAgent.stateName shouldBe Idle) diff --git a/src/test/scala/edu/ie3/simona/agent/participant/PvAgentModelCalculationSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/PvAgentModelCalculationSpec.scala index 9bda1b8b99..4d480f154c 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/PvAgentModelCalculationSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/PvAgentModelCalculationSpec.scala @@ -376,7 +376,7 @@ class PvAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] pvAgent.stateName shouldBe Idle @@ -439,7 +439,7 @@ class PvAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(0L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(pvAgent.stateName shouldBe Idle) /* State data is tested in another test */ @@ -546,7 +546,7 @@ class PvAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(0L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(pvAgent.stateName shouldBe Idle) @@ -651,7 +651,7 @@ class PvAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(3600L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(pvAgent.stateName shouldBe Idle) @@ -722,7 +722,7 @@ class PvAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(0L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(pvAgent.stateName shouldBe Idle) diff --git a/src/test/scala/edu/ie3/simona/agent/participant/WecAgentModelCalculationSpec.scala b/src/test/scala/edu/ie3/simona/agent/participant/WecAgentModelCalculationSpec.scala index 08193e798c..2bcac7bc3c 100644 --- a/src/test/scala/edu/ie3/simona/agent/participant/WecAgentModelCalculationSpec.scala +++ b/src/test/scala/edu/ie3/simona/agent/participant/WecAgentModelCalculationSpec.scala @@ -356,7 +356,7 @@ class WecAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] wecAgent.stateName shouldBe Idle @@ -424,7 +424,7 @@ class WecAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(wecAgent.stateName shouldBe Idle) /* State data is tested in another test */ @@ -546,7 +546,7 @@ class WecAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(wecAgent.stateName shouldBe Idle) @@ -666,7 +666,7 @@ class WecAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(wecAgent.stateName shouldBe Idle) @@ -737,7 +737,7 @@ class WecAgentModelCalculationSpec RegistrationSuccessfulMessage(weatherService.ref, Some(900L)), ) - /* I'm not interested in the content of the CompletionMessage */ + /* I'm not interested in the content of the Completion */ scheduler.expectMsgType[Completion] awaitAssert(wecAgent.stateName shouldBe Idle)