reset IsCollecting - AddRunSettings calls are duplicated - one before TestExecutionStarting and one after. TestExecutionStarting sets up userRunSettingsProjectDetailsLookup. The logic could probably all be done from AddRunSettings and inputRunSettingDocument.CreateNavigator().BaseURI

tonyhallett · tonyhallett · commit a28b24458019 · 2023-07-02T15:02:12.000+01:00
diff --git a/SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs b/SharedProject/Core/MsTestPlatform/CodeCoverage/MsCodeCoverageRunSettingsService.cs
@@ -178,7 +178,6 @@ private void ReportEndOfCoverageRunIfError()
 
         private Task InitializeIsCollectingAsync(ITestOperation testOperation)
         {
-            collectionStatus = MsCodeCoverageCollectionStatus.NotCollecting;
             runMsCodeCoverage = appOptionsProvider.Get().RunMsCodeCoverage;
             useMsCodeCoverage = runMsCodeCoverage == RunMsCodeCoverage.Yes;
             userRunSettingsProjectDetailsLookup = null;
@@ -407,6 +406,7 @@ private async Task CleanUpAsync(ITestOperation testOperation)
         {
             coverageProjectsByType = await CoverageProjectsByType.CreateAsync(testOperation);
             await templatedRunSettingsService.CleanUpAsync(coverageProjectsByType.RunSettings);
+            collectionStatus = MsCodeCoverageCollectionStatus.NotCollecting;
         }
     }
 
@@ -415,7 +415,7 @@ public static bool IsTestExecution(this IRunSettingsConfigurationInfo configurat
         {
             return configurationInfo.RequestState == RunSettingConfigurationInfoState.Execution;
         }
-        
+
     }
 
     internal static class UserRunSettingsAnalysisResultExtensions

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,6 @@ private void ReportEndOfCoverageRunIfError()`
`178`	`178`
`179`	`179`	`private Task InitializeIsCollectingAsync(ITestOperation testOperation)`
`180`	`180`	`{`
`181`		`- collectionStatus = MsCodeCoverageCollectionStatus.NotCollecting;`
`182`	`181`	`runMsCodeCoverage = appOptionsProvider.Get().RunMsCodeCoverage;`
`183`	`182`	`useMsCodeCoverage = runMsCodeCoverage == RunMsCodeCoverage.Yes;`
`184`	`183`	`userRunSettingsProjectDetailsLookup = null;`
`@@ -407,6 +406,7 @@ private async Task CleanUpAsync(ITestOperation testOperation)`
`407`	`406`	`{`
`408`	`407`	`coverageProjectsByType = await CoverageProjectsByType.CreateAsync(testOperation);`
`409`	`408`	`await templatedRunSettingsService.CleanUpAsync(coverageProjectsByType.RunSettings);`
	`409`	`+ collectionStatus = MsCodeCoverageCollectionStatus.NotCollecting;`
`410`	`410`	`}`
`411`	`411`	`}`
`412`	`412`
`@@ -415,7 +415,7 @@ public static bool IsTestExecution(this IRunSettingsConfigurationInfo configurat`
`415`	`415`	`{`
`416`	`416`	`return configurationInfo.RequestState == RunSettingConfigurationInfoState.Execution;`
`417`	`417`	`}`
`418`		`-`
	`418`	`+`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`internal static class UserRunSettingsAnalysisResultExtensions`