Refactored

Author: FrankRay78

src/NetPace.Core/Clients/Testing/SpeedTestMock.cs

@@ -15,25 +15,13 @@ public sealed class SpeedTestMock : ISpeedTestService
     /// Gets or sets the delegate that provides behavior for <see cref="GetServerLatencyAsync(IServer, CancellationToken)"/>.
     /// If null, the method will throw <see cref="NotImplementedException"/> when called.
     /// </summary>
-    public Func<IServer, CancellationToken, Task<ServerLatencyResult>>? GetServerLatencyAsyncFunc { get; set; }
-
-    /// <summary>
-    /// Gets or sets the delegate that provides behavior for <see cref="GetServerLatencyAsync(IServer, Action{SpeedTestProgress}, CancellationToken)"/>.
-    /// If null, the method will throw <see cref="NotImplementedException"/> when called.
-    /// </summary>
-    public Func<IServer, Action<SpeedTestProgress>, CancellationToken, Task<ServerLatencyResult>>? GetServerLatencyWithProgressAsyncFunc { get; set; }
+    public Func<IServer, Action<SpeedTestProgress>, CancellationToken, Task<ServerLatencyResult>>? GetServerLatencyAsyncFunc { get; set; }
 
     /// <summary>
     /// Gets or sets the delegate that provides behavior for <see cref="GetServerLatencyAsync(string, CancellationToken)"/>.
     /// If null, the method will throw <see cref="NotImplementedException"/> when called.
     /// </summary>
-    public Func<string, CancellationToken, Task<ServerLatencyResult>>? GetServerLatencyByServerUrlAsyncFunc { get; set; }
-
-    /// <summary>
-    /// Gets or sets the delegate that provides behavior for <see cref="GetServerLatencyAsync(string, Action{SpeedTestProgress}, CancellationToken)"/>.
-    /// If null, the method will throw <see cref="NotImplementedException"/> when called.
-    /// </summary>
-    public Func<string, Action<SpeedTestProgress>, CancellationToken, Task<ServerLatencyResult>>? GetServerLatencyByServerUrlWithProgressAsyncFunc { get; set; }
+    public Func<string, Action<SpeedTestProgress>, CancellationToken, Task<ServerLatencyResult>>? GetServerLatencyByServerUrlAsyncFunc { get; set; }
 
     /// <summary>
     /// Gets or sets the delegate that provides behavior for <see cref="GetFastestServerByLatencyAsync"/>.
@@ -65,31 +53,31 @@ public Task<IServer[]> GetServersAsync(CancellationToken cancellationToken = def
     public Task<ServerLatencyResult> GetServerLatencyAsync(IServer server, CancellationToken cancellationToken = default)
     {
         if (GetServerLatencyAsyncFunc != null)
-            return GetServerLatencyAsyncFunc(server, cancellationToken);
+            return GetServerLatencyAsyncFunc(server, _ => { }, cancellationToken);
         throw new NotImplementedException(nameof(GetServerLatencyAsync));
     }
 
     /// <inheritdoc/>
     public Task<ServerLatencyResult> GetServerLatencyAsync(IServer server, Action<SpeedTestProgress> UpdateProgress, CancellationToken cancellationToken = default)
     {
-        if (GetServerLatencyWithProgressAsyncFunc != null)
-            return GetServerLatencyWithProgressAsyncFunc(server, UpdateProgress, cancellationToken);
+        if (GetServerLatencyAsyncFunc != null)
+            return GetServerLatencyAsyncFunc(server, UpdateProgress, cancellationToken);
         throw new NotImplementedException(nameof(GetServerLatencyAsync));
     }
 
     /// <inheritdoc/>
     public Task<ServerLatencyResult> GetServerLatencyAsync(string serverUrl, CancellationToken cancellationToken = default)
     {
         if (GetServerLatencyByServerUrlAsyncFunc != null)
-            return GetServerLatencyByServerUrlAsyncFunc(serverUrl, cancellationToken);
+            return GetServerLatencyByServerUrlAsyncFunc(serverUrl, _ => { }, cancellationToken);
         throw new NotImplementedException(nameof(GetServerLatencyAsync));
     }
 
     /// <inheritdoc/>
     public Task<ServerLatencyResult> GetServerLatencyAsync(string serverUrl, Action<SpeedTestProgress> UpdateProgress, CancellationToken cancellationToken = default)
     {
-        if (GetServerLatencyByServerUrlWithProgressAsyncFunc != null)
-            return GetServerLatencyByServerUrlWithProgressAsyncFunc(serverUrl, UpdateProgress, cancellationToken);
+        if (GetServerLatencyByServerUrlAsyncFunc != null)
+            return GetServerLatencyByServerUrlAsyncFunc(serverUrl, UpdateProgress, cancellationToken);
         throw new NotImplementedException(nameof(GetServerLatencyAsync));
     }
 

src/NetPace.Core/Clients/Testing/SpeedTestStub.cs

@@ -86,27 +86,9 @@ public Task<ServerLatencyResult> GetServerLatencyAsync(string serverUrl, Cancell
     /// <inheritdoc/>
     public Task<ServerLatencyResult> GetServerLatencyAsync(string serverUrl, Action<SpeedTestProgress> UpdateProgress, CancellationToken cancellationToken = default)
     {
-        if (UpdateProgress is not null)
-        {
-            Task.Delay(delayMilliseconds).Wait();
-            UpdateProgress(new SpeedTestProgress { PercentageComplete = 25 });
-            Task.Delay(delayMilliseconds).Wait();
-            UpdateProgress(new SpeedTestProgress { PercentageComplete = 50 });
-            Task.Delay(delayMilliseconds).Wait();
-            UpdateProgress(new SpeedTestProgress { PercentageComplete = 75 });
-            Task.Delay(delayMilliseconds).Wait();
-            UpdateProgress(new SpeedTestProgress { PercentageComplete = 100 });
-        }
-
-        var serverID = GetServerID(serverUrl);
+        var server = new Server() { Location = "(Unknown)", Sponsor = "(Unknown)", Url = serverUrl };
 
-        var latencyResult = new ServerLatencyResult
-        {
-            Server = new Server() { Location = "(Unknown)", Sponsor = "(Unknown)", Url = serverUrl },
-            Latency = serverID * 100
-        };
-
-        return Task.FromResult(latencyResult);
+        return GetServerLatencyAsync(server, UpdateProgress, cancellationToken);
     }
 
     /// <inheritdoc/>