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

Bug fix and test fix

Browse Source
This commit is contained in:
luosheng
2023-04-22 19:20:58 +08:00
parent 78c305d37e
commit da9eb30d00
19 changed files with 84 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/Modbus.Net.Tests/MachineMethodTest.cs
View File

@@ -25,10 +25,10 @@ namespace Modbus.Net.Tests
{
BaseMachine<int, int> baseMachine = new ModbusMachine<int, int>(1, ModbusType.Tcp, _machineIp, null, true, 2, 0);
await baseMachine.BaseUtility.ConnectAsync();
var success = await baseMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().SetDatasAsync("4X 1", new object[] { (ushort)11 });
var success = await baseMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().SetDatasAsync("4X 1", new object[] { (byte)11 });
Assert.AreEqual(success.IsSuccess, true);
var datas = await baseMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().GetDatasAsync("4X 1", 1);
Assert.AreEqual(datas.Datas[1], 11);
Assert.AreEqual(datas.Datas[0], 11);
baseMachine.Disconnect();
}

31
Tests/Modbus.Net.Tests/Modbus.Net.orderedtest
View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<OrderedTest name="orderedtest1" storage="d:\projects\modbus.net\tests\modbus.net.tests\orderedtest1.orderedtest" id="c2f51f4c-19e8-42d2-8c7f-1dbb4ebb2e88" continueAfterFailure="true" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
<TestLinks>
<TestLink id="8fc138ca-a847-7ba6-30bd-8465e5d81166" name="AddressCombinerSingleTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="948ce1c7-1a93-ff61-879f-01d07c465a96" name="AddressCombinerContinusTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="bcb65caa-0479-7113-a94c-0f4eda0fe7aa" name="AddressCombinerContinusLimitTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="97edc693-ec72-8e16-4387-2f8694c03de1" name="AddressCombinerNumericJumpTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="007296fa-3356-9471-45ea-c1b0e44d0e5e" name="AddressCombinerNumericJumpLimitTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="451b2cd5-84ee-1363-4cbe-cca378ad88dc" name="AddressCombinerPercentageJumpTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="10c49cd9-2989-03de-ebcc-bb2e64bc5fe5" name="AddressCombinerPercentageJumpLimitTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="a81ec237-5ad5-5e28-7818-e20a7c71cbd3" name="BaseMachineGetAddressTest" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="d9c84800-2fd3-0746-e627-273d971afaac" name="GetUtility" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="0a42a00e-b1ba-935b-6fea-bbfe93ca7a7b" name="InvokeMachine" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="d9441eaf-4742-d8db-ea94-db48cb66d52b" name="InvokeUtility" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="f8f2fe14-00f7-3f01-a076-a28e580d0492" name="ModbusCoilSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="ab00dadb-beed-2925-baf9-4f6ea41860d2" name="ModbusDInputSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="04bb0e91-6d84-dad5-ea4e-00cd79d3ed0b" name="ModbusIRegSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="95448160-9d4e-6784-d82f-7da3a3d727fd" name="ModbusRegSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="77205461-d045-e529-6de0-6a577d14de30" name="ModbusRegMultiple" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="bacee2fc-3c9e-79c9-8b30-78792be0e71a" name="MultiStation" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="b1895074-1d93-00aa-a730-5da486ca349b" name="OpcSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="d0738e86-024c-dbab-42a7-73048b993f27" name="OpcMultiple" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="e9728028-f234-710c-fced-469c72d77159" name="OpcWrite" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="fe0338ba-435c-d2aa-8736-aec68c672cfd" name="SiemensCoilSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="9f29d167-679e-28b9-f211-e3c430a8613c" name="SiemensDInputSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="f37fb91e-1cc0-e9df-3163-173574b2c613" name="SiemensMSingleBool" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="48af77ea-9315-04b2-0358-da5b371af3e6" name="SiemensMSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="3ff65ca6-f244-fda3-f8ba-d5c12a96b092" name="SiemensDbSingle" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
<TestLink id="0318ff48-7798-7715-00db-c4ff8ac8f735" name="SiemensDbMultiple" storage="bin\debug\modbus.net.tests.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel, PublicKeyToken=b03f5f7f11d50a3a" />
</TestLinks>
</OrderedTest>

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

@@ -16,6 +16,8 @@ namespace Modbus.Net.Tests
private string _machineCom = "COM1";
private string _machineCom2 = "COM3";
[TestInitialize]
public void Init()
{
@@ -23,7 +25,7 @@ namespace Modbus.Net.Tests
_modbusRtuMachine = new ModbusMachine<string, string>("2", ModbusType.Rtu, _machineCom, null, true, 2, 0);
_modbusAsciiMachine = new ModbusMachine<string, string>("3", ModbusType.Ascii, _machineCom, null, true, 2, 0);
_modbusAsciiMachine = new ModbusMachine<string, string>("3", ModbusType.Ascii, _machineCom2, null, true, 2, 0);
}
[TestMethod]
@@ -60,9 +62,9 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans.Datas["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans2.Datas["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans3.Datas["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans.Datas?["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans2.Datas?["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
Assert.AreEqual(ans3.Datas?["0X 1.0"].DeviceValue, dic1["0X 1.0"]);
}
[TestMethod]
@@ -87,9 +89,9 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans.Datas["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2.Datas["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3.Datas["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans.Datas?["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2.Datas?["1X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3.Datas?["1X 1.0"].DeviceValue, 0);
}
[TestMethod]
@@ -114,9 +116,9 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans.Datas["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2.Datas["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3.Datas["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans.Datas?["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans2.Datas?["3X 1.0"].DeviceValue, 0);
Assert.AreEqual(ans3.Datas?["3X 1.0"].DeviceValue, 0);
}
[TestMethod]
@@ -153,9 +155,9 @@ namespace Modbus.Net.Tests
var ans = await _modbusTcpMachine.GetDatasAsync(MachineDataType.Address);
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.Address);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.Address);
Assert.AreEqual(ans.Datas["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans2.Datas["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans3.Datas["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans.Datas?["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans2.Datas?["4X 1.0"].DeviceValue, dic1["4X 1"]);
Assert.AreEqual(ans3.Datas?["4X 1.0"].DeviceValue, dic1["4X 1"]);
}
[TestMethod]
@@ -254,63 +256,24 @@ namespace Modbus.Net.Tests
var ans2 = await _modbusRtuMachine.GetDatasAsync(MachineDataType.CommunicationTag);
var ans3 = await _modbusAsciiMachine.GetDatasAsync(MachineDataType.CommunicationTag);
Assert.AreEqual(ans.Datas["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans.Datas["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans.Datas["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans.Datas["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans.Datas["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans.Datas["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans2.Datas["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans2.Datas["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans2.Datas["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans2.Datas["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans2.Datas["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans2.Datas["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans3.Datas["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans3.Datas["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans3.Datas["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans3.Datas["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans3.Datas["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans3.Datas["A6"].DeviceValue, dic1["A6"]);
}
[TestMethod]
public async Task ModbusWriteSingleTest()
{
Random r = new Random();
var dic1 = new Dictionary<string, double>()
{
{
"4X 1", r.Next(0, UInt16.MaxValue)
}
};
var dic2 = new Dictionary<string, double>()
{
{
"0X 1", r.Next(0, 2)
}
};
await _modbusTcpMachine!.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingleCoil>().SetSingleCoilAsync("4X 1", dic1["4X 1"]);
await _modbusAsciiMachine!.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingleCoil>().SetSingleCoilAsync("4X 1", dic1["4X 1"]);
await _modbusRtuMachine!.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingleCoil>().SetSingleCoilAsync("4X 1", dic1["4X 1"]);
var ans = await _modbusTcpMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().GetDatasAsync<ushort>("4X 1", 1);
var ans2 = await _modbusRtuMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().GetDatasAsync<ushort>("4X 1", 1);
var ans3 = await _modbusAsciiMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().GetDatasAsync<ushort>("4X 1", 1);
Assert.AreEqual(ans.Datas[0], dic1["4X 1"]);
Assert.AreEqual(ans2.Datas[0], dic1["4X 1"]);
Assert.AreEqual(ans3.Datas[0], dic1["4X 1"]);
await _modbusTcpMachine.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingleCoil>().SetSingleCoilAsync("0X 1", dic2["0X 1"] >= 1);
await _modbusAsciiMachine.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingleCoil>().SetSingleCoilAsync("0X 1", dic2["0X 1"] >= 1);
await _modbusRtuMachine.BaseUtility.GetUtilityMethods<IUtilityMethodWriteSingleCoil>().SetSingleCoilAsync("0X 1", dic2["0X 1"] >= 1);
var ans21 = await _modbusTcpMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().GetDatasAsync<bool>("0X 1", 1);
var ans22 = await _modbusRtuMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().GetDatasAsync<bool>("0X 1", 1);
var ans23 = await _modbusAsciiMachine.BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().GetDatasAsync<bool>("0X 1", 1);
Assert.AreEqual(ans21.Datas[0] ? 1 : 0, dic2["0X 1"]);
Assert.AreEqual(ans22.Datas[0] ? 1 : 0, dic2["0X 1"]);
Assert.AreEqual(ans23.Datas[0] ? 1 : 0, dic2["0X 1"]);
Assert.AreEqual(ans.Datas?["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans.Datas?["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans.Datas?["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans.Datas?["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans.Datas?["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans.Datas?["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans2.Datas?["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans2.Datas?["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans2.Datas?["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans2.Datas?["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans2.Datas?["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans2.Datas?["A6"].DeviceValue, dic1["A6"]);
Assert.AreEqual(ans3.Datas?["A1"].DeviceValue, dic1["A1"]);
Assert.AreEqual(ans3.Datas?["A2"].DeviceValue, dic1["A2"]);
Assert.AreEqual(ans3.Datas?["A3"].DeviceValue, dic1["A3"]);
Assert.AreEqual(ans3.Datas?["A4"].DeviceValue, dic1["A4"]);
Assert.AreEqual(ans3.Datas?["A5"].DeviceValue, dic1["A5"]);
Assert.AreEqual(ans3.Datas?["A6"].DeviceValue, dic1["A6"]);
}