Fix order of events

net-daemon · Dec 13, 2020 · 92d86b5 · 92d86b5
1 parent 014ddd8
commit 92d86b5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/tests/NetDaemon.Daemon.Tests/Daemon/NetDaemonHostTests.cs b/tests/NetDaemon.Daemon.Tests/Daemon/NetDaemonHostTests.cs
@@ -258,7 +258,6 @@ public async Task SubscribeChangedStateForEntityWillMakeCorrectCallback()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            DefaultHassClientMock.AddChangedEvent("binary_sensor.pir", fromState: "off", toState: "on");
 
             string? reportedState = "";
 
@@ -270,6 +269,7 @@ public async Task SubscribeChangedStateForEntityWillMakeCorrectCallback()
                 return Task.CompletedTask;
             });
 
+            AddChangedEvent("binary_sensor.pir", fromState: "off", toState: "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             // ASSERT
@@ -281,8 +281,6 @@ public async Task SubscribeChangedStateForAllChangesWillMakeCorrectCallbacks()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            DefaultHassClientMock.AddChangedEvent("binary_sensor.pir", fromState: "off", toState: "on");
-            DefaultHassClientMock.AddChangedEvent("light.mylight", fromState: "on", toState: "off");
 
             int nrOfTimesCalled = 0;
 
@@ -294,6 +292,9 @@ public async Task SubscribeChangedStateForAllChangesWillMakeCorrectCallbacks()
                 return Task.CompletedTask;
             });
 
+            AddChangedEvent("binary_sensor.pir", fromState: "off", toState: "on");
+            AddChangedEvent("light.mylight", fromState: "on", toState: "off");
+
             await RunFakeDaemonUntilTimeout();
 
             // ASSERT

diff --git a/tests/NetDaemon.Daemon.Tests/Fluent/FluentTests.cs b/tests/NetDaemon.Daemon.Tests/Fluent/FluentTests.cs
@@ -58,7 +58,6 @@ public async Task EntityOnStateChangedLamdaTurnOnLightCallsCorrectServiceCall()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             DefaultDaemonApp
                 .Entity("binary_sensor.pir")
@@ -67,6 +66,7 @@ public async Task EntityOnStateChangedLamdaTurnOnLightCallsCorrectServiceCall()
                 .TurnOn()
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallServiceTimes("turn_on", Times.Once());
@@ -78,7 +78,6 @@ public async Task EntityOnStateChangedLamdaWithMultipleEntitiesCallsCorrectServi
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             var MotionEnabled = true;
 
@@ -89,6 +88,7 @@ public async Task EntityOnStateChangedLamdaWithMultipleEntitiesCallsCorrectServi
                 .Toggle()
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallServiceTimes("toggle", Times.Once());
@@ -100,7 +100,6 @@ public async Task OneEntityWithSeveralShouldCallsCorrectServiceCall()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             DefaultDaemonApp
                 .Entity("binary_sensor.pir")
@@ -109,6 +108,7 @@ public async Task OneEntityWithSeveralShouldCallsCorrectServiceCall()
                 .Toggle()
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallServiceTimes("toggle", Times.Once());
@@ -121,17 +121,18 @@ public async Task EntityOnStateChangedMultipleTimesCallsCorrectServiceCall()
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
 
-            AddChangedEvent("binary_sensor.pir", "off", "on");
-            AddChangedEvent("binary_sensor.pir", "off", "on");
-
             DefaultDaemonApp
-                .Entity("binary_sensor.pir")
-                .WhenStateChange("on")
-                .UseEntity("light.correct_entity")
-                .TurnOn()
-                .Execute();
+           .Entity("binary_sensor.pir")
+           .WhenStateChange("on")
+           .UseEntity("light.correct_entity")
+           .TurnOn()
+           .Execute();
+
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
+
             VerifyCallServiceTimes("turn_on", Times.Exactly(2));
             VerifyCallServiceTuple("light", "turn_on",
                 ("entity_id", "light.correct_entity"));
@@ -142,7 +143,6 @@ public async Task EntityOnStateChangedTurnOnLightCallsCorrectServiceCall()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             DefaultDaemonApp
                 .Entity("binary_sensor.pir")
@@ -151,6 +151,7 @@ public async Task EntityOnStateChangedTurnOnLightCallsCorrectServiceCall()
                 .TurnOn()
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallServiceTimes("turn_on", Times.Once());
@@ -162,7 +163,6 @@ public async Task EntityOnStateChangedEntitiesTurnOnLightCallsCorrectServiceCall
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             DefaultDaemonApp
                 .Entity("binary_sensor.pir")
@@ -171,6 +171,7 @@ public async Task EntityOnStateChangedEntitiesTurnOnLightCallsCorrectServiceCall
                 .TurnOn()
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallServiceTimes("turn_on", Times.Once());
@@ -183,7 +184,6 @@ public async Task EntityOnStateChangedEntitiesLambdaTurnOnLightCallsCorrectServi
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
 
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
 
             // Fake the
@@ -199,6 +199,7 @@ public async Task EntityOnStateChangedEntitiesLambdaTurnOnLightCallsCorrectServi
                 .TurnOn()
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallServiceTimes("turn_on", Times.Once());
@@ -211,7 +212,6 @@ public async Task EntityOnStateChangedTurnOnLightCallsCorrectServiceCallButNoTur
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
 
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             DefaultDaemonApp
                 .Entity("binary_sensor.pir")
@@ -227,6 +227,7 @@ public async Task EntityOnStateChangedTurnOnLightCallsCorrectServiceCallButNoTur
                 .TurnOff()
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallServiceTimes("turn_on", Times.Once());
@@ -240,7 +241,6 @@ public async Task EntityOnStateChangedTurnOnLightWithAttributesCallsCorrectServi
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             DefaultDaemonApp
                 .Entity("binary_sensor.pir")
@@ -250,6 +250,8 @@ public async Task EntityOnStateChangedTurnOnLightWithAttributesCallsCorrectServi
                 .WithAttribute("transition", 0)
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
+
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallServiceTimes("turn_on", Times.Once());
@@ -263,7 +265,6 @@ public async Task EntityOnStateDefaultTriggerOnAnyStateChange()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             var triggered = false;
 
@@ -278,6 +279,8 @@ public async Task EntityOnStateDefaultTriggerOnAnyStateChange()
                 })
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
+
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
             // ASSERT
             Assert.True(triggered);
@@ -288,7 +291,6 @@ public async Task EntityOnStateNotTriggerOnSameState()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "off");
 
             var triggered = false;
 
@@ -303,6 +305,8 @@ public async Task EntityOnStateNotTriggerOnSameState()
                 })
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "off");
+
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             // ASSERT
@@ -314,7 +318,6 @@ public async Task EntityOnStateIncludeAttributesTriggerOnSameState()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "off");
 
             var triggered = false;
 
@@ -329,6 +332,7 @@ public async Task EntityOnStateIncludeAttributesTriggerOnSameState()
                 })
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "off");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
             // ASSERT
             Assert.True(triggered);
@@ -548,7 +552,6 @@ public async Task EntityOnStateCallFunction()
         {
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             string? actualToState = "";
             string? actualFromState = "";
@@ -563,6 +566,7 @@ public async Task EntityOnStateCallFunction()
                     return Task.CompletedTask;
                 }).Execute();
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             Assert.Equal("on", actualToState);
@@ -573,9 +577,8 @@ public async Task EntityOnStateCallFunction()
         [Fact]
         public async Task EntityOnStateTriggerScript()
         {
-            await InitializeFakeDaemon().ConfigureAwait(false);
             // ARRANGE
-            AddChangedEvent("binary_sensor.pir", "on", "off");
+            await InitializeFakeDaemon().ConfigureAwait(false);
 
             // ACT
             DefaultDaemonApp
@@ -584,6 +587,7 @@ public async Task EntityOnStateTriggerScript()
                 .RunScript("thescript")
                 .Execute();
 
+            AddChangedEvent("binary_sensor.pir", "on", "off");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             VerifyCallService("script", "thescript", false);
@@ -787,14 +791,13 @@ await DefaultDaemonApp
         public async Task EntityDelayUntilStateChangeShouldReturnTrue()
         {
             // ARRANGE
-
             await InitializeFakeDaemon().ConfigureAwait(false);
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             var delayResult = DefaultDaemonApp
                 .Entity("binary_sensor.pir")
                 .DelayUntilStateChange(to: "on");
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             Assert.True(delayResult.Task.IsCompletedSuccessfully);
@@ -807,12 +810,12 @@ public async Task EntityDelayUntilStateChangeLamdaShouldReturnTrue()
             // ARRANGE
             await InitializeFakeDaemon().ConfigureAwait(false);
 
-            AddChangedEvent("binary_sensor.pir", "off", "on");
 
             var delayResult = DefaultDaemonApp
                 .Entity("binary_sensor.pir")
                 .DelayUntilStateChange((to, _) => to?.State == "on");
 
+            AddChangedEvent("binary_sensor.pir", "off", "on");
             await RunFakeDaemonUntilTimeout().ConfigureAwait(false);
 
             Assert.True(delayResult.Task.IsCompletedSuccessfully);