Improve error handling (#11)

* Improve error handling * Throw * wip
NecatiMeral · Jul 12, 2024 · 45b2c19 · 45b2c19
1 parent 40ee0d1
commit 45b2c19
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 9 deletions.
diff --git a/dotnet/src/NecatiMeral.Logic.Meltem/MeltemNodeBase.cs b/dotnet/src/NecatiMeral.Logic.Meltem/MeltemNodeBase.cs
@@ -78,15 +78,15 @@ protected virtual string GetDiagnosticsMessage(Exception ex)
 
     protected void ExecuteWithConnection(Action<ModbusClient> action)
     {
-        _client.Connect(IPAddress.Value, Port.Value);
-        _client.UnitIdentifier = (byte)UnitId.Value;
-        if (!_client.Connected)
-        {
-            return;
-        }
-
         try
         {
+            _client.Connect(IPAddress.Value, Port.Value);
+            _client.UnitIdentifier = (byte)UnitId.Value;
+            if (!_client.Connected)
+            {
+                throw new InvalidOperationException("Connection failed");
+            }
+
             action(_client);
         }
         finally

diff --git a/dotnet/test/NecatiMeral.LogicNodes.Meltem.Tests/GetVentilationNodeTests.cs b/dotnet/test/NecatiMeral.LogicNodes.Meltem.Tests/GetVentilationNodeTests.cs
@@ -43,4 +43,23 @@ public void Should_Get_Unbalanced_Ventilation()
         // Assert
         Sut.VentilationPercentage.Value.ShouldBe(50);
     }
+
+    [Fact]
+    public void Should_Handle_Errors()
+    {
+        // Arrange
+        var node = CreateNode();
+
+        ConfigureMeltemNode(node);
+        node.Port.Value = 99999;
+        node.Action.Value = GetDeviceAction.GetVentilationPercent;
+        node.Trigger.Value = true;
+
+        // Act
+        node.Execute();
+
+        // Assert
+        node.VentilationPercentage.Value.ShouldBe(0);
+        node.Diagnostics.Value.ShouldContain("Exception");
+    }
 }
diff --git a/dotnet/test/NecatiMeral.LogicNodes.Meltem.Tests/SetVentilationNodeTests.cs b/dotnet/test/NecatiMeral.LogicNodes.Meltem.Tests/SetVentilationNodeTests.cs
@@ -11,7 +11,7 @@ public SetVentilationNodeTests(ITestOutputHelper testOutputHelper)
     }
 
     [Fact]
-    public void Should_Set_Balanced_Ventilation()
+    public void Should_Set_Balanced_Ventilation_Percent()
     {
         // Arrange
         Sut.Action.Value = SetDeviceAction.SetBalancedVentilationPercent;
@@ -21,14 +21,16 @@ public void Should_Set_Balanced_Ventilation()
         Sut.Execute();
 
         // Assert
+        Sut.Output.Value.ShouldBe(100);
+
         var registers = Server.GetHoldingRegisters((byte)UnitIdentifier);
         registers[MeltemRegisters.InitSetVentilation].ShouldBe((short)768);
         registers[MeltemRegisters.SetVentilation1].ShouldBe((short)-14336);
         registers[MeltemRegisters.ApplyVentilation].ShouldBe((short)0);
     }
 
     [Fact]
-    public void Should_Set_Unbalanced_Ventilation()
+    public void Should_Set_Unbalanced_Ventilation_Percent()
     {
         // Arrange
         Sut.Action.Value = SetDeviceAction.SetUnbalancedVentilationPercent;
@@ -39,10 +41,31 @@ public void Should_Set_Unbalanced_Ventilation()
         Sut.Execute();
 
         // Assert
+        Sut.Output.Value.ShouldBe(150);
+
         var registers = Server.GetHoldingRegisters((byte)UnitIdentifier);
         registers[MeltemRegisters.InitSetVentilation].ShouldBe((short)1024);
         registers[MeltemRegisters.SetVentilation1].ShouldBe((short)25600);
         registers[MeltemRegisters.SetVentilation2].ShouldBe((short)-14336);
         registers[MeltemRegisters.ApplyVentilation].ShouldBe((short)0);
     }
+
+    [Fact]
+    public void Should_Set_Balanced_Ventilation_Numeric()
+    {
+        // Arrange
+        Sut.Action.Value = SetDeviceAction.SetBalancedVentilationNumeric;
+        Sut.BalancedVentilationLevelNumeric.Value = 5;
+
+        // Act
+        Sut.Execute();
+
+        // Assert
+        Sut.Output.Value.ShouldBe(5);
+
+        var registers = Server.GetHoldingRegisters((byte)UnitIdentifier);
+        registers[MeltemRegisters.InitSetVentilation].ShouldBe((short)768);
+        registers[MeltemRegisters.SetVentilation1].ShouldBe((short)-14336);
+        registers[MeltemRegisters.ApplyVentilation].ShouldBe((short)0);
+    }
 }