luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Job System and DuplicateWithCount bug fix.

Browse Source
This commit is contained in:
luosheng
2023-02-12 07:57:27 +08:00
parent f8b016ac4a
commit b463bb9414
27 changed files with 437 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
Tests/Modbus.Net.Tests/ModbusTest.cs
View File

@@ -53,15 +53,15 @@ namespace Modbus.Net.Tests
_modbusTcpMachine.GetAddresses = addresses;
_modbusAsciiMachine.GetAddresses = addresses;
_modbusRtuMachine.GetAddresses = addresses;
await _modbusTcpMachine.SetDatasAsync(MachineSetDataType.Address, dic1);
await _modbusAsciiMachine.SetDatasAsync(MachineSetDataType.Address, dic1);
await _modbusRtuMachine.SetDatasAsync(MachineSetDataType.Address, dic1);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineGetDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineGetDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineGetDataType.Address);
Assert.AreEqual(ans["0X 1.0"].PlcValue, dic1["0X 1.0"]);
Assert.AreEqual(ans2["0X 1.0"].PlcValue, dic1["0X 1.0"]);
Assert.AreEqual(ans3["0X 1.0"].PlcValue, dic1["0X 1.0"]);
await _modbusTcpMachine.SetDatasAsync(MachineDataType.Address, dic1);
await _modbusAsciiMachine.SetDatasAsync(MachineDataType.Address, dic1);
await _modbusRtuMachine.SetDatasAsync(MachineDataType.Address, dic1);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans2["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans3["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
}
[TestMethod]
@@ -83,12 +83,12 @@ namespace Modbus.Net.Tests
_modbusTcpMachine.GetAddresses = addresses;
_modbusRtuMachine.GetAddresses = addresses;
_modbusAsciiMachine.GetAddresses = addresses;
var ans = await _modbusTcpMachine.GetDatasAsync(MachineGetDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineGetDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineGetDataType.Address);
Assert.AreEqual(ans["1X 1.0"].PlcValue, 0);
Assert.AreEqual(ans2["1X 1.0"].PlcValue, 0);
Assert.AreEqual(ans3["1X 1.0"].PlcValue, 0);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3["1X 1.0"].DeviceValue, 0);
}
[TestMethod]
@@ -110,12 +110,12 @@ namespace Modbus.Net.Tests
_modbusTcpMachine.GetAddresses = addresses;
_modbusRtuMachine.GetAddresses = addresses;
_modbusAsciiMachine.GetAddresses = addresses;
var ans = await _modbusTcpMachine.GetDatasAsync(MachineGetDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineGetDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineGetDataType.Address);
Assert.AreEqual(ans["3X 1.0"].PlcValue, 0);
Assert.AreEqual(ans2["3X 1.0"].PlcValue, 0);
Assert.AreEqual(ans3["3X 1.0"].PlcValue, 0);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3["3X 1.0"].DeviceValue, 0);
}
[TestMethod]
@@ -146,15 +146,15 @@ namespace Modbus.Net.Tests
_modbusTcpMachine.GetAddresses = addresses;
_modbusAsciiMachine.GetAddresses = addresses;
_modbusRtuMachine.GetAddresses = addresses;
await _modbusTcpMachine.SetDatasAsync(MachineSetDataType.Address, dic1);
await _modbusAsciiMachine.SetDatasAsync(MachineSetDataType.Address, dic1);
await _modbusRtuMachine.SetDatasAsync(MachineSetDataType.Address, dic1);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineGetDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineGetDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineGetDataType.Address);
Assert.AreEqual(ans["4X 1.0"].PlcValue, dic1["4X 1"]);
Assert.AreEqual(ans2["4X 1.0"].PlcValue, dic1["4X 1"]);
Assert.AreEqual(ans3["4X 1.0"].PlcValue, dic1["4X 1"]);
await _modbusTcpMachine.SetDatasAsync(MachineDataType.Address, dic1);
await _modbusAsciiMachine.SetDatasAsync(MachineDataType.Address, dic1);
await _modbusRtuMachine.SetDatasAsync(MachineDataType.Address, dic1);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans2["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans3["4X 1.0"].DeviceValue, dic1["4X 1"]);
}
[TestMethod]
@@ -245,32 +245,32 @@ namespace Modbus.Net.Tests
_modbusTcpMachine.GetAddresses = addresses;
_modbusRtuMachine.GetAddresses = addresses;
_modbusAsciiMachine.GetAddresses = addresses;
await _modbusTcpMachine.SetDatasAsync(MachineSetDataType.CommunicationTag, dic1);
await _modbusRtuMachine.SetDatasAsync(MachineSetDataType.CommunicationTag, dic1);
await _modbusAsciiMachine.SetDatasAsync(MachineSetDataType.CommunicationTag, dic1);
await _modbusTcpMachine.SetDatasAsync(MachineDataType.CommunicationTag, dic1);
await _modbusRtuMachine.SetDatasAsync(MachineDataType.CommunicationTag, dic1);
await _modbusAsciiMachine.SetDatasAsync(MachineDataType.CommunicationTag, dic1);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineGetDataType.CommunicationTag);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineGetDataType.CommunicationTag);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineGetDataType.CommunicationTag);
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.CommunicationTag);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.CommunicationTag);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.CommunicationTag);
Assert.AreEqual(ans["A1"].PlcValue, dic1["A1"]);
Assert.AreEqual(ans["A2"].PlcValue, dic1["A2"]);
Assert.AreEqual(ans["A3"].PlcValue, dic1["A3"]);
Assert.AreEqual(ans["A4"].PlcValue, dic1["A4"]);
Assert.AreEqual(ans["A5"].PlcValue, dic1["A5"]);
Assert.AreEqual(ans["A6"].PlcValue, dic1["A6"]);
Assert.AreEqual(ans2["A1"].PlcValue, dic1["A1"]);
Assert.AreEqual(ans2["A2"].PlcValue, dic1["A2"]);
Assert.AreEqual(ans2["A3"].PlcValue, dic1["A3"]);
Assert.AreEqual(ans2["A4"].PlcValue, dic1["A4"]);
Assert.AreEqual(ans2["A5"].PlcValue, dic1["A5"]);
Assert.AreEqual(ans2["A6"].PlcValue, dic1["A6"]);
Assert.AreEqual(ans3["A1"].PlcValue, dic1["A1"]);
Assert.AreEqual(ans3["A2"].PlcValue, dic1["A2"]);
Assert.AreEqual(ans3["A3"].PlcValue, dic1["A3"]);
Assert.AreEqual(ans3["A4"].PlcValue, dic1["A4"]);
Assert.AreEqual(ans3["A5"].PlcValue, dic1["A5"]);
Assert.AreEqual(ans3["A6"].PlcValue, dic1["A6"]);
Assert.AreEqual(ans["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans2["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans2["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans2["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans2["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans2["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans2["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans3["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans3["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans3["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans3["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans3["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans3["A6"].DeviceValue, dic1["A6"]);
}
[TestMethod]