From 4579c8b519f3f8c1c654bc6ad871650ae89d3d2b Mon Sep 17 00:00:00 2001
From: zhangyongpan <zhangyongpan@xinje.cc>
Date: Mon, 28 Jul 2025 18:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E9=80=9F=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ModbusDemo.sln                              |   8 +-
 ModbusDemo/Device/IModbusRTU.cs             |   2 +-
 ModbusDemo/Device/ModbusRTU.cs              |   1 +
 ModbusDemo/Model/ModbusDbContext.cs         |   4 +-
 ModbusDemo/VIew/CoilUC.xaml                 |   8 +-
 ModbusDemo/VIew/RegisterUC.xaml             |  10 +-
 ModbusDemo/VIew/SettingsUC.xaml             |  12 +-
 ModbusDemo/VIew/SettingsUC.xaml.cs          |  16 +--
 ModbusDemo/VIewModel/CoilUCViewModel.cs     |   2 +-
 ModbusDemo/VIewModel/RegisterUCViewModel.cs |   2 +-
 ModbusTest/ModbusRTUTest.cs                 | 141 ++++++++++++++++++++
 ModbusTest/ModbusTest.csproj                |  29 ++++
 ModbusTest/UnitTest1.cs                     |  16 +++
 13 files changed, 216 insertions(+), 35 deletions(-)
 create mode 100644 ModbusTest/ModbusRTUTest.cs
 create mode 100644 ModbusTest/ModbusTest.csproj
 create mode 100644 ModbusTest/UnitTest1.cs

diff --git a/ModbusDemo.sln b/ModbusDemo.sln
index 1001852..5e8bfc4 100644
--- a/ModbusDemo.sln
+++ b/ModbusDemo.sln
@@ -1,10 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.14.36301.6 d17.14
+VisualStudioVersion = 17.14.36301.6
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModbusDemo", "ModbusDemo\ModbusDemo.csproj", "{4F00ED24-6BEE-4192-9CA4-656802B78A6D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModbusTest", "ModbusTest\ModbusTest.csproj", "{83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{4F00ED24-6BEE-4192-9CA4-656802B78A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F00ED24-6BEE-4192-9CA4-656802B78A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F00ED24-6BEE-4192-9CA4-656802B78A6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ModbusDemo/Device/IModbusRTU.cs b/ModbusDemo/Device/IModbusRTU.cs
index 0a0a0bf..7d5e750 100644
--- a/ModbusDemo/Device/IModbusRTU.cs
+++ b/ModbusDemo/Device/IModbusRTU.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace ModbusDemo.Device
 {
-    interface IModbusRTU
+    public interface IModbusRTU
     {
         public bool[] ReadCoil(byte slaveAddress, ushort startAddress, ushort numberOfPoints);
 
diff --git a/ModbusDemo/Device/ModbusRTU.cs b/ModbusDemo/Device/ModbusRTU.cs
index 5152131..88f5635 100644
--- a/ModbusDemo/Device/ModbusRTU.cs
+++ b/ModbusDemo/Device/ModbusRTU.cs
@@ -17,6 +17,7 @@ namespace ModbusDemo.Device
         private SerialPort _serialPort;
         //用于操作数据库
         private ModbusDbContext _modbusDbContext;
+        
         public ModbusRTU(SerialPort serialPort, ModbusDbContext modbusDbContext)
         {
             _serialPort = serialPort;
diff --git a/ModbusDemo/Model/ModbusDbContext.cs b/ModbusDemo/Model/ModbusDbContext.cs
index 3c4b97d..e37d7dd 100644
--- a/ModbusDemo/Model/ModbusDbContext.cs
+++ b/ModbusDemo/Model/ModbusDbContext.cs
@@ -9,7 +9,9 @@ namespace ModbusDemo.Model
 {
     public class ModbusDbContext:DbContext
     {
-        
+        protected ModbusDbContext()
+        {
+        }
         public ModbusDbContext(DbContextOptions<ModbusDbContext> options) :base(options)
         {
             
diff --git a/ModbusDemo/VIew/CoilUC.xaml b/ModbusDemo/VIew/CoilUC.xaml
index 7d84322..355c37f 100644
--- a/ModbusDemo/VIew/CoilUC.xaml
+++ b/ModbusDemo/VIew/CoilUC.xaml
@@ -87,8 +87,8 @@
             <Button
                 Grid.Column="4"
                 Width="80"
-                Height="30"
-                materialDesign:ButtonAssist.CornerRadius="15"
+                Height="40"
+                materialDesign:ButtonAssist.CornerRadius="20"
                 Command="{Binding ReadCoilCmm}"
                 Content="读取"
                 Style="{StaticResource MaterialDesignRaisedDarkButton}">
@@ -140,8 +140,8 @@
             <Button
                 Grid.Column="4"
                 Width="80"
-                Height="30"
-                materialDesign:ButtonAssist.CornerRadius="15"
+                Height="40"
+                materialDesign:ButtonAssist.CornerRadius="20"
                 Command="{Binding WriteCoilCmm}"
                 Content="写入"
                 Style="{StaticResource MaterialDesignRaisedDarkButton}">
diff --git a/ModbusDemo/VIew/RegisterUC.xaml b/ModbusDemo/VIew/RegisterUC.xaml
index 041e2e5..ba45f44 100644
--- a/ModbusDemo/VIew/RegisterUC.xaml
+++ b/ModbusDemo/VIew/RegisterUC.xaml
@@ -87,8 +87,8 @@
             <Button
                 Grid.Column="4"
                 Width="80"
-                Height="30"
-                materialDesign:ButtonAssist.CornerRadius="15"
+                Height="40"
+                materialDesign:ButtonAssist.CornerRadius="20"
                 Command="{Binding ReadRegisterCmm}"
                 Content="读取"
                 Style="{StaticResource MaterialDesignRaisedDarkButton}">
@@ -133,15 +133,15 @@
                 Margin="0,-50,0,0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                Text="1代表Ture，0代表flase">
+                Text="数据之间加空格">
             </TextBlock>
 
 
             <Button
                 Grid.Column="4"
                 Width="80"
-                Height="30"
-                materialDesign:ButtonAssist.CornerRadius="15"
+                Height="40"
+                materialDesign:ButtonAssist.CornerRadius="20"
                 Command="{Binding WriteRegisterCmm}"
                 Content="写入"
                 Style="{StaticResource MaterialDesignRaisedDarkButton}">
diff --git a/ModbusDemo/VIew/SettingsUC.xaml b/ModbusDemo/VIew/SettingsUC.xaml
index 91bdfbb..6b3a738 100644
--- a/ModbusDemo/VIew/SettingsUC.xaml
+++ b/ModbusDemo/VIew/SettingsUC.xaml
@@ -139,18 +139,18 @@
                 </ColumnDefinition>
             </Grid.ColumnDefinitions>
             <Button
-                Width="100"
-                Height="50"
-                materialDesign:ButtonAssist.CornerRadius="25"
+                Width="80"
+                Height="40"
+                materialDesign:ButtonAssist.CornerRadius="20"
                 Style="{StaticResource MaterialDesignRaisedDarkButton}"
                 Content="连接"
                 Command="{Binding ConnectionCmm}">
             </Button>
             <Button
                 Grid.Column="1"
-                Width="100"
-                Height="50"
-                materialDesign:ButtonAssist.CornerRadius="25"
+                Width="80"
+                Height="40"
+                materialDesign:ButtonAssist.CornerRadius="20"
                 Style="{StaticResource MaterialDesignRaisedDarkButton}"
                 Content="断开"
                 Command="{Binding DisConnectionCmm}">
diff --git a/ModbusDemo/VIew/SettingsUC.xaml.cs b/ModbusDemo/VIew/SettingsUC.xaml.cs
index 26020a4..26ea809 100644
--- a/ModbusDemo/VIew/SettingsUC.xaml.cs
+++ b/ModbusDemo/VIew/SettingsUC.xaml.cs
@@ -28,20 +28,6 @@ namespace ModbusDemo.VIew
             _ModbusDbContext = ModbusDbContext;
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            ModbusLog m = new ModbusLog();
-            m.OperationType = "read";
-            m.ResponseData = "0120";
-            m.RequestData = "8888";
-
-            
-
-            _ModbusDbContext.Add(m);
-
-            _ModbusDbContext.SaveChanges();
-
-
-        }
+       
     }
 }
diff --git a/ModbusDemo/VIewModel/CoilUCViewModel.cs b/ModbusDemo/VIewModel/CoilUCViewModel.cs
index 48e5ee5..df5914b 100644
--- a/ModbusDemo/VIewModel/CoilUCViewModel.cs
+++ b/ModbusDemo/VIewModel/CoilUCViewModel.cs
@@ -32,7 +32,7 @@ namespace ModbusDemo.VIewModel
         {
             get
             {
-                return "当前链接的状态：" + "串口号：" + _serialPort.PortName + "，波特率：" + _serialPort.BaudRate
+                return "当前为读写线圈：" + "串口号：" + _serialPort.PortName + "，波特率：" + _serialPort.BaudRate
                     + "，数据位：" + _serialPort.DataBits + "，校验位：" + _serialPort.Parity + "，停止位：" + _serialPort.StopBits;
             }
 
diff --git a/ModbusDemo/VIewModel/RegisterUCViewModel.cs b/ModbusDemo/VIewModel/RegisterUCViewModel.cs
index 7d5efe2..a952b07 100644
--- a/ModbusDemo/VIewModel/RegisterUCViewModel.cs
+++ b/ModbusDemo/VIewModel/RegisterUCViewModel.cs
@@ -29,7 +29,7 @@ namespace ModbusDemo.VIewModel
         {
             get
             {
-                return "当前链接的状态：" + "串口号：" + _serialPort.PortName + "，波特率：" + _serialPort.BaudRate
+                return "当前为读写寄存器：" + "串口号：" + _serialPort.PortName + "，波特率：" + _serialPort.BaudRate
                     + "，数据位：" + _serialPort.DataBits + "，校验位：" + _serialPort.Parity + "，停止位：" + _serialPort.StopBits;
             }
 
diff --git a/ModbusTest/ModbusRTUTest.cs b/ModbusTest/ModbusRTUTest.cs
new file mode 100644
index 0000000..79fee9e
--- /dev/null
+++ b/ModbusTest/ModbusRTUTest.cs
@@ -0,0 +1,141 @@
+using DryIoc;
+using Microsoft.EntityFrameworkCore;
+using ModbusDemo.Device;
+using ModbusDemo.Model;
+using Moq;
+using Prism.Ioc;
+using System;
+using System.Collections.Generic;
+using System.IO.Ports;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+namespace ModbusTest
+{
+    public class ModbusRTUTest
+    {
+        //设计缺陷，应该使用适配器模式重写SerialPort
+        private SerialPort _serialport;
+        private Mock<ModbusDbContext> _mockDbContext;
+        private ModbusRTU _modbusRtu;
+        [SetUp]
+        public void Setup()
+        {
+            _serialport = new SerialPort();
+            _serialport.PortName = "COM3";
+            _serialport.DataBits = 8;
+            _serialport.BaudRate = 9600;
+            _serialport.Parity = Parity.Even;
+            _serialport.StopBits = StopBits.One;
+            _serialport.ReadTimeout = 500;
+            _serialport.WriteTimeout = 500;
+            _serialport.Open(); 
+            _mockDbContext = new Mock<ModbusDbContext>();
+            _modbusRtu = new ModbusRTU(_serialport, _mockDbContext.Object);
+        }
+        [TearDown]
+        public void TearDown()
+        {
+            // 确保在测试结束后释放资源
+            _serialport.Dispose();
+        }
+        /// <summary>
+        /// 测试线圈读取
+        /// </summary>
+        [Test]
+        public void ReadCoil1()
+        {
+
+            var result = _modbusRtu.ReadCoil(1, 300, 5);
+            // 创建包含5个true的预期数组
+            var expected = new bool[5];
+            Array.Fill(expected, false);
+            CollectionAssert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void ReadCoil2()
+        {
+            var result = _modbusRtu.ReadCoil(1, 305, 5);
+            // 创建包含5个flase的预期数组
+            var expected = new bool[5];
+            Array.Fill(expected, true);
+            CollectionAssert.AreEqual(expected, result);
+
+        }
+
+
+        [Test]
+        public void WriteCoil1()
+        {
+            var data = new bool[5];
+            Array.Fill(data, true);
+            _modbusRtu.WriteCoil(1, 310, data);
+            // 创建包含5个true的预期数组
+            var expected = _modbusRtu.ReadCoil(1, 310, 5);
+            CollectionAssert.AreEqual(data, expected);
+
+        }
+
+
+
+        [Test]
+        public void WriteCoil2()
+        {
+            var data = new bool[5];
+            Array.Fill(data, false);
+            _modbusRtu.WriteCoil(1, 315, data);
+            // 创建包含5个flase的预期数组
+            var expected = _modbusRtu.ReadCoil(1, 315, 5);
+            CollectionAssert.AreEqual(data, expected);
+
+        }
+
+
+        [Test]
+        public void ReadRegister1()
+        {
+            ushort[] data = new ushort[5];
+            Array.Fill(data, (ushort)0);
+            var expected = _modbusRtu.ReadRegisters(1, 300, 5);
+            CollectionAssert.AreEqual(data, expected);
+        }
+
+
+
+        [Test]
+        public void ReadRegister2()
+        {
+            ushort[] data = new ushort[5];
+            Array.Fill(data, (ushort)1);
+            
+            var expected = _modbusRtu.ReadRegisters(1, 305, 5);
+            CollectionAssert.AreEqual(data, expected);
+        }
+
+
+
+        [Test]
+        public void WriteRegister1()
+        {
+            ushort[] data = new ushort[5];
+            Array.Fill(data, (ushort)1);
+
+            _modbusRtu.WriteRegisters(1, 310, data);
+            var expected = _modbusRtu.ReadRegisters(1, 310, 5);
+            CollectionAssert.AreEqual(data, expected);
+        }
+
+
+        [Test]
+        public void WriteRegister2()
+        {
+            ushort[] data = new ushort[5];
+            Array.Fill(data, (ushort)2);
+
+            _modbusRtu.WriteRegisters(1, 315, data);
+            var expected = _modbusRtu.ReadRegisters(1, 315, 5);
+            CollectionAssert.AreEqual(data, expected);
+        }
+    }
+}
diff --git a/ModbusTest/ModbusTest.csproj b/ModbusTest/ModbusTest.csproj
new file mode 100644
index 0000000..29e6a47
--- /dev/null
+++ b/ModbusTest/ModbusTest.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ModbusDemo\ModbusDemo.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+</Project>
diff --git a/ModbusTest/UnitTest1.cs b/ModbusTest/UnitTest1.cs
new file mode 100644
index 0000000..ac0286d
--- /dev/null
+++ b/ModbusTest/UnitTest1.cs
@@ -0,0 +1,16 @@
+namespace ModbusTest
+{
+    public class Tests
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void Test1()
+        {
+            Assert.Pass();
+        }
+    }
+}
\ No newline at end of file