am-wd/AMWD.Protocols.Modbus
1
0
Fork 0
Code Issues Actions Activity

Updated to .NET 10
Some checks failed
Branch Build / build-test-deploy (push) Failing after 1m12s
Details

Browse Source
This commit is contained in:
Andreas Müller
2026-01-12 18:32:15 +01:00
parent f7978c6277
commit 42af5a06f2
21 changed files with 353 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/AMWD.Protocols.Modbus.Tests/Common/Protocols/AsciiProtocolTest.cs
View File

@@ -67,7 +67,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(coils);
Assert.AreEqual(24, coils.Count);
Assert.HasCount(24, coils);
for (int i = 0; i < 24; i++)
{
@@ -155,7 +155,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(discreteInputs);
Assert.AreEqual(24, discreteInputs.Count);
Assert.HasCount(24, discreteInputs);
for (int i = 0; i < 24; i++)
{
@@ -241,7 +241,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(0, registers[0].Address);
Assert.AreEqual(555, registers[0].Value);
@@ -323,7 +323,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(0, registers[0].Address);
Assert.AreEqual(555, registers[0].Value);
@@ -403,7 +403,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
Assert.AreEqual(moreAndIndividual, result.MoreRequestsNeeded);
Assert.AreEqual(moreAndIndividual ? 0x05 : 0x00, result.NextObjectIdToRequest);
Assert.AreEqual(1, result.Objects.Count);
Assert.HasCount(1, result.Objects);
Assert.AreEqual(4, result.Objects.First().Key);
CollectionAssert.AreEqual("AM"u8.ToArray(), result.Objects.First().Value);
}

28
test/AMWD.Protocols.Modbus.Tests/Common/Protocols/RtuOverTcpProtocolTest.cs
View File

@@ -21,7 +21,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(14, bytes.Count);
Assert.HasCount(14, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -85,7 +85,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(coils);
Assert.AreEqual(24, coils.Count);
Assert.HasCount(24, coils);
for (int i = 0; i < 24; i++)
{
@@ -123,7 +123,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(14, bytes.Count);
Assert.HasCount(14, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -187,7 +187,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(discreteInputs);
Assert.AreEqual(24, discreteInputs.Count);
Assert.HasCount(24, discreteInputs);
for (int i = 0; i < 24; i++)
{
@@ -225,7 +225,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(14, bytes.Count);
Assert.HasCount(14, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -288,7 +288,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(0, registers[0].Address);
Assert.AreEqual(555, registers[0].Value);
@@ -322,7 +322,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(14, bytes.Count);
Assert.HasCount(14, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -385,7 +385,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(0, registers[0].Address);
Assert.AreEqual(555, registers[0].Value);
@@ -423,7 +423,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(13, bytes.Count);
Assert.HasCount(13, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -483,7 +483,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
Assert.AreEqual(moreAndIndividual, result.MoreRequestsNeeded);
Assert.AreEqual(moreAndIndividual ? 0x05 : 0x00, result.NextObjectIdToRequest);
Assert.AreEqual(1, result.Objects.Count);
Assert.HasCount(1, result.Objects);
Assert.AreEqual(4, result.Objects.First().Key);
CollectionAssert.AreEqual("AM"u8.ToArray(), result.Objects.First().Value);
}
@@ -526,7 +526,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(14, result.Count);
Assert.HasCount(14, result);
// Transaction id
Assert.AreEqual(0x00, result[0]);
@@ -599,7 +599,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(14, result.Count);
Assert.HasCount(14, result);
// Transaction id
Assert.AreEqual(0x00, result[0]);
@@ -679,7 +679,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(16, result.Count);
Assert.HasCount(16, result);
// Transaction id
Assert.AreEqual(0x00, result[0]);
@@ -807,7 +807,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(19, result.Count);
Assert.HasCount(19, result);
// Transaction id
Assert.AreEqual(0x00, result[0]);

26
test/AMWD.Protocols.Modbus.Tests/Common/Protocols/RtuProtocolTest.cs
View File

@@ -21,7 +21,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(8, bytes.Count);
Assert.HasCount(8, bytes);
// Unit id
Assert.AreEqual(UNIT_ID, bytes[0]);
@@ -73,7 +73,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(coils);
Assert.AreEqual(24, coils.Count);
Assert.HasCount(24, coils);
for (int i = 0; i < 24; i++)
{
@@ -111,7 +111,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(8, bytes.Count);
Assert.HasCount(8, bytes);
// Unit id
Assert.AreEqual(UNIT_ID, bytes[0]);
@@ -163,7 +163,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(coils);
Assert.AreEqual(24, coils.Count);
Assert.HasCount(24, coils);
for (int i = 0; i < 24; i++)
{
@@ -201,7 +201,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(8, bytes.Count);
Assert.HasCount(8, bytes);
// Unit id
Assert.AreEqual(UNIT_ID, bytes[0]);
@@ -252,7 +252,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(0, registers[0].Address);
Assert.AreEqual(555, registers[0].Value);
@@ -286,7 +286,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(8, bytes.Count);
Assert.HasCount(8, bytes);
// Unit id
Assert.AreEqual(UNIT_ID, bytes[0]);
@@ -337,7 +337,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(0, registers[0].Address);
Assert.AreEqual(555, registers[0].Value);
@@ -375,7 +375,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(7, bytes.Count);
Assert.HasCount(7, bytes);
// Unit id
Assert.AreEqual(UNIT_ID, bytes[0]);
@@ -466,7 +466,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(8, result.Count);
Assert.HasCount(8, result);
// Unit id
Assert.AreEqual(UNIT_ID, result[0]);
@@ -527,7 +527,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(8, result.Count);
Assert.HasCount(8, result);
// Unit id
Assert.AreEqual(UNIT_ID, result[0]);
@@ -595,7 +595,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(10, result.Count);
Assert.HasCount(10, result);
// Unit id
Assert.AreEqual(UNIT_ID, result[0]);
@@ -711,7 +711,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(13, result.Count);
Assert.HasCount(13, result);
// Unit id
Assert.AreEqual(UNIT_ID, result[0]);

26
test/AMWD.Protocols.Modbus.Tests/Common/Protocols/TcpProtocolTest.cs
View File

@@ -21,7 +21,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(12, bytes.Count);
Assert.HasCount(12, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -83,7 +83,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(coils);
Assert.AreEqual(24, coils.Count);
Assert.HasCount(24, coils);
for (int i = 0; i < 24; i++)
{
@@ -121,7 +121,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(12, bytes.Count);
Assert.HasCount(12, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -183,7 +183,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(inputs);
Assert.AreEqual(24, inputs.Count);
Assert.HasCount(24, inputs);
for (int i = 0; i < 24; i++)
{
@@ -221,7 +221,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(12, bytes.Count);
Assert.HasCount(12, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -282,7 +282,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(0, registers[0].Address);
Assert.AreEqual(555, registers[0].Value);
@@ -316,7 +316,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(12, bytes.Count);
Assert.HasCount(12, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -377,7 +377,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(0, registers[0].Address);
Assert.AreEqual(554, registers[0].Value);
@@ -415,7 +415,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(bytes);
Assert.AreEqual(11, bytes.Count);
Assert.HasCount(11, bytes);
// Transaction id
Assert.AreEqual(0x00, bytes[0]);
@@ -516,7 +516,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(12, result.Count);
Assert.HasCount(12, result);
// Transaction id
Assert.AreEqual(0x00, result[0]);
@@ -587,7 +587,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(12, result.Count);
Assert.HasCount(12, result);
// Transaction id
Assert.AreEqual(0x00, result[0]);
@@ -665,7 +665,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(14, result.Count);
Assert.HasCount(14, result);
// Transaction id
Assert.AreEqual(0x00, result[0]);
@@ -791,7 +791,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Protocols
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(17, result.Count);
Assert.HasCount(17, result);
// Transaction id
Assert.AreEqual(0x00, result[0]);