RemoveGeneratedProjectSettingsAsync at appropriate times. tests to follow

Author: tonyhallett

FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_Collect_Tests.cs

@@ -13,6 +13,7 @@
 using FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage;
 using FineCodeCoverageTests.Test_helpers;
 using FineCodeCoverage.Engine.ReportGenerator;
+using FineCodeCoverage.Engine.Model;
 
 namespace FineCodeCoverageTests.MsCodeCoverage
 {
@@ -70,8 +71,10 @@ private async Task RunAndProcessReportAsync(IEnumerable<Uri> resultsUris,string[
 
             var mockOperation = new Mock<IOperation>();
             mockOperation.Setup(operation => operation.GetRunSettingsDataCollectorResultUri(new Uri(RunSettingsHelper.MsDataCollectorUri))).Returns(resultsUris);
-            
-            await msCodeCoverageRunSettingsService.CollectAsync(mockOperation.Object, new Mock<ITestOperation>().Object);
+
+            var mockTestOperation = new Mock<ITestOperation>();
+            mockTestOperation.Setup(testOperation => testOperation.GetCoverageProjectsAsync()).ReturnsAsync(new List<ICoverageProject>());
+            await msCodeCoverageRunSettingsService.CollectAsync(mockOperation.Object, mockTestOperation.Object);
 
             mockFccEngine.Verify(engine => engine.RunAndProcessReport(
                     It.Is<string[]>(coberturaFiles => !expectedCoberturaFiles.Except(coberturaFiles).Any() && !coberturaFiles.Except(expectedCoberturaFiles).Any()), It.IsAny<Action>()

SharedProject/Core/MsTestPlatform/CodeCoverage/IMsCodeCoverageRunSettingsService.cs

@@ -11,5 +11,6 @@ interface IMsCodeCoverageRunSettingsService
         Task<MsCodeCoverageCollectionStatus> IsCollectingAsync(ITestOperation testOperation);
         Task CollectAsync(IOperation operation, ITestOperation testOperation);
         void StopCoverage();
+        Task TestExecutionNotFinishedAsync();
     }    
 }

SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs

@@ -91,7 +91,7 @@ public MsCodeCoverageRunSettingsService(
             IAppOptionsProvider appOptionsProvider,
             ICoverageToolOutputManager coverageOutputManager,
             IUserRunSettingsService userRunSettingsService,
-            ITemplatedRunSettingsService projectRunSettingsFromTemplateService,
+            ITemplatedRunSettingsService templatedRunSettingsService,
             IShimCopier shimCopier,
             ILogger logger,
             IReportGeneratorUtil reportGeneratorUtil
@@ -105,7 +105,7 @@ IReportGeneratorUtil reportGeneratorUtil
             this.logger = logger;
             this.reportGeneratorUtil = reportGeneratorUtil;
             this.userRunSettingsService = userRunSettingsService;
-            this.templatedRunSettingsService = projectRunSettingsFromTemplateService;
+            this.templatedRunSettingsService = templatedRunSettingsService;
         }
 
         public void Initialize(string appDataFolder, IFCCEngine fccEngine, CancellationToken cancellationToken)
@@ -166,6 +166,7 @@ private async Task InitializeIsCollectingAsync(ITestOperation testOperation)
             useMsCodeCoverage = appOptionsProvider.Get().MsCodeCoverage;
             coverageProjectsByType = await CoverageProjectsByType.CreateAsync(testOperation);
             userRunSettingsProjectDetailsLookup = null;
+            await templatedRunSettingsService.CleanUpAsync(coverageProjectsByType.RunSettings);
         }
 
         private async Task<IUserRunSettingsAnalysisResult> TryAnalyseUserRunSettingsAsync()
@@ -279,6 +280,8 @@ private bool ShouldAddFCCRunSettings()
 
         public async Task CollectAsync(IOperation operation, ITestOperation testOperation)
         {
+            var coverageProjectsByType = await CoverageProjectsByType.CreateAsync(testOperation);
+            await templatedRunSettingsService.CleanUpAsync(coverageProjectsByType.RunSettings);
             var resultsUris = operation.GetRunSettingsMsDataCollectorResultUri();
             var coberturaFiles = new string[0];
             if (resultsUris != null)
@@ -291,14 +294,7 @@ public async Task CollectAsync(IOperation operation, ITestOperation testOperatio
                 await CombinedLogAsync("No cobertura files for ms code coverage.");
             }
 
-            fccEngine.RunAndProcessReport(coberturaFiles,() =>
-            {
-                threadHelper.JoinableTaskFactory.Run(async () =>
-                {
-                    List<ICoverageProject> coverageProjects = await testOperation.GetCoverageProjectsAsync();
-                    await templatedRunSettingsService.CleanUpAsync(coverageProjects);
-                });
-            });
+            fccEngine.RunAndProcessReport(coberturaFiles);
         }
 
         public void StopCoverage()
@@ -330,8 +326,14 @@ private Task CombinedLogExceptionAsync(Exception ex, string reason)
                 reportGeneratorUtil.LogCoverageProcess(reason);
             });
         }
+
         #endregion
 
+        public Task TestExecutionNotFinishedAsync()
+        {
+            return templatedRunSettingsService.CleanUpAsync(coverageProjectsByType.Templated);
+        }
+
     }
 
     public static class IRunSettingsConfigurationInfoExtensions { 

SharedProject/Impl/TestContainerDiscovery/TestContainerDiscoverer.cs

@@ -12,6 +12,7 @@
 using Task = System.Threading.Tasks.Task;
 using Microsoft.VisualStudio.Utilities;
 using FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage;
+using System.Diagnostics;
 
 namespace FineCodeCoverage.Impl
 {
@@ -180,12 +181,20 @@ private void StopCoverage()
             }
         }
 
-        private void CoverageCancelled(string logMessage)
+        private Task CoverageCancelledAsync(string logMessage)
         {
             CombinedLog(logMessage);
             reportGeneratorUtil.EndOfCoverageRun(); // not necessarily true but get desired result
             fccEngine.StopCoverage();
-            // not necessary for ms code coverage as only runs when TestExecutionFinished
+            return NotifyMsCodeCoverageTestExecutionNotFinishedIfCollectingAsync();
+        }
+
+        private async Task NotifyMsCodeCoverageTestExecutionNotFinishedIfCollectingAsync()
+        {
+            if (msCodeCoverageCollectionStatus == MsCodeCoverageCollectionStatus.Collecting)
+            {
+                await msCodeCoverageRunSettingsService.TestExecutionNotFinishedAsync();
+            }
         }
 
         private void OperationState_StateChanged(object sender, OperationStateChangedEventArgs e)
@@ -197,7 +206,7 @@ private void OperationState_StateChanged(object sender, OperationStateChangedEve
                     if (e.State == TestOperationStates.TestExecutionCanceling)
                     {
                         cancelling = true;
-                        CoverageCancelled("Test execution cancelling - running coverage will be cancelled.");
+                        await CoverageCancelledAsync("Test execution cancelling - running coverage will be cancelled.");
                     }
 
 
@@ -214,7 +223,7 @@ private void OperationState_StateChanged(object sender, OperationStateChangedEve
 
                     if (e.State == TestOperationStates.TestExecutionCancelAndFinished && !cancelling)
                     {
-                        CoverageCancelled("There has been an issue running tests. See the Tests output window pane.");
+                        await CoverageCancelledAsync("There has been an issue running tests. See the Tests output window pane.");
                     }
 
                 }