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

Updated to .NET 10
All checks were successful
Branch Build / build-test-deploy (push) Successful in 1m49s
Details

Browse Source
This commit is contained in:
Andreas Müller
2026-01-12 18:32:15 +01:00
parent f7978c6277
commit 283eee556f
26 changed files with 366 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
test/AMWD.Protocols.Modbus.Tests/Common/Contracts/ModbusClientBaseTest.cs
View File

@@ -8,6 +8,8 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
[TestClass]
public class ModbusClientBaseTest
{
public TestContext TestContext { get; set; }
// Consts
private const byte UNIT_ID = 42;
private const ushort START_ADDRESS = 123;
@@ -158,7 +160,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
client.Dispose();
// Act + Assert
await Assert.ThrowsExactlyAsync<ObjectDisposedException>(() => client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT));
await Assert.ThrowsExactlyAsync<ObjectDisposedException>(() => client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT, TestContext.CancellationToken));
}
[TestMethod]
@@ -169,7 +171,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
client.Protocol = null;
// Act + Assert
await Assert.ThrowsExactlyAsync<ArgumentNullException>(() => client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT));
await Assert.ThrowsExactlyAsync<ArgumentNullException>(() => client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT, TestContext.CancellationToken));
}
#endregion Common/Connection/Assertions
@@ -184,11 +186,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
var result = await client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT);
var result = await client.ReadCoilsAsync(UNIT_ID, START_ADDRESS, READ_COUNT, TestContext.CancellationToken);
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(READ_COUNT, result.Count);
Assert.HasCount(READ_COUNT, result);
for (int i = 0; i < READ_COUNT; i++)
{
@@ -213,11 +215,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
var result = await client.ReadDiscreteInputsAsync(UNIT_ID, START_ADDRESS, READ_COUNT);
var result = await client.ReadDiscreteInputsAsync(UNIT_ID, START_ADDRESS, READ_COUNT, TestContext.CancellationToken);
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(READ_COUNT, result.Count);
Assert.HasCount(READ_COUNT, result);
for (int i = 0; i < READ_COUNT; i++)
{
@@ -241,11 +243,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
var result = await client.ReadHoldingRegistersAsync(UNIT_ID, START_ADDRESS, READ_COUNT);
var result = await client.ReadHoldingRegistersAsync(UNIT_ID, START_ADDRESS, READ_COUNT, TestContext.CancellationToken);
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(READ_COUNT, result.Count);
Assert.HasCount(READ_COUNT, result);
for (int i = 0; i < READ_COUNT; i++)
{
@@ -269,11 +271,11 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
var result = await client.ReadInputRegistersAsync(UNIT_ID, START_ADDRESS, READ_COUNT);
var result = await client.ReadInputRegistersAsync(UNIT_ID, START_ADDRESS, READ_COUNT, TestContext.CancellationToken);
// Assert
Assert.IsNotNull(result);
Assert.AreEqual(READ_COUNT, result.Count);
Assert.HasCount(READ_COUNT, result);
for (int i = 0; i < READ_COUNT; i++)
{
@@ -297,7 +299,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
var result = await client.ReadDeviceIdentificationAsync(UNIT_ID, ModbusDeviceIdentificationCategory.Basic, ModbusDeviceIdentificationObject.VendorName);
var result = await client.ReadDeviceIdentificationAsync(UNIT_ID, ModbusDeviceIdentificationCategory.Basic, ModbusDeviceIdentificationObject.VendorName, TestContext.CancellationToken);
// Assert
Assert.IsNotNull(result);
@@ -310,7 +312,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
Assert.AreEqual("UnitTests", result.ModelName);
Assert.AreEqual("Modbus Client Base Unit Test", result.UserApplicationName);
Assert.AreEqual(0, result.ExtendedObjects.Count);
Assert.IsEmpty(result.ExtendedObjects);
_connection.Verify(c => c.InvokeAsync(It.IsAny<IReadOnlyList<byte>>(), It.IsAny<Func<IReadOnlyList<byte>, bool>>(), It.IsAny<CancellationToken>()), Times.Once);
_connection.VerifyNoOtherCalls();
@@ -340,7 +342,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
var result = await client.ReadDeviceIdentificationAsync(UNIT_ID, ModbusDeviceIdentificationCategory.Extended, ModbusDeviceIdentificationObject.VendorName);
var result = await client.ReadDeviceIdentificationAsync(UNIT_ID, ModbusDeviceIdentificationCategory.Extended, ModbusDeviceIdentificationObject.VendorName, TestContext.CancellationToken);
// Assert
Assert.IsNotNull(result);
@@ -353,7 +355,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
Assert.AreEqual("UnitTests", result.ModelName);
Assert.AreEqual("Modbus Client Base Unit Test", result.UserApplicationName);
Assert.AreEqual(1, result.ExtendedObjects.Count);
Assert.HasCount(1, result.ExtendedObjects);
Assert.AreEqual(0x07, result.ExtendedObjects.First().Key);
CollectionAssert.AreEqual(new byte[] { 0x01, 0x02, 0x03 }, result.ExtendedObjects.First().Value);
@@ -383,7 +385,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteSingleCoilAsync(UNIT_ID, coil);
bool result = await client.WriteSingleCoilAsync(UNIT_ID, coil, TestContext.CancellationToken);
// Assert
Assert.IsTrue(result);
@@ -409,7 +411,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteSingleCoilAsync(UNIT_ID, coil);
bool result = await client.WriteSingleCoilAsync(UNIT_ID, coil, TestContext.CancellationToken);
// Assert
Assert.IsFalse(result);
@@ -435,7 +437,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteSingleCoilAsync(UNIT_ID, coil);
bool result = await client.WriteSingleCoilAsync(UNIT_ID, coil, TestContext.CancellationToken);
// Assert
Assert.IsFalse(result);
@@ -461,7 +463,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteSingleHoldingRegisterAsync(UNIT_ID, register);
bool result = await client.WriteSingleHoldingRegisterAsync(UNIT_ID, register, TestContext.CancellationToken);
// Assert
Assert.IsTrue(result);
@@ -487,7 +489,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteSingleHoldingRegisterAsync(UNIT_ID, register);
bool result = await client.WriteSingleHoldingRegisterAsync(UNIT_ID, register, TestContext.CancellationToken);
// Assert
Assert.IsFalse(result);
@@ -513,7 +515,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteSingleHoldingRegisterAsync(UNIT_ID, register);
bool result = await client.WriteSingleHoldingRegisterAsync(UNIT_ID, register, TestContext.CancellationToken);
// Assert
Assert.IsFalse(result);
@@ -543,7 +545,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteMultipleCoilsAsync(UNIT_ID, coils);
bool result = await client.WriteMultipleCoilsAsync(UNIT_ID, coils, TestContext.CancellationToken);
// Assert
Assert.IsTrue(result);
@@ -574,7 +576,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteMultipleCoilsAsync(UNIT_ID, coils);
bool result = await client.WriteMultipleCoilsAsync(UNIT_ID, coils, TestContext.CancellationToken);
// Assert
Assert.IsFalse(result);
@@ -605,7 +607,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteMultipleCoilsAsync(UNIT_ID, coils);
bool result = await client.WriteMultipleCoilsAsync(UNIT_ID, coils, TestContext.CancellationToken);
// Assert
Assert.IsFalse(result);
@@ -635,7 +637,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteMultipleHoldingRegistersAsync(UNIT_ID, registers);
bool result = await client.WriteMultipleHoldingRegistersAsync(UNIT_ID, registers, TestContext.CancellationToken);
// Assert
Assert.IsTrue(result);
@@ -666,7 +668,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteMultipleHoldingRegistersAsync(UNIT_ID, registers);
bool result = await client.WriteMultipleHoldingRegistersAsync(UNIT_ID, registers, TestContext.CancellationToken);
// Assert
Assert.IsFalse(result);
@@ -697,7 +699,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Contracts
var client = GetClient();
// Act
bool result = await client.WriteMultipleHoldingRegistersAsync(UNIT_ID, registers);
bool result = await client.WriteMultipleHoldingRegistersAsync(UNIT_ID, registers, TestContext.CancellationToken);
// Assert
Assert.IsFalse(result);

8
test/AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusDecimalExtensionsTest.cs
View File

@@ -206,7 +206,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(5, registers[0].Address);
Assert.AreEqual(0x41, registers[0].HighByte);
@@ -228,7 +228,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(6, registers[0].Address);
Assert.AreEqual(0x41, registers[0].HighByte);
@@ -250,7 +250,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(4, registers.Count);
Assert.HasCount(4, registers);
Assert.AreEqual(5, registers[0].Address);
Assert.AreEqual(0x40, registers[0].HighByte);
@@ -280,7 +280,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(4, registers.Count);
Assert.HasCount(4, registers);
Assert.AreEqual(8, registers[0].Address);
Assert.AreEqual(0x40, registers[0].HighByte);

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

@@ -172,7 +172,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
// Assert
Assert.IsNotNull(register);
Assert.AreEqual(321, register.Address);
Assert.IsTrue(register.Value > 0);
Assert.IsGreaterThan(0, register.Value);
}
[TestMethod]
@@ -187,7 +187,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
// Assert
Assert.IsNotNull(register);
Assert.AreEqual(321, register.Address);
Assert.IsTrue(register.Value == 0);
Assert.AreEqual(0, register.Value);
}
[TestMethod]
@@ -201,7 +201,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(100, registers[0].Address);
Assert.AreEqual(97, registers[0].HighByte);
@@ -223,7 +223,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(101, registers[0].Address);
Assert.AreEqual(97, registers[0].HighByte);
@@ -245,7 +245,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Extensions
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(100, registers[0].Address);
Assert.AreEqual(97, registers[0].LowByte);

56
test/AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusSignedExtensionsTest.cs
View File

@@ -103,9 +103,9 @@
// Arrange
var registers = new HoldingRegister[]
{
new HoldingRegister(),
new HoldingRegister { Address = 100, HighByte = 0x01, LowByte = 0x02 },
new HoldingRegister { Address = 101, HighByte = 0x03, LowByte = 0x04 }
new(),
new() { Address = 100, HighByte = 0x01, LowByte = 0x02 },
new() { Address = 101, HighByte = 0x03, LowByte = 0x04 }
};
// Act
@@ -121,8 +121,8 @@
// Arrange
var registers = new HoldingRegister[]
{
new HoldingRegister { Address = 101, HighByte = 0x01, LowByte = 0x02 },
new HoldingRegister { Address = 100, HighByte = 0x03, LowByte = 0x04 }
new() { Address = 101, HighByte = 0x01, LowByte = 0x02 },
new() { Address = 100, HighByte = 0x03, LowByte = 0x04 }
};
// Act
@@ -148,7 +148,7 @@
// Arrange
var registers = new HoldingRegister[]
{
new HoldingRegister { Address = 101, HighByte = 0x01, LowByte = 0x02 }
new() { Address = 101, HighByte = 0x01, LowByte = 0x02 }
};
// Act + Assert
@@ -163,8 +163,8 @@
// Arrange
var registers = new HoldingRegister[]
{
new HoldingRegister { Address = 101, HighByte = 0x01, LowByte = 0x02 },
new HoldingRegister { Address = 100, HighByte = 0x03, LowByte = 0x04 }
new() { Address = 101, HighByte = 0x01, LowByte = 0x02 },
new() { Address = 100, HighByte = 0x03, LowByte = 0x04 }
};
// Act + Assert
@@ -191,11 +191,11 @@
// Arrange
var registers = new HoldingRegister[]
{
new HoldingRegister(),
new HoldingRegister { Address = 100, HighByte = 0x00, LowByte = 0x00 },
new HoldingRegister { Address = 101, HighByte = 0x00, LowByte = 0x00 },
new HoldingRegister { Address = 102, HighByte = 0x01, LowByte = 0x02 },
new HoldingRegister { Address = 103, HighByte = 0x03, LowByte = 0x04 }
new(),
new() { Address = 100, HighByte = 0x00, LowByte = 0x00 },
new() { Address = 101, HighByte = 0x00, LowByte = 0x00 },
new() { Address = 102, HighByte = 0x01, LowByte = 0x02 },
new() { Address = 103, HighByte = 0x03, LowByte = 0x04 }
};
// Act
@@ -211,10 +211,10 @@
// Arrange
var registers = new HoldingRegister[]
{
new HoldingRegister { Address = 103, HighByte = 0x00, LowByte = 0x00 },
new HoldingRegister { Address = 102, HighByte = 0x00, LowByte = 0x00 },
new HoldingRegister { Address = 101, HighByte = 0x01, LowByte = 0x02 },
new HoldingRegister { Address = 100, HighByte = 0x03, LowByte = 0x04 }
new() { Address = 103, HighByte = 0x00, LowByte = 0x00 },
new() { Address = 102, HighByte = 0x00, LowByte = 0x00 },
new() { Address = 101, HighByte = 0x01, LowByte = 0x02 },
new() { Address = 100, HighByte = 0x03, LowByte = 0x04 }
};
// Act
@@ -240,9 +240,9 @@
// Arrange
var registers = new HoldingRegister[]
{
new HoldingRegister { Address = 101, HighByte = 0x00, LowByte = 0x00 },
new HoldingRegister { Address = 102, HighByte = 0x01, LowByte = 0x02 },
new HoldingRegister { Address = 103, HighByte = 0x03, LowByte = 0x04 }
new() { Address = 101, HighByte = 0x00, LowByte = 0x00 },
new() { Address = 102, HighByte = 0x01, LowByte = 0x02 },
new() { Address = 103, HighByte = 0x03, LowByte = 0x04 }
};
// Act + Assert
@@ -257,10 +257,10 @@
// Arrange
var registers = new HoldingRegister[]
{
new HoldingRegister { Address = 100, HighByte = 0x00, LowByte = 0x00 },
new HoldingRegister { Address = 101, HighByte = 0x00, LowByte = 0x00 },
new HoldingRegister { Address = 102, HighByte = 0x01, LowByte = 0x02 },
new HoldingRegister { Address = 103, HighByte = 0x03, LowByte = 0x04 }
new() { Address = 100, HighByte = 0x00, LowByte = 0x00 },
new() { Address = 101, HighByte = 0x00, LowByte = 0x00 },
new() { Address = 102, HighByte = 0x01, LowByte = 0x02 },
new() { Address = 103, HighByte = 0x03, LowByte = 0x04 }
};
// Act + Assert
@@ -330,7 +330,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(5, registers[0].Address);
Assert.AreEqual(0x00, registers[0].HighByte);
@@ -352,7 +352,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(6, registers[0].Address);
Assert.AreEqual(0x00, registers[0].HighByte);
@@ -374,7 +374,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(4, registers.Count);
Assert.HasCount(4, registers);
Assert.AreEqual(10, registers[0].Address);
Assert.AreEqual(0x00, registers[0].HighByte);
@@ -404,7 +404,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(4, registers.Count);
Assert.HasCount(4, registers);
Assert.AreEqual(13, registers[0].Address);
Assert.AreEqual(0x00, registers[0].HighByte);

8
test/AMWD.Protocols.Modbus.Tests/Common/Extensions/ModbusUnsignedExtensionsTest.cs
View File

@@ -330,7 +330,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(5, registers[0].Address);
Assert.AreEqual(0x00, registers[0].HighByte);
@@ -352,7 +352,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(2, registers.Count);
Assert.HasCount(2, registers);
Assert.AreEqual(6, registers[0].Address);
Assert.AreEqual(0x00, registers[0].HighByte);
@@ -374,7 +374,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(4, registers.Count);
Assert.HasCount(4, registers);
Assert.AreEqual(10, registers[0].Address);
Assert.AreEqual(0x00, registers[0].HighByte);
@@ -404,7 +404,7 @@
// Assert
Assert.IsNotNull(registers);
Assert.AreEqual(4, registers.Count);
Assert.HasCount(4, registers);
Assert.AreEqual(13, registers[0].Address);
Assert.AreEqual(0x00, registers[0].HighByte);

8
test/AMWD.Protocols.Modbus.Tests/Common/Models/ModbusDeviceTest.cs
View File

@@ -133,7 +133,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Models
.GetField("_coils", BindingFlags.NonPublic | BindingFlags.Instance)
.GetValue(device)).ToArray();
Assert.AreEqual(1, coils.Length);
Assert.HasCount(1, coils);
Assert.AreEqual(111, coils.First());
}
@@ -178,7 +178,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Models
.GetField("_discreteInputs", BindingFlags.NonPublic | BindingFlags.Instance)
.GetValue(device)).ToArray();
Assert.AreEqual(1, discreteInputs.Length);
Assert.HasCount(1, discreteInputs);
Assert.AreEqual(111, discreteInputs.First());
}
@@ -228,7 +228,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Models
.GetValue(device))
.ToDictionary(x => x.Key, x => x.Value);
Assert.AreEqual(1, registers.Count);
Assert.HasCount(1, registers);
Assert.AreEqual(111, registers.First().Key);
Assert.AreEqual(42, registers.First().Value);
}
@@ -279,7 +279,7 @@ namespace AMWD.Protocols.Modbus.Tests.Common.Models
.GetValue(device))
.ToDictionary(x => x.Key, x => x.Value);
Assert.AreEqual(1, registers.Count);
Assert.HasCount(1, registers);
Assert.AreEqual(111, registers.First().Key);
Assert.AreEqual(42, registers.First().Value);
}

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]);