Mocks & New IRoboCommand for non-windows platforms

.github/workflows/build-and-test.yml

@@ -0,0 +1,76 @@
+#
+# Build the solution, run the 2 unit tests, then create artifacts.
+#
+# For more information on GitHub Actions, refer to https://github.com/features/actions
+# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
+# refer to https://github.com/microsoft/github-actions-for-desktop-apps
+
+name: Build and Test
+
+on:
+  push:
+    branches: [ "dev", "Extensions.Mocks" ]
+  pull_request:
+    branches: [ "dev" ]
+
+jobs:
+
+  build:
+
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: windows-latest  # For a list of available runner types, refer to
+                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
+
+    env:
+      Solution_Name: RoboSharp.sln                        # Replace with your solution name, i.e. MyWpfApp.sln.
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+
+    # Install the .NET SDK - https://github.com/actions/setup-dotnet
+    - name: Install .NET SDK
+      uses: actions/setup-dotnet@v5
+      with:
+        dotnet-version: |
+            8.0.x
+            10.0.x
+
+    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
+    - name: Setup MSBuild.exe
+      uses: microsoft/setup-msbuild@v3
+
+    - name: Restore
+      run: dotnet restore $env:Solution_Name
+
+    - name: Build
+      run: dotnet build $env:Solution_Name --configuration ${{ matrix.configuration }} --no-restore
+
+    - name: Run RoboSharp Tests
+      run: dotnet test ./RoboSharpUnitTesting/RoboSharpUnitTesting.csproj --configuration Release --no-build
+
+    - name: Run RoboSharp.Extensions Tests
+      run: dotnet test ./RoboSharp.Extensions.UnitTests/RoboSharp.Extensions.UnitTests.csproj --configuration Release --no-build
+
+      # Execute all unit tests in the solution
+    - name: Execute unit tests
+      run: dotnet test
+
+    - name: Gather Artifacts
+      run: |
+        dotnet pack ./RoboSharp/RoboSharp.csproj --configuration Release --no-build --output ./artifacts
+        dotnet pack ./RoboSharp.Extensions/RoboSharp.Extensions.csproj --configuration Release --no-build --output ./artifacts
+        dotnet publish ./Robosharp.ConsoleApp/Robosharp.ConsoleApp.csproj --configuration Release --no-build --output ./artifacts/ConsoleApp
+        dotnet publish ./RoboSharp.BackupApp/RoboSharp.BackupApp.csproj --configuration Release --no-build --output ./artifacts/BackupApp
+
+
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v6
+      with:
+        name: nuget-packages
+        path: ./artifacts/*

RoboSharp.BackupApp/MainWindow.xaml

@@ -84,7 +84,17 @@
                                 <TextBox Grid.Row="4" Text="{Binding JobNameTextbox}"  Width="175" Grid.ColumnSpan="1" LostFocus="RefreshQueueListbox" />
                             </Grid>
                             <!-- Job Options -->
-                            <StackPanel Margin="34,10,20,10" DataContext="{Binding CommandGenerator}" Name="CopyOptionsExpander">
+                            <Expander Header="Command Types" Margin="34,10,20,0" Background="LightYellow">
+                                <GroupBox>
+                                    <StackPanel>
+                                        <RadioButton Content="RoboCommand (default)" IsChecked="{Binding CommandFactory.RoboCommand}" />
+                                        <RadioButton Content="RoboCommandPortable - StreamedFileCopier" IsChecked="{Binding CommandFactory.RoboCommandPortable_Streamed}" />
+                                        <RadioButton Content="RoboCommandPortable - CopyFileEx" IsChecked="{Binding CommandFactory.RoboCommandPortable_CopyFileEx}" />
+                                        <RadioButton Content="RoboMover" IsChecked="{Binding CommandFactory.RoboMover}" />
+                                    </StackPanel>
+                                </GroupBox>
+                            </Expander>
+                            <StackPanel Margin="34,0,20,10" DataContext="{Binding CommandGenerator}" Name="CopyOptionsExpander">
                                 <Expander Background="LightBlue" Header="Copy Options" DataContext="{Binding Command.CopyOptions}">
                                     <Grid Margin="10">
                                         <Grid.RowDefinitions>

RoboSharp.BackupApp/RoboSharp.BackupApp.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net48;net8.0-Windows;net10.0-Windows</TargetFrameworks>
+        <TargetFrameworks>net8.0-Windows;net10.0-Windows</TargetFrameworks>
         <OutputType>WinExe</OutputType>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <UseWindowsForms>true</UseWindowsForms>

RoboSharp.BackupApp/ViewModels/CommandGeneratorViewModel.cs

@@ -14,8 +14,9 @@ namespace RoboSharp.BackupApp.ViewModels
 {
     internal partial class CommandGeneratorViewModel : ObservableObject
     {
-        public CommandGeneratorViewModel() 
+        public CommandGeneratorViewModel(IRoboCommandFactory factory) 
         {
+            this.factory = factory;
             ResetOptions();
             this.PropertyChanged += PropertyChangedHandler;
             System.Windows.Input.CommandManager.RequerySuggested += CommandManager_RequerySuggested;
@@ -29,6 +30,8 @@ private void CommandManager_RequerySuggested(object sender, EventArgs e)
             this.BtnParseCommandOptionsCommand.NotifyCanExecuteChanged();
         }
 
+        private readonly IRoboCommandFactory factory;
+
         [ObservableProperty] private IRoboCommand _command;
         [ObservableProperty] private string runHoursStart;
         [ObservableProperty] private string runHoursEnd;
@@ -46,7 +49,13 @@ private void ResetOptions()
         public IRoboCommand GetCommand()
         {
             UpdateCommandName();
-            return new RoboCommand(Command);
+            var cmd = factory.GetRoboCommand();
+            cmd.CopyOptions = Command.CopyOptions;
+            cmd.LoggingOptions = Command.LoggingOptions;
+            cmd.RetryOptions = Command.RetryOptions;
+            cmd.SelectionOptions = Command.SelectionOptions;
+            cmd.JobOptions.Merge(Command.JobOptions);
+            return cmd;
         }
 
         private void UpdateCommandName()

RoboSharp.BackupApp/ViewModels/MainWindowViewModel.cs

@@ -21,6 +21,7 @@ public MainWindowViewModel()
             SingleJobHistory = new JobHistoryViewModel();
             BatchCommandViewModel = new BatchCommandViewModel();
             System.Windows.Input.CommandManager.RequerySuggested += CommandManager_RequerySuggested;
+            CommandGenerator = new CommandGeneratorViewModel(CommandFactory);
         }
 
         private void CommandManager_RequerySuggested(object sender, EventArgs e)
@@ -34,12 +35,29 @@ private void CommandManager_RequerySuggested(object sender, EventArgs e)
         }
 
         public RoboQueueViewModel RoboQueueViewModel { get; } = new RoboQueueViewModel(new RoboQueue("RoboQueue"));
-        public CommandGeneratorViewModel CommandGenerator { get; } = new CommandGeneratorViewModel();
+        public CommandGeneratorViewModel CommandGenerator { get; }
         public CommandProgressViewModel SingleJobProgress { get; } = new CommandProgressViewModel();
         public JobHistoryViewModel SingleJobHistory { get; } 
         public BatchCommandViewModel BatchCommandViewModel { get; }
 
+        public CommandFactoryVM CommandFactory { get; } = new CommandFactoryVM();
 
+        public class CommandFactoryVM : RoboSharp.RoboCommandFactory
+        {
+            public override IRoboCommand GetRoboCommand()
+            {
+                if (RoboCommand) return base.GetRoboCommand();
+                if (RoboCommandPortable_Streamed) return new Extensions.RoboCommandPortable(Extensions.StreamedCopierFactory.DefaultFactory);
+                if (RoboCommandPortable_CopyFileEx) return new Extensions.RoboCommandPortable(new Extensions.Windows.CopyFileExFactory());
+                if (RoboMover) return new Extensions.RoboMover();
+                return base.GetRoboCommand();
+            }
+            public bool RoboCommand { get; set; } = true;
+            public bool RoboCommandPortable_Streamed { get; set; }
+            public bool RoboCommandPortable_CopyFileEx { get; set; }
+            public bool RoboMover { get; set; }
+        }
+
 
         #region < RoboCommand Buttons >
 

RoboSharp.Extensions.UnitTests/BatchCommandTests.cs

@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using RoboSharp;
-using RoboSharp.Extensions.Helpers;
 using RoboSharp.Interfaces;
 using RoboSharp.UnitTests;
 using System;
@@ -16,7 +15,10 @@ namespace RoboSharp.Extensions.Tests
     [TestClass]
     public class BatchCommandTests
     {
+        public TestContext TestContext { get; set; }
+
         [TestMethod]
+        [Timeout(5000, CooperativeCancellation = true)]
         public async Task TestCopyOperation()
         {
             string destination = TestPrep.GetRandomPath(true);
@@ -30,7 +32,7 @@ public async Task TestCopyOperation()
                 cmd.LoggingOptions.IncludeFullPathNames = true;
                 cmd.Configuration.EnableFileLogging = true;
                 cmd.AddCopiers(files);
-                var results = await Test_Setup.RunTest(cmd);
+                var results = await Test_Setup.RunTest(cmd, TestContext.CancellationToken);
                 Test_Setup.WriteLogLines(results.Results);
                 Assert.AreEqual(files.Count(), results.Results.FilesStatistic.Copied); // expect 4
             }
@@ -41,6 +43,7 @@ public async Task TestCopyOperation()
         }
 
         [TestMethod]
+        [Timeout(5000, CooperativeCancellation =true)]
         public async Task TestCancellation()
         {
             CancellationTokenSource cToken = new CancellationTokenSource();
@@ -62,7 +65,7 @@ public async Task TestCancellation()
             };
 
             cmd.OnError += (o, e) => Console.WriteLine(e.Error);
-            var results = await Test_Setup.RunTest(cmd);
+            var results = await Test_Setup.RunTest(cmd, TestContext.CancellationToken);
             Test_Setup.WriteLogLines(results.Results);
             Assert.IsTrue(results.Results.Status.WasCancelled, "Results.Status.WasCancelled flag not set!");
             var numCopied = results.Results.FilesStatistic.Copied;

RoboSharp.Extensions.UnitTests/DirectoryPairTests.cs

@@ -1,6 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using RoboSharp;
-using RoboSharp.Extensions.Helpers;
 using RoboSharp.Interfaces;
 using RoboSharp.UnitTests;
 using System;

RoboSharp.Extensions.UnitTests/Helpers/ResultsBuilderTests.cs

@@ -135,9 +135,11 @@ public void AddFileSkippedTest()
 
             var testFile = new ProcessedFileInfo() { FileClass = cmd.Configuration.LogParsing_NewFile, FileClassType = FileClassType.File, Name = "TestFileName", Size = 100 };
             cmd.LoggingOptions.NoFileList = true;
+            cmd.LoggingOptions.ReportExtraFiles = false;
             builder.AddFileSkipped(testFile);
             Assert.AreEqual(0, builder.CurrentLogLines.LongLength);
             cmd.LoggingOptions.NoFileList = false;
+            cmd.LoggingOptions.ReportExtraFiles = true;
             builder.AddFileSkipped(testFile);
             Assert.AreEqual(1, builder.CurrentLogLines.LongLength);
             Assert.AreEqual(2, builder.GetResults().FilesStatistic.Skipped);