[test] Reduce non-integration unit test runtime in ByteSync.Client.UnitTests

src/ByteSync.Client/Services/Communications/ConnectionService.cs

@@ -1,4 +1,4 @@
-using System.Net.Http;
+using System.Net.Http;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Threading;
@@ -65,13 +65,15 @@
     public ByteSyncEndpoint? CurrentEndPoint { get; set; }
 
     public string? ClientInstanceId => CurrentEndPoint?.ClientInstanceId;
+
+    public Func<int, TimeSpan>? RetryDelaySleepDurationProvider { get; set; }
 
     public async Task StartConnectionAsync()
     {
         var retryPolicy = Policy
             .Handle<Exception>(ex => !(ex is BuildConnectionException bce && bce.InitialConnectionStatus == InitialConnectionStatus.VersionNotAllowed))
             .WaitAndRetryForeverAsync(
-                retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),
+                retryAttempt => RetryDelaySleepDurationProvider?.Invoke(retryAttempt) ?? TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),
                 (exception, _, _) =>
                 {
                     ConnectionStatusSubject.OnNext(ConnectionStatuses.NotConnected);
@@ -204,7 +206,7 @@
         ConnectionStatusSubject.OnNext(ConnectionStatuses.NotConnected);
     }
 
     public void Dispose()
     {
         _connectionSubscription?.Dispose();
         _refreshCancellationTokenSource?.Dispose();

src/ByteSync.Client/Services/TimeTracking/TimeTrackingComputer.cs

@@ -1,4 +1,5 @@
-using System.Reactive.Linq;
+using System.Reactive.Concurrency;
+using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using ByteSync.Business.Misc;
 using ByteSync.Interfaces.Controls.TimeTracking;
@@ -11,10 +12,12 @@ public class TimeTrackingComputer : ITimeTrackingComputer
     private readonly BehaviorSubject<bool> _isStarted;
 
     private readonly IDataTrackingStrategy _dataTrackingStrategy;
+    private readonly IScheduler _scheduler;
 
-    public TimeTrackingComputer(IDataTrackingStrategy dataTrackingStrategy)
+    public TimeTrackingComputer(IDataTrackingStrategy dataTrackingStrategy, IScheduler? scheduler = null)
     {
         _dataTrackingStrategy = dataTrackingStrategy;
+        _scheduler = scheduler ?? Scheduler.Default;
 
         _timeTrack = new BehaviorSubject<TimeTrack>(new TimeTrack());
         _isStarted = new BehaviorSubject<bool>(false);
@@ -49,7 +52,7 @@ public IObservable<TimeTrack> RemainingTime
                 {
                     if (isStarted)
                     {
-                        return Observable.Interval(TimeSpan.FromSeconds(1));
+                        return Observable.Interval(TimeSpan.FromSeconds(1), _scheduler);
                     }
                     else
                     {

src/ByteSync.Client/ViewModels/TrustedNetworks/AddTrustedClientViewModel.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
@@ -27,7 +27,7 @@
     private readonly MainWindow _mainWindow;
 
     [ExcludeFromCodeCoverage]
     public AddTrustedClientViewModel()
     {
     #if DEBUG
         if (Design.IsDesignMode)
@@ -39,7 +39,7 @@
             var safetyKey = "";
             for (var i = 0; i < 16; i++)
             {
                 safetyKey += "string_" + i + " ";
             }
 
             SafetyKeyParts = safetyKey.Split(" ", StringSplitOptions.RemoveEmptyEntries);
@@ -49,7 +49,7 @@
     #endif
     }
 
     public AddTrustedClientViewModel(PublicKeyCheckData? publicKeyCheckData, TrustDataParameters trustDataParameters,
         IPublicKeysManager publicKeysManager, IApplicationSettingsRepository applicationSettingsManager, 
         IPublicKeysTruster publicKeysTruster, ILogger<AddTrustedClientViewModel> logger, MainWindow mainWindow) 
     {
@@ -66,10 +66,10 @@
         _logger = logger;
         _mainWindow = mainWindow;
 
         if (publicKeyCheckData == null)
         {
             throw new ArgumentNullException(nameof(publicKeyCheckData));
         }
 
         MyClientId = _applicationSettingsRepository.GetCurrentApplicationSettings().ClientId;
         OtherClientId = publicKeyCheckData.IssuerPublicKeyInfo.ClientId;
@@ -224,7 +224,7 @@
 
             if (clipboard != null)
             {
                 var clipBoardValue = await clipboard.GetTextAsync();
 
                 var isSuccess = SafetyKeyParts.Length > 1 && SafetyKeyParts.JoinToString(" ").Equals(clipBoardValue);
 
@@ -279,13 +279,13 @@
                 _publicKeysManager.Trust(TrustedPublicKey);
 
                 ShowSuccess = true;
-                await Task.Delay(TimeSpan.FromSeconds(3));
+                await DelayAsync(TimeSpan.FromSeconds(3));
                 ShowSuccess = false;
             }
             else
             {
                 ShowError = true;
-                await Task.Delay(TimeSpan.FromSeconds(3));
+                await DelayAsync(TimeSpan.FromSeconds(3));
                 ShowError = false;
             }
 
@@ -309,7 +309,7 @@
             var task2 = _publicKeysTruster.OnPublicKeyValidationCanceled(PublicKeyCheckData!, TrustDataParameters);
 
             ShowError = true;
-            await Task.Delay(TimeSpan.FromSeconds(3));
+            await DelayAsync(TimeSpan.FromSeconds(3));
             ShowError = false;
 
             await Task.WhenAll(task, task2);
@@ -330,6 +330,8 @@
         await _publicKeysTruster.OnPublicKeyValidationCanceled(PublicKeyCheckData!, TrustDataParameters);
     }
 
+    protected virtual Task DelayAsync(TimeSpan delay) => Task.Delay(delay);
+
     private string[] BuildSafetyWords()
     {
         var safetyWordsComputer = new SafetyWordsComputer(SafetyWordsValues.AVAILABLE_WORDS);

tests/ByteSync.Client.IntegrationTests/Services/Communications/Transfers/R2DownloadResume_Tests.cs

@@ -6,6 +6,7 @@
 using ByteSync.Common.Business.Actions;
 using ByteSync.Common.Business.Inventories;
 using ByteSync.Common.Business.SharedFiles;
+using ByteSync.TestsCommon;
 using ByteSync.DependencyInjection;
 using ByteSync.Interfaces.Controls.Communications.Http;
 using ByteSync.Interfaces.Factories;
@@ -22,13 +23,14 @@
 
 namespace ByteSync.Client.IntegrationTests.Services.Communications.Transfers;
 
-public class R2DownloadResume_Tests
+public class R2DownloadResume_Tests : AbstractTester
 {
     private ILifetimeScope _clientScope = null!;
 
     [SetUp]
     public void SetUp()
     {
+        CreateTestDirectory();
         // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
         if (ByteSync.Services.ContainerProvider.Container == null)
         {
@@ -58,6 +60,11 @@ public void SetUp()
     public void TearDown()
     {
         _clientScope.Dispose();
+
+        if (TestDirectory?.Exists == true)
+        {
+            TestDirectory.Delete(true);
+        }
     }
 
     [Test]
@@ -99,7 +106,7 @@ public async Task Download_WithTransientFailure_Should_Retry_And_Succeed()
             Source = new SharedDataPart
             {
                 ClientInstanceId = shared.ClientInstanceId,
-                RootPath = Path.GetTempPath(),
+                RootPath = TestDirectory.FullName,
                 InventoryPartType = FileSystemTypes.File,
                 Name = "itests",
                 InventoryCodeAndId = "itests"
@@ -113,7 +120,7 @@ public async Task Download_WithTransientFailure_Should_Retry_And_Succeed()
         sag.Targets.Add(new SharedDataPart
         {
             ClientInstanceId = shared.ClientInstanceId,
-            RootPath = Path.GetTempFileName(),
+            RootPath = Path.Combine(TestDirectory.FullName, Guid.NewGuid().ToString("N") + ".tmp"),
             InventoryPartType = FileSystemTypes.File,
             Name = "itests",
             InventoryCodeAndId = "itests"
@@ -123,7 +130,7 @@ public async Task Download_WithTransientFailure_Should_Retry_And_Succeed()
 
         // First upload a file so we can download it
         var inputContent = new string('z', 1_000_000);
-        var tempFile = Path.GetTempFileName();
+        var tempFile = Path.Combine(TestDirectory.FullName, Guid.NewGuid().ToString("N") + ".tmp");
         await File.WriteAllTextAsync(tempFile, inputContent);
 
         var uploader = uploaderFactory.Build(tempFile, shared);

tests/ByteSync.Client.IntegrationTests/Services/Communications/Transfers/R2UploadDownload_Tests.cs

@@ -4,6 +4,7 @@
 using ByteSync.Client.IntegrationTests.TestHelpers;
 using ByteSync.Common.Business.Inventories;
 using ByteSync.Common.Business.SharedFiles;
+using ByteSync.TestsCommon;
 using ByteSync.DependencyInjection;
 using ByteSync.Interfaces.Controls.Communications.Http;
 using ByteSync.Interfaces.Factories;
@@ -19,13 +20,14 @@
 
 namespace ByteSync.Client.IntegrationTests.Services.Communications.Transfers;
 
-public class R2UploadDownload_Tests
+public class R2UploadDownload_Tests : AbstractTester
 {
     private ILifetimeScope _clientScope = null!;
 
     [SetUp]
     public void SetUp()
     {
+        CreateTestDirectory();
         // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
         if (ByteSync.Services.ContainerProvider.Container == null)
         {
@@ -93,7 +95,7 @@ public async Task Upload_Then_Download_Should_Succeed_With_Small_Chunks()
             Source = new SharedDataPart
             {
                 ClientInstanceId = shared.ClientInstanceId,
-                RootPath = Path.GetTempPath(),
+                RootPath = TestDirectory.FullName,
                 InventoryPartType = FileSystemTypes.File,
                 Name = "itests",
                 InventoryCodeAndId = "itests"
@@ -107,7 +109,7 @@ public async Task Upload_Then_Download_Should_Succeed_With_Small_Chunks()
         sag.Targets.Add(new SharedDataPart
         {
             ClientInstanceId = shared.ClientInstanceId,
-            RootPath = Path.GetTempFileName(),
+            RootPath = Path.Combine(TestDirectory.FullName, Guid.NewGuid().ToString("N") + ".tmp"),
             InventoryPartType = FileSystemTypes.File,
             Name = "itests",
             InventoryCodeAndId = "itests"
@@ -116,7 +118,7 @@ public async Task Upload_Then_Download_Should_Succeed_With_Small_Chunks()
         sharedActionsGroupRepository.SetSharedActionsGroups([sag]);
 
         var inputContent = new string('x', 1_000_000);
-        var tempFile = Path.GetTempFileName();
+        var tempFile = Path.Combine(TestDirectory.FullName, Guid.NewGuid().ToString("N") + ".tmp");
         await File.WriteAllTextAsync(tempFile, inputContent);
 
         var uploader = uploaderFactory.Build(tempFile, shared);

tests/ByteSync.Client.UnitTests/Services/Communications/ConnectionServiceTests.cs

@@ -1,4 +1,4 @@
-using ByteSync.Business.Communications;
+using ByteSync.Business.Communications;
 using ByteSync.Common.Business.Auth;
 using ByteSync.Common.Business.EndPoints;
 using ByteSync.Exceptions;
@@ -15,11 +15,11 @@
 
 public class ConnectionServiceTests
 {
     private Mock<IConnectionFactory> _mockConnectionFactory;
     private Mock<IAuthenticationTokensRepository> _mockAuthenticationTokensRepository;
     private Mock<ILogger<ConnectionService>> _mockLogger;
 
     private ConnectionService _connectionService;
 
     [SetUp]
     public void SetUp()
@@ -33,6 +33,8 @@
             _mockAuthenticationTokensRepository.Object,
             _mockLogger.Object
         );
+
+        _connectionService.RetryDelaySleepDurationProvider = _ => TimeSpan.Zero;
     }
 
     [Test]

tests/ByteSync.Client.UnitTests/Services/Communications/Transfers/Downloading/SynchronizationDownloadFinalizerTests.cs

@@ -8,11 +8,12 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
+using ByteSync.TestsCommon;
 
 namespace ByteSync.Client.UnitTests.Services.Communications.Transfers.Downloading;
 
 [TestFixture]
-public class SynchronizationDownloadFinalizerTests
+public class SynchronizationDownloadFinalizerTests : AbstractTester
 {
     private Mock<IDeltaManager> _deltaManager = null!;
     private Mock<ITemporaryFileManagerFactory> _temporaryFileManagerFactory = null!;
@@ -24,6 +25,7 @@ public class SynchronizationDownloadFinalizerTests
     [SetUp]
     public void Setup()
     {
+        CreateTestDirectory();
         _deltaManager = new Mock<IDeltaManager>(MockBehavior.Strict);
         _temporaryFileManagerFactory = new Mock<ITemporaryFileManagerFactory>(MockBehavior.Strict);
         _fileDatesSetter = new Mock<IFileDatesSetter>(MockBehavior.Strict);
@@ -276,15 +278,15 @@ private static void CreateEntryWithContent(ZipArchive archive, string entryName,
         writer.Write(content);
     }
 
-    private static string GetTempFilePath()
+    private string GetTempFilePath()
     {
-        var path = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+        var path = Path.Combine(TestDirectory.FullName, Guid.NewGuid().ToString("N"));
 
         return path;
     }
 
-    private static string GetNewTempPath(string extension)
+    private string GetNewTempPath(string extension)
     {
-        return Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N") + extension);
+        return Path.Combine(TestDirectory.FullName, Guid.NewGuid().ToString("N") + extension);
     }
 }

tests/ByteSync.Client.UnitTests/Services/Comparisons/InventoryComparerIncompletePartsFlatTests.cs

@@ -8,28 +8,29 @@
 using ByteSync.Models.Inventories;
 using ByteSync.Services.Comparisons;
 using FluentAssertions;
+using ByteSync.TestsCommon;
 using NUnit.Framework;
 
 namespace ByteSync.Client.UnitTests.Services.Comparisons;
 
 [TestFixture]
-public class InventoryComparerIncompletePartsFlatTests
+public class InventoryComparerIncompletePartsFlatTests : AbstractTester
 {
     private string _tempDirectory = null!;
 
     [SetUp]
     public void Setup()
     {
-        _tempDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-        Directory.CreateDirectory(_tempDirectory);
+        CreateTestDirectory();
+        _tempDirectory = TestDirectory.FullName;
     }
 
     [TearDown]
     public void TearDown()
     {
-        if (Directory.Exists(_tempDirectory))
+        if (TestDirectory?.Exists == true)
         {
-            Directory.Delete(_tempDirectory, true);
+            TestDirectory.Delete(true);
         }
     }
 

tests/ByteSync.Client.UnitTests/Services/Comparisons/InventoryComparerPropagateAccessIssuesTests.cs

@@ -7,32 +7,34 @@
 using ByteSync.Models.FileSystems;
 using ByteSync.Models.Inventories;
 using ByteSync.Services.Comparisons;
+using ByteSync.TestsCommon;
 using FluentAssertions;
 using NUnit.Framework;
 
 namespace ByteSync.Client.UnitTests.Services.Comparisons;
 
 [TestFixture]
-public class InventoryComparerPropagateAccessIssuesTests
+public class InventoryComparerPropagateAccessIssuesTests : AbstractTester
 {
     private string _tempDirectory = null!;
 
     [SetUp]
     public void Setup()
     {
-        _tempDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-        Directory.CreateDirectory(_tempDirectory);
+        CreateTestDirectory();
+        _tempDirectory = TestDirectory.FullName;
     }
-    
+
     [TearDown]
     public void TearDown()
     {
-        if (Directory.Exists(_tempDirectory))
+        if (TestDirectory?.Exists == true)
         {
-            Directory.Delete(_tempDirectory, true);
+            TestDirectory.Delete(true);
         }
     }
 
+
     private static string CreateInventoryZipFile(string directory, Inventory inventory)
     {
         var zipPath = Path.Combine(directory, $"{Guid.NewGuid()}.zip");

tests/ByteSync.Client.UnitTests/Services/Configurations/LocalApplicationDataManagerTests.cs

@@ -8,17 +8,19 @@
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using ByteSync.TestsCommon;
 
 namespace ByteSync.Client.UnitTests.Services.Configurations;
 
 [TestFixture]
-public class LocalApplicationDataManagerTests
+public class LocalApplicationDataManagerTests : AbstractTester
 {
     private Mock<IEnvironmentService> _environmentServiceMock = null!;
 
     [SetUp]
     public void SetUp()
     {
+        CreateTestDirectory();
         _environmentServiceMock = new Mock<IEnvironmentService>();
         _environmentServiceMock.SetupGet(e => e.ExecutionMode).Returns(ExecutionMode.Regular);
         _environmentServiceMock.SetupProperty(e => e.Arguments, []);
@@ -81,7 +83,7 @@
     public void ApplicationDataPath_Should_Append_CustomSuffix_When_DebugArgumentProvided(OSPlatforms osPlatform)
     {
         // Arrange
-        var tempRoot = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+        var tempRoot = TestDirectory.FullName;
         Directory.CreateDirectory(tempRoot);
         var assemblyDirectory = Directory.CreateDirectory(Path.Combine(tempRoot, "Portable")).FullName;
         var assemblyPath = Path.Combine(assemblyDirectory, "ByteSync.exe");
@@ -131,7 +133,7 @@
     public void ApplicationDataPath_Should_Create_DebugDirectory_When_DebugModeWithoutOverride(OSPlatforms osPlatform)
     {
         // Arrange
-        var tempRoot = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+        var tempRoot = TestDirectory.FullName;
         Directory.CreateDirectory(tempRoot);
         var assemblyDirectory = Directory.CreateDirectory(Path.Combine(tempRoot, "Portable")).FullName;
         var assemblyPath = Path.Combine(assemblyDirectory, "ByteSync.exe");
@@ -180,7 +182,7 @@
     public void LogFilePath_Should_Return_MostRecent_Log_Excluding_Debug()
     {
         // Arrange
-        var tempRoot = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+        var tempRoot = TestDirectory.FullName;
         Directory.CreateDirectory(tempRoot);
         var assemblyDirectory = Directory.CreateDirectory(Path.Combine(tempRoot, "Portable")).FullName;
         var assemblyPath = Path.Combine(assemblyDirectory, "ByteSync.exe");
@@ -243,7 +245,7 @@
     public void DebugLogFilePath_Should_Return_MostRecent_Debug_Log()
     {
         // Arrange
-        var tempRoot = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+        var tempRoot = TestDirectory.FullName;
         Directory.CreateDirectory(tempRoot);
         var assemblyDirectory = Directory.CreateDirectory(Path.Combine(tempRoot, "Portable")).FullName;
         var assemblyPath = Path.Combine(assemblyDirectory, "ByteSync.exe");
@@ -302,7 +304,7 @@
         }
     }
 
     private static IDisposable OverrideCommandLineArgs(string[] args)
     {
         var field = typeof(Environment).GetField("s_commandLineArgs", BindingFlags.Static | BindingFlags.NonPublic);
         if (field == null)