Cleanup

DMXControl · Mar 17, 2024 · 5b560a5 · 5b560a5
1 parent 8d536ce
commit 5b560a5
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 31 deletions.
diff --git a/RDMSharp/RDM/Device/AbstractGeneratedRDMDevice.cs b/RDMSharp/RDM/Device/AbstractGeneratedRDMDevice.cs
@@ -1,4 +1,5 @@
-using RDMSharp.ParameterWrapper;
+using Microsoft.Extensions.Logging;
+using RDMSharp.ParameterWrapper;
 using System;
 using System.Collections.Concurrent;
 using System.Linq;
@@ -312,6 +313,7 @@ protected override bool OnUpdateParametrerValueCache(ERDM_Parameter parameter, o
             }
             catch (Exception e)
             {
+                Logger?.LogError(e, string.Empty);
                 return false;
             }
             return true;

diff --git a/RDMSharp/RDM/Device/AbstractRDMDevice.cs b/RDMSharp/RDM/Device/AbstractRDMDevice.cs
@@ -453,7 +453,7 @@ when setParameterWrapperRequestContravarianceFloat.SetRequestParameterDataToObje
             }
             catch (Exception e)
             {
-
+                Logger?.LogError(e, string.Empty);
             }
         FAIL:
 

diff --git a/RDMSharp/RDM/RDMMessage.cs b/RDMSharp/RDM/RDMMessage.cs
@@ -345,9 +345,7 @@ public object Value
                 }
                 catch (Exception ex)
                 {
-#if DEBUG
                     Logger?.LogError(string.Empty, ex);
-#endif
                     return null;
                 }
             }
@@ -457,23 +455,6 @@ public override int GetHashCode()
                     result = (result * 31) ^ b;
                 return result;
             }
-            //int hashCode = 1518318531;
-            //hashCode = hashCode * -1521134295 + MessageLength.GetHashCode();
-            //hashCode = hashCode * -1521134295 + SourceUID.GetHashCode();
-            //hashCode = hashCode * -1521134295 + DestUID.GetHashCode();
-            //hashCode = hashCode * -1521134295 + TransactionCounter.GetHashCode();
-            //hashCode = hashCode * -1521134295 + PortID_or_Responsetype.GetHashCode();
-            //hashCode = hashCode * -1521134295 + MessageCounter.GetHashCode();
-            //hashCode = hashCode * -1521134295 + SubDevice.GetHashCode();
-            //hashCode = hashCode * -1521134295 + Command.GetHashCode();
-            //hashCode = hashCode * -1521134295 + Parameter.GetHashCode();
-            //hashCode = hashCode * -1521134295 + EqualityComparer<ERDM_NackReason[]>.Default.GetHashCode(NackReason);
-            //hashCode = hashCode * -1521134295 + PDL.GetHashCode();
-            //hashCode = hashCode * -1521134295 + EqualityComparer<byte[]>.Default.GetHashCode(ParameterData);
-            //hashCode = hashCode * -1521134295 + Checksum.GetHashCode();
-            //hashCode = hashCode * -1521134295 + IsAck.GetHashCode();
-            //hashCode = hashCode * -1521134295 + EqualityComparer<object>.Default.GetHashCode(Value);
-            //return hashCode;
         }
     }
 }
diff --git a/RDMSharpTests/Devices/Mock/SendReceivePipelineImitateRealConditions.cs b/RDMSharpTests/Devices/Mock/SendReceivePipelineImitateRealConditions.cs
@@ -29,8 +29,10 @@ public static async Task RDMMessageSend(RDMMessage rdmMessage)
                     var combined = new byte[Math.Max(newData.Length, oldData?.Length ?? 0)];
                     for (int i = 0; i < combined.Length; i++)
                     {
-                        byte n = (byte)(newData.Length > i ? newData[i] : 0);
-                        byte o = (byte)((oldData?.Length ?? 0) > i ? oldData[i] : 0);
+                        byte n = (byte)(newData.Length > i ? newData[i] : 0);
+#pragma warning disable CS8602 // Dereferenzierung eines möglichen Nullverweises.
+                        byte o = (byte)((oldData?.Length ?? 0) > i ? oldData[i] : 0);
+#pragma warning restore CS8602 // Dereferenzierung eines möglichen Nullverweises.
                         combined[i] = (byte)(n | o);
                     }
                     data = combined;

diff --git a/RDMSharpTests/Devices/TestRDMDiscovery.cs b/RDMSharpTests/Devices/TestRDMDiscovery.cs
@@ -5,8 +5,8 @@ namespace RDMSharpTest.RDM.Devices
     public class TestRDMDiscovery
     {
         private List<MockGeneratedDevice1> mockDevices = new List<MockGeneratedDevice1>();
-        private MockDiscoveryTool mockDiscoveryTool;
-        private List<RDMUID> expected;
+        private MockDiscoveryTool? mockDiscoveryTool;
+        private List<RDMUID>? expected;
         [SetUp]
         public void Setup()
         {
@@ -39,6 +39,11 @@ public void Report(RDMDiscoveryStatus value)
 
         private async Task AssertDiscovery(bool full = true)
         {
+            if (mockDiscoveryTool == null)
+                Assert.Fail($"{nameof(mockDiscoveryTool)} is null");
+            if (expected == null)
+                Assert.Fail($"{nameof(expected)} is null");
+
             foreach (var m in mockDevices)
                 m.ImitateRealConditions = true;
             var progress = new DiscoveryProgress();
@@ -51,10 +56,10 @@ private async Task AssertDiscovery(bool full = true)
                 Console.WriteLine(e.ToString());
             };
             Assert.That(progress.status.RangeDoneInPercent, Is.EqualTo(0));
-            var res = await mockDiscoveryTool.PerformDiscovery(progress, full);
-            Assert.That(res, Is.EquivalentTo(expected));
-            Assert.That(progress.status.MessageCount, Is.AtLeast(expected.Count * 3));
-            Assert.That(progress.status.FoundDevices, Is.EqualTo(expected.Count));
+            var res = await mockDiscoveryTool!.PerformDiscovery(progress, full);
+            Assert.That(res, Is.EquivalentTo(expected!));
+            Assert.That(progress.status.MessageCount, Is.AtLeast(expected!.Count * 3));
+            Assert.That(progress.status.FoundDevices, Is.EqualTo(expected!.Count));
             Assert.That(progress.status.RangeLeftToSearch, Is.EqualTo(0));
             Assert.That(progress.status.RangeDoneInPercent, Is.EqualTo(1));
         }

diff --git a/RDMSharpTests/RDM/ParameterWrappersTest.cs b/RDMSharpTests/RDM/ParameterWrappersTest.cs
@@ -577,7 +577,7 @@ object getValue(Type type)
                 #endregion
 
                 Assert.Warn(type.Name);
-                return null;
+                throw new Exception();
             }
         }
 

diff --git a/RDMSharpTests/RDM/UpdateManufacturerList.cs b/RDMSharpTests/RDM/UpdateManufacturerList.cs
@@ -12,6 +12,7 @@ public void Setup()
         [Test]
         public async Task UpdateManufacturerListMethode()
         {
+            return; //Disabled for now
             using (var client = new HttpClient())
             {
                 var website = await client.GetStringAsync("https://tsp.esta.org/tsp/working_groups/CP/mfctrIDs.php");

diff --git a/RDMSharpTests/TestManyObjects.cs b/RDMSharpTests/TestManyObjects.cs
@@ -38,7 +38,6 @@ public void TestSubDevice()
                 subdevices.Add(new SubDevice(i));
             subdevices.Add(SubDevice.Broadcast);
 
-            ushort index = 0;
             SubDevice? prev = null;
             HashSet<SubDevice> hashSet= new HashSet<SubDevice>();
             foreach (SubDevice sd in subdevices)
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 catch (Exception e)
                 {
+                    Logger?.LogError(e, string.Empty);
                 }
             FAIL:
@@ Expand Down @@