Collection initialization simplified

HakamFostok · Jan 22, 2023 · f6eb07b · f6eb07b
1 parent 2fa67cc
commit f6eb07b
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 37 deletions.
diff --git a/Modbus/Message/ModbusMessageImpl.cs b/Modbus/Message/ModbusMessageImpl.cs
@@ -55,9 +55,10 @@ public byte[] ProtocolDataUnit
     {
         get
         {
-            List<byte> pdu = new();
-
-            pdu.Add(FunctionCode);
+            List<byte> pdu = new()
+            {
+                FunctionCode
+            };
 
             if (ExceptionCode.HasValue)
             {

diff --git a/Modbus/Message/SlaveExceptionResponse.cs b/Modbus/Message/SlaveExceptionResponse.cs
@@ -47,17 +47,18 @@ public override string ToString()
 
     internal static Dictionary<byte, string> CreateExceptionMessages()
     {
-        Dictionary<byte, string> messages = new(9);
-
-        messages.Add(1, Resources.IllegalFunction);
-        messages.Add(2, Resources.IllegalDataAddress);
-        messages.Add(3, Resources.IllegalDataValue);
-        messages.Add(4, Resources.SlaveDeviceFailure);
-        messages.Add(5, Resources.Acknowlege);
-        messages.Add(6, Resources.SlaveDeviceBusy);
-        messages.Add(8, Resources.MemoryParityError);
-        messages.Add(10, Resources.GatewayPathUnavailable);
-        messages.Add(11, Resources.GatewayTargetDeviceFailedToRespond);
+        Dictionary<byte, string> messages = new(9)
+        {
+            { 1, Resources.IllegalFunction },
+            { 2, Resources.IllegalDataAddress },
+            { 3, Resources.IllegalDataValue },
+            { 4, Resources.SlaveDeviceFailure },
+            { 5, Resources.Acknowlege },
+            { 6, Resources.SlaveDeviceBusy },
+            { 8, Resources.MemoryParityError },
+            { 10, Resources.GatewayPathUnavailable },
+            { 11, Resources.GatewayTargetDeviceFailedToRespond }
+        };
 
         return messages;
     }

diff --git a/NModbus4.IntegrationTests/CustomMessages/CustomReadHoldingRegistersRequest.cs b/NModbus4.IntegrationTests/CustomMessages/CustomReadHoldingRegistersRequest.cs
@@ -19,8 +19,7 @@ public byte[] MessageFrame
     {
         get
         {
-            List<byte> frame = new();
-            frame.Add(SlaveAddress);
+            List<byte> frame = new() { SlaveAddress };
             frame.AddRange(ProtocolDataUnit);
 
             return frame.ToArray();
@@ -31,9 +30,10 @@ public byte[] ProtocolDataUnit
     {
         get
         {
-            List<byte> pdu = new();
-
-            pdu.Add(FunctionCode);
+            List<byte> pdu = new()
+            {
+                FunctionCode
+            };
             pdu.AddRange(BitConverter.GetBytes(IPAddress.HostToNetworkOrder((short)StartAddress)));
             pdu.AddRange(BitConverter.GetBytes(IPAddress.HostToNetworkOrder((short)NumberOfPoints)));
 

diff --git a/NModbus4.IntegrationTests/CustomMessages/CustomReadHoldingRegistersResponse.cs b/NModbus4.IntegrationTests/CustomMessages/CustomReadHoldingRegistersResponse.cs
@@ -16,8 +16,10 @@ public byte[] MessageFrame
     {
         get
         {
-            List<byte> frame = new();
-            frame.Add(SlaveAddress);
+            List<byte> frame = new()
+            {
+                SlaveAddress
+            };
             frame.AddRange(ProtocolDataUnit);
 
             return frame.ToArray();
@@ -28,10 +30,11 @@ public byte[] ProtocolDataUnit
     {
         get
         {
-            List<byte> pdu = new();
-
-            pdu.Add(FunctionCode);
-            pdu.Add(ByteCount);
+            List<byte> pdu = new()
+            {
+                FunctionCode,
+                ByteCount
+            };
             pdu.AddRange(_data.NetworkBytes);
 
             return pdu.ToArray();

diff --git a/NModbus4.IntegrationTests/CustomMessages/CustomWriteMultipleRegistersRequest.cs b/NModbus4.IntegrationTests/CustomMessages/CustomWriteMultipleRegistersRequest.cs
@@ -23,8 +23,10 @@ public byte[] MessageFrame
     {
         get
         {
-            List<byte> frame = new();
-            frame.Add(SlaveAddress);
+            List<byte> frame = new()
+            {
+                SlaveAddress
+            };
             frame.AddRange(ProtocolDataUnit);
 
             return frame.ToArray();
@@ -35,9 +37,10 @@ public byte[] ProtocolDataUnit
     {
         get
         {
-            List<byte> pdu = new();
-
-            pdu.Add(FunctionCode);
+            List<byte> pdu = new()
+            {
+                FunctionCode
+            };
             pdu.AddRange(BitConverter.GetBytes(IPAddress.HostToNetworkOrder((short)StartAddress)));
             pdu.AddRange(BitConverter.GetBytes(IPAddress.HostToNetworkOrder((short)NumberOfPoints)));
             pdu.Add(ByteCount);

diff --git a/NModbus4.IntegrationTests/CustomMessages/CustomWriteMultipleRegistersResponse.cs b/NModbus4.IntegrationTests/CustomMessages/CustomWriteMultipleRegistersResponse.cs
@@ -11,8 +11,10 @@ public byte[] MessageFrame
     {
         get
         {
-            List<byte> frame = new();
-            frame.Add(SlaveAddress);
+            List<byte> frame = new()
+            {
+                SlaveAddress
+            };
             frame.AddRange(ProtocolDataUnit);
 
             return frame.ToArray();
@@ -23,9 +25,10 @@ public byte[] ProtocolDataUnit
     {
         get
         {
-            List<byte> pdu = new();
-
-            pdu.Add(FunctionCode);
+            List<byte> pdu = new()
+            {
+                FunctionCode
+            };
             pdu.AddRange(BitConverter.GetBytes(IPAddress.HostToNetworkOrder((short)StartAddress)));
             pdu.AddRange(BitConverter.GetBytes(IPAddress.HostToNetworkOrder((short)NumberOfPoints)));
 

diff --git a/NModbus4.UnitTests/Data/RegisterCollectionFixture.cs b/NModbus4.UnitTests/Data/RegisterCollectionFixture.cs
@@ -53,8 +53,10 @@ public void RegisterCollectionEmpty()
     [Fact]
     public void ModifyRegister()
     {
-        RegisterCollection col = new(1, 2, 3, 4);
-        col[0] = 5;
+        RegisterCollection col = new(1, 2, 3, 4)
+        {
+            [0] = 5
+        };
     }
 
     [Fact]