Delete button "Decode". Add label for display input status. Update tests.

Author: SaintZet

FiscalDeviceStatusDecoder/Application/MainViewModel.cs

@@ -6,16 +6,17 @@ namespace FiscalDeviceStatusDecoder.Application;
 
 public class MainViewModel : INotifyPropertyChanged
 {
-    private readonly IMessageBox MessageBox;
+    public const string ValidHexMessage = "Valid HEX";
+
     private string bytes = string.Empty;
     private string hex = string.Empty;
+    private string displayStatusInput = string.Empty;
     private List<StatusBit>? statusDevices;
 
-    public MainViewModel(IMessageBox messageBox)
+    public MainViewModel()
     {
         Devices = InitializeDevices();
         SelectedDevices = Devices[0];
-        MessageBox = messageBox;
     }
 
     public event PropertyChangedEventHandler? PropertyChanged;
@@ -66,6 +67,16 @@ public string Bytes
         }
     }
 
+    public string DisplayStatusInput
+    {
+        get => displayStatusInput;
+        set
+        {
+            displayStatusInput = value;
+            OnPropertyChanged(nameof(DisplayStatusInput));
+        }
+    }
+
     public ICommand DecodeCommand => new RelayCommand(execute: _ => StatusDevices = InitializeStatusDevice(SelectedDevices, hex), canExecute: _ => hex?.Length > 0);
 
     public string DecodeToByte(ref string hex)
@@ -89,14 +100,15 @@ public void OnPropertyChanged(string prop = "")
         try
         {
             List<string> bytesArray = SetStatusBytesAndHex(selectedDevices, hex);
-            return SetStatusDevice(selectedDevices, bytesArray);
+            var statusBits = SetStatusDevice(selectedDevices, bytesArray);
+
+            DisplayStatusInput = ValidHexMessage;
+
+            return statusBits;
         }
         catch (Exception ex)
         {
-            MessageBox.ShowMessage(ex.Message, "Oops..", MessageBoxButton.OK, MessageBoxImage.Error);
-
-            Hex = string.Empty;
-            Bytes = string.Empty;
+            DisplayStatusInput = ex.Message;
 
             return null;
         }

FiscalDeviceStatusDecoder/Application/Services/MessageBox.cs

@@ -4,19 +4,24 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:conv="clr-namespace:FiscalDeviceStatusDecoder.Presentation.Converters"
+        xmlns:app="clr-namespace:FiscalDeviceStatusDecoder.Application"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
         ResizeMode="CanMinimize"
         Title="FD Status Decoder"
         Height="750"
         Width="700">
+    <Window.DataContext>
+        <app:MainViewModel />
+    </Window.DataContext>
     <Window.Resources>
         <conv:BoolToBrushConverter x:Key="BoolToBrushConverter" />
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="0.1*" />
-            <RowDefinition Height="0.1*" />
+            <RowDefinition Height="0.11*" />
+            <RowDefinition Height="0.11*" />
+            <RowDefinition Height="0.11*" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
@@ -39,8 +44,7 @@
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="0.2*" />
-                <ColumnDefinition Width="0.7*" />
-                <ColumnDefinition Width="0.3*" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <Label Grid.Column="0"
                    HorizontalAlignment="Center"
@@ -50,16 +54,30 @@
                      HorizontalContentAlignment="Left"
                      VerticalContentAlignment="Center"
                      Padding="10"
-                     Margin="0,10,10,10"
+                     Margin="0,10,30,10"
                      Text="{Binding DisplayHex , Mode=TwoWay,UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True}">
             </TextBox>
-            <Button Grid.Column="2"
-                    Margin="0,10,30,10"
-                    Command="{Binding DecodeCommand}"
-                    Content="Decode" />
         </Grid>
 
-        <GroupBox Grid.Row="2"
+        <Grid Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.2*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Label Grid.Column="0"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Content="Status input" />
+            <Label Grid.Column="1"
+                   Padding="10"
+                   Margin="0,10,30,10"
+                   BorderThickness="1"
+                   BorderBrush="#FFABADB3"
+                   Content="{Binding DisplayStatusInput}">
+            </Label>
+        </Grid>
+
+        <GroupBox Grid.Row="3"
                   FontSize="14"
                   Header="{Binding DisplayBytes}"
                   Margin="10"

FiscalDeviceStatusDecoder/Domain/Contracts/IMessageBox.cs

@@ -10,7 +10,6 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
-            DataContext = new MainViewModel(new Presentation.Services.MessageBox());
         }
     }
 }

FiscalDeviceStatusDecoder/Presentation/MainWindow.xaml

@@ -2,30 +2,17 @@
 using FiscalDeviceStatusDecoder.Domain;
 using NSubstitute;
 using NUnit.Framework;
-using System.Windows;
 
 namespace FiscalDeviceStatusDecoderTest;
 
-internal class MessageBox : IMessageBox
-{
-    internal int CountMessage;
-
-    public void ShowMessage(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
-    {
-        CountMessage++;
-    }
-}
-
 public class MainViewModelTest
 {
     private MainViewModel target;
-    private MessageBox messageBox;
 
     [SetUp]
     public void Setup()
     {
-        messageBox = new();
-        target = new(messageBox);
+        target = new();
     }
 
     [Test]
@@ -99,6 +86,7 @@ public void InitializeStatusDevices_HexLessNumber_MessagesAboutError(string hex)
     {
         // arrange
         int countErrorForInvalidHex = 0;
+        int countMessage = 0;
 
         // act
         foreach (var devices in MainViewModel.Devices)
@@ -107,9 +95,14 @@ public void InitializeStatusDevices_HexLessNumber_MessagesAboutError(string hex)
             countErrorForInvalidHex += bytesArray.Length < devices.QuantityStatusByte ? 1 : 0;
 
             target.InitializeStatusDevice(devices, hex);
+
+            if (target.DisplayStatusInput != MainViewModel.ValidHexMessage)
+            {
+                countMessage++;
+            }
         }
         // assert
-        Assert.That(messageBox.CountMessage, Is.EqualTo(countErrorForInvalidHex));
+        Assert.That(countMessage, Is.EqualTo(countErrorForInvalidHex));
     }
 
     [Test]
@@ -120,6 +113,7 @@ public void InitializeStatusDevices_HexAndInvalidModels_MessagesAboutError(strin
     {
         // arrange
         int countErrorForInvalidHex = 0;
+        int countMessage = 0;
 
         // act
         foreach (var devices in MainViewModel.Devices)
@@ -128,10 +122,15 @@ public void InitializeStatusDevices_HexAndInvalidModels_MessagesAboutError(strin
             countErrorForInvalidHex++;
 
             target.InitializeStatusDevice(mock, hex);
+
+            if (target.DisplayStatusInput != MainViewModel.ValidHexMessage)
+            {
+                countMessage++;
+            }
         }
 
         // assert
-        Assert.That(messageBox.CountMessage, Is.EqualTo(countErrorForInvalidHex));
+        Assert.That(countMessage, Is.EqualTo(countErrorForInvalidHex));
     }
 
     [Test]