add method GetSourceRootMappingFilePath

Author: Bertk

global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "9.0.203"
+        "version": "9.0.300"
     }
 }

test/coverlet.integration.tests/DeterministicBuild.cs

@@ -16,6 +16,7 @@ namespace Coverlet.Integration.Tests
   public class DeterministicBuild : BaseTest, IDisposable
   {
     private static readonly string s_projectName = "coverlet.integration.determisticbuild";
+    private static readonly string s_sutName = "coverletsample.integration.determisticbuild";
     private readonly string _buildTargetFramework;
     private string[] _testProjectTfms = [];
     private readonly string _testProjectPath = TestUtils.GetTestProjectPath(s_projectName);
@@ -67,7 +68,7 @@ private protected void AssertCoverage(string standardOutput = "", string reportN
       {
         bool coverageChecked = false;
         string reportFilePath = "";
-        foreach (string coverageFile in Directory.GetFiles(GetReportPath(standardOutput, reportName), reportName, SearchOption.AllDirectories))
+        foreach (string coverageFile in Directory.GetFiles(GetReportDirectory(standardOutput, reportName), reportName, SearchOption.AllDirectories))
         {
           Classes? document = JsonConvert.DeserializeObject<Modules>(File.ReadAllText(coverageFile))?.Document("DeepThought.cs");
           if (document != null)
@@ -87,9 +88,9 @@ private protected void AssertCoverage(string standardOutput = "", string reportN
         {
           string newName = reportName.Replace("json", "cobertura.xml");
           // Verify deterministic report
-          foreach (string coverageFile in Directory.GetFiles(GetReportPath(standardOutput, newName), newName, SearchOption.AllDirectories))
+          foreach (string coverageFile in Directory.GetFiles(GetReportDirectory(standardOutput, newName), newName, SearchOption.AllDirectories))
           {
-            Assert.Contains("/_/test/coverlet.integration.determisticbuild/DeepThought.cs", File.ReadAllText(coverageFile));
+            Assert.Contains($"/_/test/{s_projectName}/DeepThought.cs", File.ReadAllText(coverageFile));
             File.Delete(coverageFile);
           }
         }
@@ -113,12 +114,12 @@ public void Msbuild()
         _output.WriteLine(buildOutput);
       }
       Assert.Contains("Build succeeded.", buildOutput);
-      string sourceRootMappingFilePath = Path.Combine(_testBinaryPath, _artifactsPivot.ToLowerInvariant(), "CoverletSourceRootsMapping_coverletsample.integration.determisticbuild");
+      string sourceRootMappingFilePath = GetSourceRootMappingFilePath(buildOutput, $"CoverletSourceRootsMapping_{s_sutName}");
       Assert.True(File.Exists(sourceRootMappingFilePath), $"File not found: {sourceRootMappingFilePath}");
       Assert.False(string.IsNullOrEmpty(File.ReadAllText(sourceRootMappingFilePath)));
       Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
 
-      string cmdArgument = $"test -c {_buildConfiguration} -f {_buildTargetFramework} --no-build /p:CollectCoverage=true /p:DeterministicReport=true /p:CoverletOutputFormat=\"cobertura%2cjson\" /p:Include=\"[coverletsample.integration.determisticbuild]*DeepThought\" /p:IncludeTestAssembly=true --results-directory:{testResultPath}";
+      string cmdArgument = $"test -c {_buildConfiguration} -f {_buildTargetFramework} --no-build /p:CollectCoverage=true /p:DeterministicReport=true /p:CoverletOutputFormat=\"cobertura%2cjson\" /p:Include=\"[{s_sutName}]*DeepThought\" /p:IncludeTestAssembly=true --results-directory:{testResultPath}";
       _output.WriteLine($"Command: dotnet {cmdArgument}");
       int result = DotnetCli(cmdArgument, out string standardOutput, out string standardError, _testProjectPath);
       if (!string.IsNullOrEmpty(standardError))
@@ -131,10 +132,11 @@ public void Msbuild()
       }
       Assert.Equal(0, result);
       Assert.Contains("Passed!", standardOutput);
-      Assert.Contains("| coverletsample.integration.determisticbuild | 100% | 100%   | 100%   |", standardOutput);
-      string testResultFile = Path.Join(_testProjectPath, $"coverage.{_buildTargetFramework}.json");
+      Assert.Contains($"| {s_sutName} | 100% | 100%   | 100%   |", standardOutput);
+      string filename = $"coverage.{_buildTargetFramework}.json";
+      string testResultFile = GetReportDirectory(standardOutput, filename) + filename;
       Assert.True(File.Exists(testResultFile), $"File '{testResultFile}' does not exist");
-      AssertCoverage(standardOutput, $"coverage.{_buildTargetFramework}.json");
+      AssertCoverage(standardOutput, filename);
 
       CleanupBuildOutput();
     }
@@ -156,13 +158,13 @@ public void Msbuild_SourceLink()
         _output.WriteLine(buildOutput);
       }
       Assert.Contains("Build succeeded.", buildOutput);
-      string sourceRootMappingFilePath = Path.Combine(_testBinaryPath, _artifactsPivot.ToLowerInvariant(), "CoverletSourceRootsMapping_coverletsample.integration.determisticbuild");
+      string sourceRootMappingFilePath = GetSourceRootMappingFilePath(buildOutput, $"CoverletSourceRootsMapping_{s_sutName}");
 
       Assert.True(File.Exists(sourceRootMappingFilePath), $"File not found: {sourceRootMappingFilePath}");
       Assert.False(string.IsNullOrEmpty(File.ReadAllText(sourceRootMappingFilePath)));
       Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
 
-      string cmdArgument = $"test -c {_buildConfiguration} -f {_buildTargetFramework} --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=\"cobertura%2cjson\" /p:UseSourceLink=true /p:Include=\"[coverletsample.integration.determisticbuild]*DeepThought\" /p:IncludeTestAssembly=true --results-directory:{testResultPath}";
+      string cmdArgument = $"test -c {_buildConfiguration} -f {_buildTargetFramework} --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=\"cobertura%2cjson\" /p:UseSourceLink=true /p:Include=\"[{s_sutName}]*DeepThought\" /p:IncludeTestAssembly=true --results-directory:{testResultPath}";
       _output.WriteLine($"Command: dotnet {cmdArgument}");
       int result = DotnetCli(cmdArgument, out string standardOutput, out string standardError, _testProjectPath);
       if (!string.IsNullOrEmpty(standardError))
@@ -175,11 +177,12 @@ public void Msbuild_SourceLink()
       }
       Assert.Equal(0, result);
       Assert.Contains("Passed!", standardOutput);
-      Assert.Contains("| coverletsample.integration.determisticbuild | 100% | 100%   | 100%   |", standardOutput);
-      string testResultFile = Path.Join(_testProjectPath, $"coverage.{_buildTargetFramework}.json");
+      Assert.Contains($"| {s_sutName} | 100% | 100%   | 100%   |", standardOutput);
+      string filename = $"coverage.{_buildTargetFramework}.json";
+      string testResultFile = GetReportDirectory(standardOutput, filename) + filename;
       Assert.True(File.Exists(testResultFile), $"File '{testResultFile}' does not exist");
       Assert.Contains("raw.githubusercontent.com", File.ReadAllText(testResultFile));
-      AssertCoverage(standardOutput, $"coverage.{_buildTargetFramework}.json", checkDeterministicReport: false);
+      AssertCoverage(standardOutput, filename, checkDeterministicReport: false);
 
       CleanupBuildOutput();
     }
@@ -205,13 +208,13 @@ public void Collectors()
         _output.WriteLine(buildOutput);
       }
       Assert.Contains("Build succeeded.", buildOutput);
-      string sourceRootMappingFilePath = Path.Combine(_testBinaryPath, _artifactsPivot.ToLowerInvariant(), "CoverletSourceRootsMapping_coverletsample.integration.determisticbuild");
+      string sourceRootMappingFilePath = GetSourceRootMappingFilePath(buildOutput, $"CoverletSourceRootsMapping_{s_sutName}");
 
       Assert.True(File.Exists(sourceRootMappingFilePath), $"File not found: {sourceRootMappingFilePath}");
       Assert.NotEmpty(File.ReadAllText(sourceRootMappingFilePath));
       Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
 
-      string runSettingsPath = AddCollectorRunsettingsFile(_testProjectPath, "[coverletsample.integration.determisticbuild]*DeepThought", deterministicReport: true);
+      string runSettingsPath = AddCollectorRunsettingsFile(_testProjectPath, $"[{s_sutName}]*DeepThought", deterministicReport: true);
       string cmdArgument = $"test -c {_buildConfiguration} -f {_buildTargetFramework} --no-build --collect:\"XPlat Code Coverage\" --results-directory:\"{testResultPath}\" --settings \"{runSettingsPath}\" --diag:{Path.Combine(testLogFilesPath, "log.txt")}";
       _output.WriteLine($"Command: dotnet {cmdArgument}");
       int result = DotnetCli(cmdArgument, out string standardOutput, out string standardError, _testProjectPath);
@@ -260,13 +263,13 @@ public void Collectors_SourceLink()
         _output.WriteLine(buildOutput);
       }
       Assert.Contains("Build succeeded.", buildOutput);
-      string sourceRootMappingFilePath = Path.Combine(_testBinaryPath, _artifactsPivot.ToLowerInvariant(), "CoverletSourceRootsMapping_coverletsample.integration.determisticbuild");
+      string sourceRootMappingFilePath = GetSourceRootMappingFilePath(buildOutput, $"CoverletSourceRootsMapping_{s_sutName}");
 
       Assert.True(File.Exists(sourceRootMappingFilePath), $"File not found: {sourceRootMappingFilePath}");
       Assert.NotEmpty(File.ReadAllText(sourceRootMappingFilePath));
       Assert.Contains("=/_/", File.ReadAllText(sourceRootMappingFilePath));
 
-      string runSettingsPath = AddCollectorRunsettingsFile(_testProjectPath, "[coverletsample.integration.determisticbuild]*DeepThought", sourceLink: true);
+      string runSettingsPath = AddCollectorRunsettingsFile(_testProjectPath, $"[{s_sutName}]*DeepThought", sourceLink: true);
       string cmdArgument = $"test -c {_buildConfiguration} -f {_buildTargetFramework} --no-build --collect:\"XPlat Code Coverage\" --results-directory:\"{testResultPath}\" --settings \"{runSettingsPath}\" --diag:{Path.Combine(testLogFilesPath, "log.txt")}";
       _output.WriteLine($"Command: dotnet {cmdArgument}");
       int result = DotnetCli(cmdArgument, out string standardOutput, out string standardError, _testProjectPath);
@@ -377,7 +380,7 @@ private static void DeleteCoverageFiles(string directory)
       }
     }
 
-    private string GetReportPath(string standardOutput, string reportFileName = "")
+    private string GetReportDirectory(string standardOutput, string reportFileName = "")
     {
       string reportPath = "";
       if (standardOutput.Contains(reportFileName))
@@ -388,6 +391,42 @@ private string GetReportPath(string standardOutput, string reportFileName = "")
       }
       return reportPath;
     }
+
+    private static string GetSourceRootMappingFilePath(string buildOutput, string pattern)
+    {
+      // search file in path using pattern and return full path
+      // this will also handle filenames with prefix like ".msCoverletSourceRootsMapping_coverletsample.integration.determisticbuild" or "CoverletSourceRootsMapping_coverletsample.integration.determisticbuild"
+      // today both files exist
+      string sourceRootMappingFilePath = "";
+      if (buildOutput.Contains($"{s_sutName}.dll"))
+      {
+        string[] lines = buildOutput.Split('\n').Where(line => line.Contains(" -> ")).ToArray();
+        if (lines.Length == 0)
+        {
+          throw new InvalidOperationException("No lines found in build output containing ' -> '.");
+        }
+        else
+        {
+          string? directory = Path.GetDirectoryName(lines.FirstOrDefault(static line => line.Contains($"{s_sutName}.dll"))?.TrimStart());
+          if (directory == null)
+          {
+            throw new InvalidOperationException($"Directory is null. {s_sutName}.dll not found.");
+          }
+          // actual directory value "coverlet.integration.determisticbuild -> C:\GitHub\coverlet\artifacts\bin\coverlet.integration.determisticbuild\debug
+          // remove everything before '->' 
+          directory = directory[(directory.IndexOf("->") + 2)..].Trim();
+          if (Directory.Exists(directory))
+          {
+            string[] files = Directory.GetFiles(directory, $"{pattern}*", SearchOption.AllDirectories);
+            if (files.Length > 0)
+            {
+              sourceRootMappingFilePath = files[0];
+            }
+          }
+        }
+      }
+      return sourceRootMappingFilePath;
+    }
     public void Dispose()
     {
       File.Delete(Path.Combine(_testProjectPath, PropsFileName));