split PayrunTestRunner into ImportAsync and TestAsync — separate import from test phase

Author: Jani Giannoudis

Client.Test/PayrollEngine.Client.Test.xml

@@ -41,47 +41,45 @@ public PayrunTestRunner(PayrollHttpClient httpClient,
         RunMode = runMode;
     }
 
-    /// <summary>Start the test</summary>
-    /// <returns>A list of payrun job results</returns>
-    public override async Task<Dictionary<Tenant, List<PayrollTestResult>>> TestAllAsync(Model.Exchange exchange)
+    /// <summary>Import exchange data without running tests</summary>
+    /// <param name="exchange">The test exchange</param>
+    public async Task ImportAsync(Model.Exchange exchange)
     {
         // apply owner
         ApplyOwner(exchange, Settings.Owner);
 
-        var results = new Dictionary<Tenant, List<PayrollTestResult>>();
-        try
+        // validate tenants
+        foreach (var tenant in exchange.Tenants)
         {
-            // start cleanup
-            await CleanupTenants(exchange, results);
+            ValidateTenant(tenant);
+        }
 
-            // validate tenants
-            foreach (var tenant in exchange.Tenants)
-            {
-                // tenant validation: missing results
-                ValidateTenant(tenant);
-            }
+        // cleanup existing tenants before import
+        var emptyResults = new Dictionary<Tenant, List<PayrollTestResult>>();
+        await CleanupTenants(exchange, emptyResults);
 
-            // validate tenants and regulation permissions
-            // create new tenant including all payrolls, payrun and payrun job
-            var import = new ExchangeImport(HttpClient, exchange, ScriptParser, importMode: ImportMode);
-            await import.ImportAsync();
+        // create new tenant including all payrolls, payrun and payrun job
+        var import = new ExchangeImport(HttpClient, exchange, ScriptParser, importMode: ImportMode);
+        await import.ImportAsync();
+    }
 
+    /// <summary>Run payrun tests on already-imported exchange data</summary>
+    /// <param name="exchange">The test exchange (must have been imported via <see cref="ImportAsync"/>)</param>
+    /// <returns>A list of payrun job results</returns>
+    public async Task<Dictionary<Tenant, List<PayrollTestResult>>> TestAsync(Model.Exchange exchange)
+    {
+        var results = new Dictionary<Tenant, List<PayrollTestResult>>();
+        try
+        {
             // not test skip
             if (RunMode == TestRunMode.RunTests)
             {
-                // test tenants
                 foreach (var tenant in exchange.Tenants)
                 {
-                    // no test
                     if (tenant.PayrollResults == null || !tenant.PayrollResults.Any())
                     {
                         continue;
                     }
-
-                    // wait for completed payrun jobs
-                    // await WaitForCompletedPayrunJobsAsync(tenant, JobResultMode.Single);
-
-                    // test results
                     var payrunJobResult = await TestPayrunJobAsync(tenant, JobResultMode.Single);
                     results.Add(tenant, payrunJobResult.ToList());
                 }
@@ -91,10 +89,17 @@ public override async Task<Dictionary<Tenant, List<PayrollTestResult>>> TestAllA
         {
             await CleanupTenants(exchange, results);
         }
-
         return results;
     }
 
+    /// <summary>Start the test (import + test in one step)</summary>
+    /// <returns>A list of payrun job results</returns>
+    public override async Task<Dictionary<Tenant, List<PayrollTestResult>>> TestAllAsync(Model.Exchange exchange)
+    {
+        await ImportAsync(exchange);
+        return await TestAsync(exchange);
+    }
+
     /// <summary>Validate the tenant</summary>
     /// <param name="tenant">The tenant</param>
     protected virtual void ValidateTenant(ExchangeTenant tenant)

Client.Test/Payrun/PayrunTestRunner.cs

@@ -21,9 +21,9 @@ public class PayrunTestSettings
     public string Owner { get; set; }
 
     /// <summary>
-    /// Result retry delay in milliseconds (default: 1000 ms)
+    /// Result retry delay in milliseconds (default: 50 ms)
     /// </summary>
-    public int ResultRetryDelay { get; set; } = 1000;
+    public int ResultRetryDelay { get; set; } = 50;
 
     /// <summary>
     /// Result retry count (default: 50)