TestExecutionCancelAndFinished && !cancelling. RunAsync Action for tests

Author: tonyhallett

FineCodeCoverageTests/TestContainerDiscovery_Tests.cs

@@ -62,6 +62,10 @@ public void SetUp()
         {
             mocker = new AutoMoqer();
             var testContainerDiscoverer = mocker.Create<TestContainerDiscoverer>();
+            testContainerDiscoverer.RunAsync = (taskProvider) =>
+            {
+                taskProvider().Wait();
+            };
             testContainerDiscoverer.initializeThread.Join();
         }
 

SharedProject/Impl/TestContainerDiscovery/TestContainerDiscoverer.cs

@@ -65,6 +65,11 @@ IReportGeneratorUtil reportGeneratorUtil
 
         }
 
+        internal Action<Func<System.Threading.Tasks.Task>> RunAsync = (taskProvider) =>
+        {
+            _ = ThreadHelper.JoinableTaskFactory.RunAsync(taskProvider);
+        };
+
         private async System.Threading.Tasks.Task TestExecutionStartingAsync(IOperation operation)
         {
             fccEngine.StopCoverage();
@@ -125,15 +130,16 @@ private async System.Threading.Tasks.Task TestExecutionFinishedAsync(IOperation
             }
             fccEngine.ReloadCoverage(testOperation.GetCoverageProjectsAsync);
         }
-
+        private bool cancelling;
         private void OperationState_StateChanged(object sender, OperationStateChangedEventArgs e)
         {
-            _ = ThreadHelper.JoinableTaskFactory.RunAsync(async () =>
+            RunAsync(async () =>
             {
                 try
                 {
                     if (e.State == TestOperationStates.TestExecutionCanceling)
                     {
+                        cancelling = true;
                         await CombinedLogAsync("Test execution cancelling - running coverage will be cancelled.");
                         await reportGeneratorUtil.EndOfCoverageRunAsync(); // not necessarily true but get desired result
                         fccEngine.StopCoverage();
@@ -143,19 +149,21 @@ private void OperationState_StateChanged(object sender, OperationStateChangedEve
                     if (e.State == TestOperationStates.TestExecutionStarting)
                     {
                         await TestExecutionStartingAsync(e.Operation);
+                        cancelling = false;
                     }
 
                     if (e.State == TestOperationStates.TestExecutionFinished)
                     {
                         await TestExecutionFinishedAsync(e.Operation);
                     }
 
-                    if (e.State == TestOperationStates.TestExecutionCancelAndFinished)
+                    if (e.State == TestOperationStates.TestExecutionCancelAndFinished && !cancelling)
                     {
                         await CombinedLogAsync("There has been an issue running tests. See the Tests output window pane.");
                         await reportGeneratorUtil.EndOfCoverageRunAsync(); // not necessarily true but get desired result
-                    fccEngine.StopCoverage();
+                        fccEngine.StopCoverage();
                     }
+                    
                 }
                 catch (Exception exception)
                 {