refactor

Author: tonyhallett

SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs

@@ -121,35 +121,40 @@ public void Initialize(string appDataFolder, IFCCEngine fccEngine, CancellationT
         public async Task<MsCodeCoverageCollectionStatus> IsCollectingAsync(ITestOperation testOperation)
         {
             await InitializeIsCollectingAsync(testOperation);
+            await TrySetUpForCollectionAsync(testOperation.SolutionDirectory);
+            ReportEndOfCoverageRunIfError();
+            return collectionStatus;
+        }
 
+        private async Task TrySetUpForCollectionAsync(string solutionDirectory)
+        {
             IUserRunSettingsAnalysisResult analysisResult = await TryAnalyseUserRunSettingsAsync();
-            if (analysisResult != null)
+            if (analysisResult.Ok())
             {
-                var coverageProjectsForShim = analysisResult.ProjectsWithFCCMsTestAdapter;
-
-                if (analysisResult.Suitable)
-                {
-                    await PrepareCoverageProjectsAsync();
-                    SetUserRunSettingsProjectDetails();
-                    if (coverageProjectsByType.HasTemplated())
-                    {
-                        await GenerateTemplatedAsync(
-                            analysisResult.SpecifiedMsCodeCoverage,
-                            coverageProjectsForShim,
-                            testOperation.SolutionDirectory
-                        );
-                    }
-                    else
-                    {
-                        await CollectingUserRunSettingsAsync();
-                    }
-                }
-
-                CopyShimWhenCollecting(coverageProjectsForShim);
+                
+                await SetUpForCollectionAsync(
+                    analysisResult.ProjectsWithFCCMsTestAdapter,
+                    analysisResult.SpecifiedMsCodeCoverage,
+                    solutionDirectory
+                );
             }
+        }
+
+        private async Task SetUpForCollectionAsync(
+            List<ICoverageProject> coverageProjectsForShim, 
+            bool specifiedMsCodeCoverageInRunSettings,
+            string solutionDirectory
+        )
+        {
+            await PrepareCoverageProjectsAsync();
+            SetUserRunSettingsProjectDetails();
 
-            ReportEndOfCoverageRunIfError();
-            return collectionStatus;
+            await GenerateTemplatedRunSettingsAsync(
+                specifiedMsCodeCoverageInRunSettings,
+                coverageProjectsForShim,
+                solutionDirectory
+            );
+            CopyShimWhenCollecting(coverageProjectsForShim);
         }
 
         private void ReportEndOfCoverageRunIfError()
@@ -184,44 +189,66 @@ private async Task<IUserRunSettingsAnalysisResult> TryAnalyseUserRunSettingsAsyn
                 collectionStatus = MsCodeCoverageCollectionStatus.Error;
                 await CombinedLogExceptionAsync(exc, "Exception analysing runsettings files");
             }
+
+            if (analysisResult.Ok())
+            {
+                await CollectingIfUserRunSettingsOnlyAsync();
+            }
             return analysisResult;
         }
 
-        private async Task GenerateTemplatedAsync(bool runSettingsSpecifiedMsCodeCoverage, List<ICoverageProject> coverageProjectsForShim, string solutionDirectory)
+        private async Task GenerateTemplatedRunSettingsAsync(
+            bool runSettingsSpecifiedMsCodeCoverage, 
+            List<ICoverageProject> coverageProjectsForShim, 
+            string solutionDirectory
+        )
         {
-            if (useMsCodeCoverage || runSettingsSpecifiedMsCodeCoverage)
+            if (coverageProjectsByType.HasTemplated() && (useMsCodeCoverage || runSettingsSpecifiedMsCodeCoverage))
             {
                 var generationResult = await templatedRunSettingsService.GenerateAsync(
                     coverageProjectsByType.Templated, 
                     solutionDirectory, 
                     fccMsTestAdapterPath
                 );
 
-                if (generationResult.ExceptionReason == null)
-                {
-                    coverageProjectsForShim.AddRange(generationResult.CoverageProjectsWithFCCMsTestAdapter);
-                    await CombinedLogAsync(() =>
-                    {
-                        var leadingMessage = generationResult.CustomTemplatePaths.Any() ? $"{msCodeCoverageMessage} - custom template paths" : msCodeCoverageMessage;
-                        var loggerMessages = new List<string> { leadingMessage }.Concat(generationResult.CustomTemplatePaths.Distinct());
-                        logger.Log(loggerMessages);
-                        reportGeneratorUtil.LogCoverageProcess(msCodeCoverageMessage);
-                    });
-                    collectionStatus = MsCodeCoverageCollectionStatus.Collecting;
-                }
-                else
-                {
-                    var exceptionReason = generationResult.ExceptionReason;
-                    await CombinedLogExceptionAsync(exceptionReason.Exception, exceptionReason.Reason);
-                    collectionStatus = MsCodeCoverageCollectionStatus.Error;
-                }
+                await ProcessTemplateGenerationResultAsync(generationResult, coverageProjectsForShim);
+            }
+        }
+
+        private async Task ProcessTemplateGenerationResultAsync(IProjectRunSettingsFromTemplateResult generationResult, List<ICoverageProject> coverageProjectsForShim)
+        {
+            if (generationResult.ExceptionReason == null)
+            {
+                await CollectingWithTemplateAsync(generationResult, coverageProjectsForShim);
+            }
+            else
+            {
+                var exceptionReason = generationResult.ExceptionReason;
+                await CombinedLogExceptionAsync(exceptionReason.Exception, exceptionReason.Reason);
+                collectionStatus = MsCodeCoverageCollectionStatus.Error;
             }
         }
 
-        private Task CollectingUserRunSettingsAsync()
+        private async Task CollectingWithTemplateAsync(IProjectRunSettingsFromTemplateResult generationResult, List<ICoverageProject> coverageProjectsForShim)
         {
+            coverageProjectsForShim.AddRange(generationResult.CoverageProjectsWithFCCMsTestAdapter);
+            await CombinedLogAsync(() =>
+            {
+                var leadingMessage = generationResult.CustomTemplatePaths.Any() ? $"{msCodeCoverageMessage} - custom template paths" : msCodeCoverageMessage;
+                var loggerMessages = new List<string> { leadingMessage }.Concat(generationResult.CustomTemplatePaths.Distinct());
+                logger.Log(loggerMessages);
+                reportGeneratorUtil.LogCoverageProcess(msCodeCoverageMessage);
+            });
             collectionStatus = MsCodeCoverageCollectionStatus.Collecting;
-            return CombinedLogAsync($"{msCodeCoverageMessage} with user runsettings");
+        }
+
+        private async Task CollectingIfUserRunSettingsOnlyAsync()
+        {
+            if (!coverageProjectsByType.HasTemplated())
+            {
+                collectionStatus = MsCodeCoverageCollectionStatus.Collecting;
+                await CombinedLogAsync($"{msCodeCoverageMessage} with user runsettings");
+            }
         }
 
         private void CopyShimWhenCollecting(List<ICoverageProject> coverageProjectsForShim)
@@ -280,13 +307,8 @@ private bool ShouldAddFCCRunSettings()
         public async Task CollectAsync(IOperation operation, ITestOperation testOperation)
         {
             await CleanUpAsync(testOperation);
-            var resultsUris = operation.GetRunSettingsMsDataCollectorResultUri();
-            var coberturaFiles = new string[0];
-            if (resultsUris != null)
-            {
-                coberturaFiles = resultsUris.Select(uri => uri.LocalPath).Where(f => f.EndsWith(".cobertura.xml")).ToArray();
-            }
 
+            var coberturaFiles = GetCoberturaFiles(operation);
             if (coberturaFiles.Length == 0)
             {
                 await CombinedLogAsync("No cobertura files for ms code coverage.");
@@ -295,6 +317,17 @@ public async Task CollectAsync(IOperation operation, ITestOperation testOperatio
             fccEngine.RunAndProcessReport(coberturaFiles);
         }
 
+        private string[] GetCoberturaFiles(IOperation operation)
+        {
+            var resultsUris = operation.GetRunSettingsMsDataCollectorResultUri();
+            var coberturaFiles = new string[0];
+            if (resultsUris != null)
+            {
+                coberturaFiles = resultsUris.Select(uri => uri.LocalPath).Where(f => f.EndsWith(".cobertura.xml")).ToArray();
+            }
+            return coberturaFiles;
+        }
+
         public void StopCoverage()
         {
             fccEngine.StopCoverage();
@@ -347,5 +380,17 @@ public static bool IsTestExecution(this IRunSettingsConfigurationInfo configurat
 
     }
 
+    internal static class UserRunSettingsAnalysisResultExtensions
+    {
+        public static bool Ok(this IUserRunSettingsAnalysisResult userRunSettingsAnalysisResult)
+        {
+            if (userRunSettingsAnalysisResult == null)
+            {
+                return false;
+            }
+            return userRunSettingsAnalysisResult.Suitable;
+
+        }
+    }
 
 }