refactor

Author: tonyhallett

FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_Collect_Tests.cs

@@ -25,6 +25,14 @@ public async Task Should_Clean_Up_RunSettings_Coverage_Projects()
         {
             var autoMocker = new AutoMoqer();
             var msCodeCoverageRunSettingsService = autoMocker.Create<MsCodeCoverageRunSettingsService>();
+
+
+            var mockUserRunSettingsService = autoMocker.GetMock<IUserRunSettingsService>();
+            mockUserRunSettingsService.Setup(
+                userRunSettingsService =>
+                userRunSettingsService.Analyse(It.IsAny<IEnumerable<ICoverageProject>>(), It.IsAny<bool>(), It.IsAny<string>())
+            ).Returns(new UserRunSettingsAnalysisResult());
+
             var mockAppOptionsProvider = autoMocker.GetMock<IAppOptionsProvider>();
             mockAppOptionsProvider.Setup(appOptionsProvider => appOptionsProvider.Get()).Returns(new Mock<IAppOptions>().Object);
 

FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs

@@ -38,27 +38,29 @@ public void Should_StopCoverage_On_FCCEngine()
         }
     }
 
+    internal class UserRunSettingsAnalysisResult : IUserRunSettingsAnalysisResult
+    {
+        public UserRunSettingsAnalysisResult(bool suitable, bool specifiedMsCodeCoverage)
+        {
+            Suitable = suitable;
+            SpecifiedMsCodeCoverage = specifiedMsCodeCoverage;
+        }
+        public UserRunSettingsAnalysisResult() { }
+
+        public bool Suitable { get; set; }
+
+        public bool SpecifiedMsCodeCoverage { get; set; }
+
+        public List<ICoverageProject> ProjectsWithFCCMsTestAdapter { get; set; } = new List<ICoverageProject>();
+    }
+
     internal class MsCodeCoverageRunSettingsService_IsCollecting_Tests
     {
         private AutoMoqer autoMocker;
         private MsCodeCoverageRunSettingsService msCodeCoverageRunSettingsService;
         private const string solutionDirectory = "SolutionDirectory";
 
-        private class UserRunSettingsAnalysisResult : IUserRunSettingsAnalysisResult
-        {
-            public UserRunSettingsAnalysisResult(bool suitable, bool specifiedMsCodeCoverage)
-            {
-                Suitable = suitable;
-                SpecifiedMsCodeCoverage = specifiedMsCodeCoverage;
-            }
-            public UserRunSettingsAnalysisResult() { }
-
-            public bool Suitable { get; set; }
-
-            public bool SpecifiedMsCodeCoverage { get; set; }
-
-            public List<ICoverageProject> ProjectsWithFCCMsTestAdapter { get; set; } = new List<ICoverageProject>();
-        }
+        
 
         private class ExceptionReason : IExceptionReason
         {

SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs

@@ -131,7 +131,6 @@ private async Task TrySetUpForCollectionAsync(string solutionDirectory)
             IUserRunSettingsAnalysisResult analysisResult = await TryAnalyseUserRunSettingsAsync();
             if (analysisResult.Ok())
             {
-                
                 await SetUpForCollectionAsync(
                     analysisResult.ProjectsWithFCCMsTestAdapter,
                     analysisResult.SpecifiedMsCodeCoverage,
@@ -149,7 +148,7 @@ string solutionDirectory
             await PrepareCoverageProjectsAsync();
             SetUserRunSettingsProjectDetails();
 
-            await GenerateTemplatedRunSettingsAsync(
+            await GenerateTemplatedRunSettingsIfRequiredAsync(
                 specifiedMsCodeCoverageInRunSettings,
                 coverageProjectsForShim,
                 solutionDirectory
@@ -178,42 +177,68 @@ private async Task<IUserRunSettingsAnalysisResult> TryAnalyseUserRunSettingsAsyn
             IUserRunSettingsAnalysisResult analysisResult = null;
             try
             {
-                analysisResult = userRunSettingsService.Analyse(
-                    coverageProjectsByType.RunSettings,
-                    useMsCodeCoverage,
-                    fccMsTestAdapterPath
-                );
+                analysisResult = await AnalyseUserRunSettingsAsync();
             }
             catch (Exception exc)
             {
-                collectionStatus = MsCodeCoverageCollectionStatus.Error;
-                await CombinedLogExceptionAsync(exc, "Exception analysing runsettings files");
+                await ExceptionAnalysingUserRunSettingsAsync(exc);
             }
 
-            if (analysisResult.Ok())
+            return analysisResult;
+        }
+
+        private Task ExceptionAnalysingUserRunSettingsAsync(Exception exc)
+        {
+            collectionStatus = MsCodeCoverageCollectionStatus.Error;
+            return CombinedLogExceptionAsync(exc, "Exception analysing runsettings files");
+        }
+
+        private async Task<IUserRunSettingsAnalysisResult> AnalyseUserRunSettingsAsync()
+        {
+            var analysisResult = userRunSettingsService.Analyse(
+                    coverageProjectsByType.RunSettings,
+                    useMsCodeCoverage,
+                    fccMsTestAdapterPath
+                );
+
+            if (analysisResult.Suitable)
             {
                 await CollectingIfUserRunSettingsOnlyAsync();
             }
+
             return analysisResult;
         }
 
-        private async Task GenerateTemplatedRunSettingsAsync(
+        private async Task GenerateTemplatedRunSettingsIfRequiredAsync(
             bool runSettingsSpecifiedMsCodeCoverage, 
             List<ICoverageProject> coverageProjectsForShim, 
             string solutionDirectory
         )
         {
-            if (coverageProjectsByType.HasTemplated() && (useMsCodeCoverage || runSettingsSpecifiedMsCodeCoverage))
+            if (ShouldGenerateTemplatedRunSettings(runSettingsSpecifiedMsCodeCoverage))
             {
-                var generationResult = await templatedRunSettingsService.GenerateAsync(
-                    coverageProjectsByType.Templated, 
-                    solutionDirectory, 
-                    fccMsTestAdapterPath
-                );
-
-                await ProcessTemplateGenerationResultAsync(generationResult, coverageProjectsForShim);
+                await GenerateTemplatedRunSettingsAsync(coverageProjectsForShim, solutionDirectory);
             }
         }
+        private async Task GenerateTemplatedRunSettingsAsync(
+            List<ICoverageProject> coverageProjectsForShim,
+            string solutionDirectory
+        )
+        {
+            var generationResult = await templatedRunSettingsService.GenerateAsync(
+                coverageProjectsByType.Templated,
+                solutionDirectory,
+                fccMsTestAdapterPath
+            );
+
+            await ProcessTemplateGenerationResultAsync(generationResult, coverageProjectsForShim);
+        }
+
+
+        private bool ShouldGenerateTemplatedRunSettings(bool runSettingsSpecifiedMsCodeCoverage)
+        {
+            return coverageProjectsByType.HasTemplated() && (useMsCodeCoverage || runSettingsSpecifiedMsCodeCoverage);
+        }
 
         private async Task ProcessTemplateGenerationResultAsync(IProjectRunSettingsFromTemplateResult generationResult, List<ICoverageProject> coverageProjectsForShim)
         {