Merge pull request #20 from Z-bit-Systems-LLC/develop

bytedreamer · web-flow · commit 0ab0aba0065b · 2025-03-31T19:31:10.000-04:00
Release 3.0.8
diff --git a/ci/testing.yml b/ci/testing.yml
@@ -10,4 +10,19 @@
   inputs:
     command: 'test'
     projects: 'test/*Tests/*.csproj'
-    arguments: '--configuration $(buildConfiguration)'
+    arguments: '--configuration $(buildConfiguration) --collect:"XPlat Code Coverage"'
+
+- task: reportgenerator@5
+  displayName: 'Generate Code Coverage Report'
+  inputs:
+    reports: '$(Agent.TempDirectory)/**/coverage.cobertura.xml'
+    targetdir: '$(Build.SourcesDirectory)/coveragereport'
+    reporttypes: 'Cobertura;HtmlInline_AzurePipelines'
+
+- task: PublishCodeCoverageResults@2
+  displayName: 'Publish Code Coverage Results'
+  inputs:
+    codeCoverageTool: 'Cobertura'
+    summaryFileLocation: '$(Build.SourcesDirectory)/coveragereport/Cobertura.xml'
+    reportDirectory: '$(Build.SourcesDirectory)/coveragereport'
+    failIfCoverageEmpty: true  # Optional: Makes the build fail if no coverage data is found
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
@@ -19,8 +19,8 @@
     <RepositoryType>git</RepositoryType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>3.0.7.0</AssemblyVersion>
-    <FileVersion>3.0.7.0</FileVersion>
+    <AssemblyVersion>3.0.8.0</AssemblyVersion>
+    <FileVersion>3.0.8.0</FileVersion>
     <Platforms>AnyCPU;ARM64;x64</Platforms>
   </PropertyGroup>
 
diff --git a/src/Core/Services/DeviceManagementService.cs b/src/Core/Services/DeviceManagementService.cs
@@ -239,6 +239,8 @@ private async Task WaitUntilDeviceIsOffline()
 
             await Task.Delay(TimeSpan.FromMilliseconds(100), cts.Token);
         }
+        
+        await Task.Delay(TimeSpan.FromSeconds(1), cts.Token);
     }
 
     /// <inheritdoc />
diff --git a/src/Core/ViewModels/Pages/ConnectViewModel.cs b/src/Core/ViewModels/Pages/ConnectViewModel.cs
@@ -11,7 +11,7 @@ public partial class ConnectViewModel : ObservableObject
 {
     private readonly IDialogService _dialogService;
     private readonly IDeviceManagementService _deviceManagementService;
-    private ISerialPortConnectionService? _serialPortConnectionService;
+    private ISerialPortConnectionService _serialPortConnectionService;
 
     /// <summary>
     /// ViewModel for the Connect page.
@@ -77,7 +77,7 @@ private void DeviceManagementServiceOnNakReplyReceived(object? sender, string na
 
     [ObservableProperty] private int _selectedBaudRate = 9600;
 
-    [ObservableProperty] private byte _selectedAddress;
+    [ObservableProperty] private double _selectedAddress;
 
     [ObservableProperty] private byte _connectedAddress;
 
@@ -107,7 +107,6 @@ private async Task ScanSerialPorts()
         AvailableSerialPorts.Clear();
 
         var serialPortConnectionService = _serialPortConnectionService;
-        if (serialPortConnectionService == null) return;
 
         var foundAvailableSerialPorts = await serialPortConnectionService.FindAvailableSerialPorts();
 
@@ -135,7 +134,6 @@ await _dialogService.ShowMessageDialog("Error",
     private async Task DiscoverDevice(CancellationToken token)
     {
         var serialPortConnectionService = _serialPortConnectionService;
-        if (serialPortConnectionService == null) return;
 
         string serialPortName = SelectedSerialPort?.Name ?? string.Empty;
         if (string.IsNullOrWhiteSpace(serialPortName)) return;
@@ -173,7 +171,7 @@ private async Task DiscoverDevice(CancellationToken token)
                     StatusText =
                         $"Successfully discovered device {current.Connection.BaudRate} with address {current.Address}";
                     StatusLevel = StatusLevel.Discovered;
-                    _serialPortConnectionService = current.Connection as ISerialPortConnectionService;
+                    if (current.Connection is ISerialPortConnectionService service) _serialPortConnectionService = service;
                     ConnectedAddress = current.Address;
                     ConnectedBaudRate = current.Connection.BaudRate;
                     break;
@@ -225,7 +223,6 @@ private async Task DiscoverDevice(CancellationToken token)
     private async Task ConnectDevice()
     {
         var serialPortConnectionService = _serialPortConnectionService;
-        if (serialPortConnectionService == null) return;
 
         string serialPortName = SelectedSerialPort?.Name ?? string.Empty;
         if (string.IsNullOrWhiteSpace(serialPortName)) return;
@@ -252,9 +249,9 @@ await _dialogService.ShowMessageDialog("Connect", $"Invalid security key entered
 
         await _deviceManagementService.Shutdown();
         await _deviceManagementService.Connect(
-            serialPortConnectionService.GetConnection(serialPortName, SelectedBaudRate), SelectedAddress,
+            serialPortConnectionService.GetConnection(serialPortName, SelectedBaudRate), (byte)SelectedAddress,
             UseSecureChannel, UseDefaultKey, securityKey);
-        ConnectedAddress = SelectedAddress;
+        ConnectedAddress = (byte)SelectedAddress;
         ConnectedBaudRate = SelectedBaudRate;
     }
 }
@@ -276,5 +273,4 @@ public enum StatusLevel
     Disconnected,
     ConnectingManually
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
-
 }
diff --git a/src/Core/ViewModels/Pages/MonitorViewModel.cs b/src/Core/ViewModels/Pages/MonitorViewModel.cs
@@ -47,7 +47,15 @@ private void OnDeviceManagementServiceOnTraceEntryReceived(object? _, TraceEntry
         if (UsingSecureChannel) return;
         
         var build = new PacketTraceEntryBuilder();
-        var packetTraceEntry = build.FromTraceEntry(traceEntry, _lastPacketEntry).Build();
+        PacketTraceEntry packetTraceEntry;
+        try
+        {
+            packetTraceEntry = build.FromTraceEntry(traceEntry, _lastPacketEntry).Build();
+        }
+        catch (Exception)
+        {
+            return;
+        }
 
         bool notDisplaying = false;
         if (packetTraceEntry.Packet.CommandType == CommandType.Poll)
diff --git a/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml b/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml
@@ -20,13 +20,15 @@
             <ComboBox Name="BaudRateComboBox"
                       Margin="0 0 20 0"
                       ItemsSource="{Binding AvailableBaudRates}"
-                      SelectedItem="{Binding SelectedBaudRate}"/>
+                      SelectedItem="{Binding SelectedBaudRate, Mode=TwoWay}"/>
         </StackPanel>
         <StackPanel Grid.Column="1" Orientation="Vertical">
             <Label Content="Address"
                    Target="{Binding ElementName=BaudRateComboBox}" />
             <ui:NumberBox Name="AddressNumberBox"
-                          Value="{Binding SelectedAddress}"
+                          TextChanged="AddressNumberBox_OnTextChanged"
+                          ValueChanged="AddressNumberBox_OnValueChanged"
+                          Value="{Binding SelectedAddress, Mode=TwoWay}"
                           Margin="0 0 20 0"
                           Minimum="0"
                           Maximum="127"
diff --git a/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml.cs b/src/UI/Windows/Views/Controls/SetCommunicationControl.xaml.cs
@@ -1,5 +1,7 @@
 ﻿using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using System.Windows.Controls;
+using Wpf.Ui.Controls;
 
 namespace OSDPBench.Windows.Views.Controls;
 
@@ -10,8 +12,8 @@ public SetCommunicationControl(int[] availableBaudRates, uint connectedBaudRate,
         DataContext = this;
 
         AvailableBaudRates = availableBaudRates;
-        _selectedBaudRate = (int)connectedBaudRate;
-        _selectedAddress = connectedAddress;
+        SelectedBaudRate = (int)connectedBaudRate;
+        SelectedAddress = connectedAddress;
 
         InitializeComponent();
     }
@@ -25,8 +27,8 @@ public int SelectedBaudRate
         set => SetField(ref _selectedBaudRate, value);
     }
 
-    private byte _selectedAddress;
-    public byte SelectedAddress
+    private double _selectedAddress;
+    public double SelectedAddress
     {
         get => _selectedAddress;
         set => SetField(ref _selectedAddress, value);
@@ -45,4 +47,14 @@ private void SetField<T>(ref T field, T value, [CallerMemberName] string? proper
         field = value;
         OnPropertyChanged(propertyName);
     }
+
+    private void AddressNumberBox_OnTextChanged(object sender, TextChangedEventArgs e)
+    {
+        SelectedAddress = AddressNumberBox.Value ?? 0;
+    }
+
+    private void AddressNumberBox_OnValueChanged(object sender, NumberBoxValueChangedEventArgs args)
+    {
+        SelectedAddress = AddressNumberBox.Value ?? 0;
+    }
 }
diff --git a/src/UI/Windows/Views/Pages/ConnectPage.xaml b/src/UI/Windows/Views/Pages/ConnectPage.xaml
@@ -152,13 +152,15 @@
                                 <ComboBox Name="BaudRateComboBox"
 										  Margin="0 0 20 0"
                                           ItemsSource="{Binding ViewModel.AvailableBaudRates}"
-                                          SelectedItem="{Binding ViewModel.SelectedBaudRate}"/>
+                                          SelectedItem="{Binding  Path=ViewModel.SelectedBaudRate, Mode=TwoWay}"/>
                             </StackPanel>
                             <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Vertical">
                                 <Label Content="Address"
 										   Target="{Binding ElementName=AddressNumberBox}" />
                                 <ui:NumberBox Name="AddressNumberBox"
-											  Value="{Binding ViewModel.SelectedAddress}"
+											  Value="{Binding Path=ViewModel.SelectedAddress, Mode=TwoWay}"
+											  TextChanged="AddressNumberBox_OnTextChanged"
+											  ValueChanged="AddressNumberBox_OnValueChanged"
 											  Margin="0 0 20 0"
                                               Minimum="0"
 											  Maximum="127"
@@ -171,19 +173,19 @@
 	                            <StackPanel Orientation="Horizontal">
 		                            <CheckBox Name="UseSecureChannelCheckBox"
 		                                      Content="Use Secure Channel" 
-		                                      IsChecked="{Binding ViewModel.UseSecureChannel}"/>
+		                                      IsChecked="{Binding Path=ViewModel.UseSecureChannel,  Mode=TwoWay}"/>
 		                            
 		                            <CheckBox Name="UseDefaultKeyCheckBox"
 		                                      Content="Use Default Key" 
 		                                      Margin="10,0,0,0"
 		                                      IsEnabled="{Binding ElementName=UseSecureChannelCheckBox, Path=IsChecked}"
-		                                      IsChecked="{Binding ViewModel.UseDefaultKey}"/>
+		                                      IsChecked="{Binding  Path=ViewModel.UseDefaultKey,  Mode=TwoWay}"/>
 	                            </StackPanel>
 	                           
 	                            <StackPanel Orientation="Vertical">
 		                            <Label Content="Security Key"
 		                                   Target="{Binding ElementName=AddressNumberBox}" />
-                                    <TextBox Text="{Binding ViewModel.SecurityKey}">
+                                    <TextBox Text="{Binding Path=ViewModel.SecurityKey,  Mode=TwoWay}">
                                         <TextBox.Style>
                                             <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
                                                 <!-- Only add the specific triggers needed -->
diff --git a/src/UI/Windows/Views/Pages/ConnectPage.xaml.cs b/src/UI/Windows/Views/Pages/ConnectPage.xaml.cs
@@ -1,5 +1,7 @@
-﻿using OSDPBench.Core.ViewModels.Pages;
+﻿using System.Windows.Controls;
+using OSDPBench.Core.ViewModels.Pages;
 using Wpf.Ui.Abstractions.Controls;
+using Wpf.Ui.Controls;
 
 namespace OSDPBench.Windows.Views.Pages;
 
@@ -27,4 +29,14 @@ public ConnectPage(ConnectViewModel viewModel)
     public ConnectViewModel ViewModel { get; }
         
     public IEnumerable<string> ConnectionTypes => ["Discover", "Manual"];
+
+    private void AddressNumberBox_OnTextChanged(object sender, TextChangedEventArgs e)
+    {
+        ViewModel.SelectedAddress = AddressNumberBox.Value ?? 0;
+    }
+
+    private void AddressNumberBox_OnValueChanged(object sender, NumberBoxValueChangedEventArgs args)
+    {
+        ViewModel.SelectedAddress = AddressNumberBox.Value ?? 0;
+    }
 }
diff --git a/src/UI/Windows/Views/Pages/ManagePage.xaml.cs b/src/UI/Windows/Views/Pages/ManagePage.xaml.cs
@@ -108,7 +108,7 @@ private void SetCommunicationActionControl()
         {
             ViewModel.DeviceActionParameter = new CommunicationParameters(
                 ViewModel.ConnectedPortName, (uint)actionControl.SelectedBaudRate,
-                actionControl.SelectedAddress);
+                (byte)actionControl.SelectedAddress);
         };
         DeviceActionControl.Children.Add(actionControl);
     }
diff --git a/src/UI/Windows/Windows.csproj b/src/UI/Windows/Windows.csproj
@@ -13,8 +13,8 @@
     <AssemblyName>OSDPBench</AssemblyName>
     <RootNamespace>OSDPBench.Windows</RootNamespace>
     <StartupObject>OSDPBench.Windows.App</StartupObject>
-    <AssemblyVersion>3.0.7.0</AssemblyVersion>
-    <FileVersion>3.0.7.0</FileVersion>
+    <AssemblyVersion>3.0.8.0</AssemblyVersion>
+    <FileVersion>3.0.8.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Core.Tests/Core.Tests.csproj b/test/Core.Tests/Core.Tests.csproj
@@ -13,6 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="nunit" Version="4.3.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0">
diff --git a/test/Core.Tests/ViewModels/ConnectViewModelTests.cs b/test/Core.Tests/ViewModels/ConnectViewModelTests.cs
diff --git a/test/Core.Tests/ViewModels/MainViewModelTests.cs b/test/Core.Tests/ViewModels/MainViewModelTests.cs

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,8 @@ private async Task WaitUntilDeviceIsOffline()`
`239`	`239`
`240`	`240`	`await Task.Delay(TimeSpan.FromMilliseconds(100), cts.Token);`
`241`	`241`	`}`
	`242`	`+`
	`243`	`+ await Task.Delay(TimeSpan.FromSeconds(1), cts.Token);`
`242`	`244`	`}`
`243`	`245`
`244`	`246`	`/// <inheritdoc />`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private void SetCommunicationActionControl()`
`108`	`108`	`{`
`109`	`109`	`ViewModel.DeviceActionParameter = new CommunicationParameters(`
`110`	`110`	`ViewModel.ConnectedPortName, (uint)actionControl.SelectedBaudRate,`
`111`		`- actionControl.SelectedAddress);`
	`111`	`+ (byte)actionControl.SelectedAddress);`
`112`	`112`	`};`
`113`	`113`	`DeviceActionControl.Children.Add(actionControl);`
`114`	`114`	`}`