fix handling

Author: ChristianSauer

CodeQualityToGitlab/CodeQuality.cs

@@ -1,7 +1,9 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
 namespace CodeQualityToGitlab;
 
+[DebuggerDisplay("{Description} {Severity} {Location.Path} {Location.Lines.Begin}")]
 public class CodeQuality
 {
     public required string Description { get; set; }
@@ -10,12 +12,14 @@ public class CodeQuality
     public required LocationCq Location { get; set; }
 }
 
+[DebuggerDisplay("{Path} {Lines.Begin}")]
 public class LocationCq
 {
     public required string Path { get; set; }
     public required Lines Lines { get; set; }
 }
 
+[DebuggerDisplay("{Begin}")]
 public class Lines
 {
     public required int Begin { get; set; }

CodeQualityToGitlab/SarifConverters/Converter1.cs

@@ -44,7 +44,7 @@ public List<CodeQuality> Convert()
                     Severity = GetSeverity(result.Level),
                     Location = new()
                     {
-                        Path = GetPath(pathRoot, begin),
+                        Path = GetPathOld(pathRoot, begin),
                         Lines = new() { Begin = begin.ResultFile.Region.StartLine }
                     },
                     Fingerprint = Common.GetHash(
@@ -62,14 +62,14 @@ public List<CodeQuality> Convert()
         return cqrs;
     }
 
-    private static string GetPath(string? pathRoot, LocationVersionOne begin)
+    private static string GetPathOld(string? pathRoot, LocationVersionOne begin)
     {
         // nullability says Uri is always set, but there are tools which omit this.
         if (begin.ResultFile.Uri == null)
         {
             Log.Error(
-                "There is no valid Path for the issue {@Region}, cannot create a path. Check the source sarif for missing physicalLocation.uri",
-                begin.ResultFile.Region
+            "There is no valid Path for the issue {@Region}, cannot create a path. Check the source sarif for missing physicalLocation.uri",
+            begin.ResultFile.Region
             );
             return "noPathInSourceSarif";
         }
@@ -81,21 +81,13 @@ private static string GetPath(string? pathRoot, LocationVersionOne begin)
 
         if (string.IsNullOrWhiteSpace(pathRoot))
         {
-            return NormalizeSeparators(begin.ResultFile.Uri.LocalPath.Replace(@"\\", @"\"));
+            return begin.ResultFile.Uri.LocalPath.Replace("//", "\\");
         }
-
-        var uri = GetUri(pathRoot);
-        var absolutePath = begin.ResultFile.Uri.LocalPath;
-        var rootPath = uri.LocalPath;
-
-        if (absolutePath.StartsWith(rootPath))
-        {
-            return NormalizeSeparators(absolutePath[rootPath.Length..]);
-        }
-
-        return NormalizeSeparators(begin.ResultFile.Uri.MakeRelativeUri(uri).ToString());
+        var rootUri = GetUri(pathRoot);
+        return rootUri.MakeRelativeUri(begin.ResultFile.Uri).ToString().Replace("//", "\\");
     }
 
+
     private static Uri GetUri(string pathRoot)
     {
         if (Path.IsPathRooted(pathRoot))

Test/TestTransform.cs

@@ -31,18 +31,21 @@ public void TestTransformAllWorks()
     }
 
     [Fact]
-    public void TestTransformCreatesExpectedPath()
+    public void TestTHandlesDotsInPathsForSarif1()
     {
         var target = new FileInfo(Path.GetTempFileName());
 
-        Transform.TransformAll("codeanalysis.sarif4.json", "", target, @"/builds/39753701/backend", true);
+        Transform.TransformAll("codeanalysis.sarif4.json", "", target, "/builds/folder/backend/", true);
 
         var options = JsonSerializerOptions;
 
         using var r = new StreamReader(target.FullName);
         var json = r.ReadToEnd();
         var result = JsonSerializer.Deserialize<List<CodeQuality>>(json, options);
 
-        result.Should().HaveCount(8);
+        result.Should().NotBeNull();
+        result!.First().Location.Path.Should().Contain("SR.CLI");
+
+        result.Should().HaveCount(4);
     }
 }