use path.combine for generated run settings path

Author: tonyhallett

FineCodeCoverage/Core/Coverlet/DataCollector/CoverletDataCollectorUtil.cs

@@ -120,7 +120,7 @@ private string GetSettings()
         {
             var dataCollectorSettingsBuilder = dataCollectorSettingsBuilderFactory.Create();
             dataCollectorSettingsBuilder
-                .Initialize(coverageProject.Settings, coverageProject.RunSettingsFile, $"{coverageProject.CoverageOutputFolder}/FCC.runsettings");
+                .Initialize(coverageProject.Settings, coverageProject.RunSettingsFile, Path.Combine(coverageProject.CoverageOutputFolder,"FCC.runsettings"));
 
             // command arguments
             dataCollectorSettingsBuilder

FineCodeCoverageTests/CoverletDataCollectorUtil_RunAsync_Tests.cs

@@ -34,6 +34,7 @@ public void SetUp()
 
             mockCoverageProject = new Mock<ICoverageProject>();
             mockCoverageProject.Setup(cp => cp.Settings).Returns(new Mock<IAppOptions>().Object);
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
             mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(new List<string>());
             mockRunSettingsCoverletConfiguration = new Mock<IRunSettingsCoverletConfiguration>();
             coverletDataCollectorUtil.runSettingsCoverletConfiguration = mockRunSettingsCoverletConfiguration.Object;
@@ -60,6 +61,7 @@ private DirectoryInfo CreateTemporaryDirectory()
         public async Task Should_Get_Settings_With_TestDllFile()
         {
             mockCoverageProject.Setup(cp => cp.TestDllFile).Returns("test.dll");
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
 
             await coverletDataCollectorUtil.RunAsync(false);
             mockDataCollectorSettingsBuilder.Verify(b => b.WithProjectDll("test.dll"));
@@ -71,6 +73,7 @@ public async Task Should_Get_Settings_With_Exclude_From_CoverageProject_And_RunS
         {
             var projectExclude = new string[] { "excluded" };
             mockCoverageProject.Setup(cp => cp.Settings.Exclude).Returns(projectExclude);
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
             var referencedExcluded = new List<string> { "referencedExcluded" };
             mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(referencedExcluded);
             mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.Exclude).Returns("rsexclude");
@@ -83,6 +86,7 @@ public async Task Should_Not_Throw_When_Project_Setttings_Exclude_Is_Null()
         {
             var referencedExcluded = new List<string> { "referencedExcluded" };
             mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(referencedExcluded);
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
             mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.Exclude).Returns("rsexclude");
             await coverletDataCollectorUtil.RunAsync(false);
             mockDataCollectorSettingsBuilder.Verify(b => b.WithExclude(new string[] { "referencedExcluded"}, "rsexclude"));
@@ -93,6 +97,8 @@ public async Task Should_Get_Settings_With_ExcludeByFile_From_CoverageProject_An
         {
             var projectExcludeByFile = new string[] { "excludedByFile" };
             mockCoverageProject.Setup(cp => cp.Settings.ExcludeByFile).Returns(projectExcludeByFile);
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
+
             mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.ExcludeByFile).Returns("rsexcludeByFile");
             await coverletDataCollectorUtil.RunAsync(false);
             mockDataCollectorSettingsBuilder.Verify(b => b.WithExcludeByFile(projectExcludeByFile, "rsexcludeByFile"));
@@ -113,6 +119,8 @@ public async Task Should_Get_Settings_With_Include_From_CoverageProject_And_RunS
         {
             var projectInclude= new string[] { "included" };
             mockCoverageProject.Setup(cp => cp.Settings.Include).Returns(projectInclude);
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
+
             mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.Include).Returns("rsincluded");
             await coverletDataCollectorUtil.RunAsync(false);
             mockDataCollectorSettingsBuilder.Verify(b => b.WithInclude(projectInclude, "rsincluded"));
@@ -123,6 +131,7 @@ public async Task Should_Get_Settings_With_Include_From_CoverageProject_And_RunS
         public async Task Should_Get_Settings_With_IncludeTestAssembly_From_CoverageProject_And_RunSettings(bool projectIncludeTestAssembly, string runSettingsIncludeTestAssembly)
         {
             mockCoverageProject.Setup(cp => cp.Settings.IncludeTestAssembly).Returns(projectIncludeTestAssembly);
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
             mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.IncludeTestAssembly).Returns(runSettingsIncludeTestAssembly);
             await coverletDataCollectorUtil.RunAsync(false);
             mockDataCollectorSettingsBuilder.Verify(b => b.WithIncludeTestAssembly(projectIncludeTestAssembly, runSettingsIncludeTestAssembly));
@@ -137,7 +146,7 @@ public async Task Should_Initialize_With_Options_And_Run_Settings_First()
             mockCoverageProject.Setup(cp => cp.Settings).Returns(settings);
 
             await coverletDataCollectorUtil.RunAsync(false);
-            mockDataCollectorSettingsBuilder.Verify(b => b.Initialize(settings, ".runsettings","output/FCC.runsettings"));
+            mockDataCollectorSettingsBuilder.Verify(b => b.Initialize(settings, ".runsettings",Path.Combine("output","FCC.runsettings")));
 
             var invocations = mockDataCollectorSettingsBuilder.Invocations.GetEnumerator().ToIEnumerable().ToList();
             Assert.AreEqual(invocations.First().Method.Name, nameof(IDataCollectorSettingsBuilder.Initialize));
@@ -209,6 +218,7 @@ public async Task Should_Get_Settings_With_SkipAutoProps_From_RunSettings()
         public async Task Should_Log_VSTest_Run_With_Settings()
         {
             mockCoverageProject.Setup(cp => cp.ProjectName).Returns("TestProject");
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
             mockDataCollectorSettingsBuilder.Setup(sb => sb.Build()).Returns("settings string");
             await coverletDataCollectorUtil.RunAsync(false);
             mocker.Verify<ILogger>(l => l.Log(coverletDataCollectorUtil.LogRunMessage("settings string")));
@@ -218,6 +228,7 @@ public async Task Should_Log_VSTest_Run_With_Settings()
         public async Task Should_Execute_DotNet_Test_Collect_XPlat_With_Settings_Using_The_ProcessUtil()
         {
             mockCoverageProject.Setup(cp => cp.ProjectOutputFolder).Returns("projectOutputFolder");
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
             mockDataCollectorSettingsBuilder.Setup(sb => sb.Build()).Returns("settings");
             coverletDataCollectorUtil.TestAdapterPathArg = "testadapterpath";
             await coverletDataCollectorUtil.RunAsync(false);
@@ -228,6 +239,7 @@ private async Task Use_Custom_TestAdapterPath()
         {
             CreateTemporaryDirectory();
             mockCoverageProject.Setup(cp => cp.ProjectOutputFolder).Returns("projectOutputFolder");
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
             mockCoverageProject.Setup(cp => cp.Settings.CoverletCollectorDirectoryPath).Returns(tempDirectory);
             mockDataCollectorSettingsBuilder.Setup(sb => sb.Build()).Returns("settings");
             coverletDataCollectorUtil.TestAdapterPathArg = "testadapterpath";
@@ -253,6 +265,7 @@ public async Task Should_Log_When_Using_Custom_TestAdapterPath()
         public async Task Should_Use_The_ProcessResponseProcessor(bool throwOnError,bool processResponseProcessorResult)
         {
             mockCoverageProject.Setup(cp => cp.ProjectName).Returns("TestProject");
+            mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
 
             var mockProcesUtil = mocker.GetMock<IProcessUtil>();
             var executeResponse = new ExecuteResponse();