Clean up program

.github/workflows/build.yml

@@ -42,6 +42,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
         run: |
-          ${{ runner.temp }}\scanner\dotnet-sonarscanner begin /k:"BabLoRP_ArchLens" /o:"bablorp" /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
+          ${{ runner.temp }}\scanner\dotnet-sonarscanner begin /k:"BabLoRP_ArchLens" /o:"bablorp" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.cs.opencover.reportsPaths="**/coverage.opencover.xml"
           dotnet build src/c-sharp/Archlens.sln
+          dotnet test src/ArchlensTests/ArchlensTests.csproj --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
           ${{ runner.temp }}\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

src/ArchlensTests/Application/DependencyGraphBuilderTests.cs

@@ -30,7 +30,7 @@ private void SetupMockProject()
         Directory.CreateDirectory(Path.Combine(_fs.Root, "Domain", "Utils"));
     }
 
-    private ProjectChanges CreateProjectChanges(IReadOnlyDictionary<RelativePath, IReadOnlyList<RelativePath>> changedFilesByDirectory,
+    private static ProjectChanges CreateProjectChanges(IReadOnlyDictionary<RelativePath, IReadOnlyList<RelativePath>> changedFilesByDirectory,
                                                 IReadOnlyList<RelativePath> deletedFiles,
                                                 IReadOnlyList<RelativePath> deletedDirectories) =>
         new(changedFilesByDirectory, deletedFiles, deletedDirectories);
@@ -732,7 +732,7 @@ public async Task BuildGraph_DoesNotCallParser_ForDirectoriesOnlyForFiles()
         Assert.Equal(uFile, parser.Calls[0]);
 
         var domainChildren = graph.ChildrenOf(domainDir);
-        Assert.Single(domainChildren.Where(x => x.Equals(utilsDir)));
+        Assert.Single(domainChildren, x => x.Equals(utilsDir));
     }
 
     [Fact]

src/ArchlensTests/Domain/RendererBaseTests.cs

@@ -6,7 +6,7 @@
 
 namespace ArchlensTests.Domain;
 
-public sealed class RendererBaseTests : IDisposable
+public sealed partial class RendererBaseTests : IDisposable
 {
     private readonly TestFileSystem _fs = new();
     public void Dispose() => _fs.Dispose();
@@ -19,7 +19,7 @@ public sealed class RendererBaseTests : IDisposable
         ),
         Format: default,
         Views: [new View("completeView", [], []), new View("ignoringView", [], ["./Infra/"])],
-        SaveLocation: null
+        SaveLocation: $"{_fs.Root}/diagrams"
     );
 
     private RenderOptions MakeOptions(
@@ -33,9 +33,9 @@ private RenderOptions MakeOptions(
             FullRootPath: _fs.Root),
         Format: default,
         Views: [new View(viewName, packages ?? [], ignore ?? [])],
-        SaveLocation: saveLocation);
+        SaveLocation: saveLocation ?? $"{_fs.Root}/diagrams");
 
-    private static string Minify(string s) => Regex.Replace(s, @"\s+", "");
+    private static string Minify(string s) => StringOneOrMoreRegex().Replace(s, "");
 
 
     [Fact]
@@ -130,9 +130,9 @@ public void JsonRendererRendersDiffCorrectly()
         Assert.Contains("\"edges\": [", result);
         Assert.EndsWith("}", result);
 
-        result = Regex.Replace(result, @"\s*", "");
-        newEdge = Regex.Replace(newEdge, @"\s*", "");
-        deletedEdge = Regex.Replace(deletedEdge, @"\s*", "");
+        result = StringZeroMoreRegex().Replace(result, "");
+        newEdge = StringZeroMoreRegex().Replace(newEdge, "");
+        deletedEdge = StringZeroMoreRegex().Replace(deletedEdge, "");
 
         Assert.Contains(newEdge, result);
         Assert.Contains(deletedEdge, result);
@@ -178,7 +178,7 @@ public void EdgesAreOrderedByFromThenTo()
         var graph = TestDependencyGraph.MakeDependencyGraph(_fs.Root);
         var result = new JsonRenderer().RenderView(graph, opts.Views[0], opts);
 
-        var froms = Regex.Matches(result, @"""fromPackage""\s*:\s*""([^""]+)""")
+        var froms = FromRegex().Matches(result)
                          .Select(m => m.Groups[1].Value)
                          .ToList();
 
@@ -283,7 +283,7 @@ public void UnchangedEdgesAreNeutral()
         var graph = TestDependencyGraph.MakeDependencyGraph(_fs.Root);
         var result = Minify(new JsonRenderer().RenderDiffView(graph, graph, opts.Views[0], opts));
 
-        Assert.Empty(Regex.Matches(result, @"""state"":""(CREATED|DELETED)"""));
+        Assert.Empty(StateRegex().Matches(result));
     }
 
     [Fact]
@@ -524,4 +524,13 @@ public void DiffRenderIsDeterministic()
             new JsonRenderer().RenderDiffView(local, remote, opts.Views[0], opts),
             new JsonRenderer().RenderDiffView(local, remote, opts.Views[0], opts));
     }
+
+    [GeneratedRegex(@"\s+")]
+    private static partial Regex StringOneOrMoreRegex();
+    [GeneratedRegex(@"\s*")]
+    private static partial Regex StringZeroMoreRegex();
+    [GeneratedRegex(@"""fromPackage""\s*:\s*""([^""]+)""")]
+    private static partial Regex FromRegex();
+    [GeneratedRegex(@"""state"":""(CREATED|DELETED)""")]
+    private static partial Regex StateRegex();
 }

src/ArchlensTests/Infra/ConfigManagerTests.cs

@@ -380,6 +380,7 @@ public async Task RenderOptions_SaveLocation_IsSet()
     {
         var path = WriteConfig(new(SaveLocation: "\"diagrams\""));
         var (_, _, renderOptions, _) = await Manager(path).LoadAsync();
+        Assert.NotNull(renderOptions.SaveLocation);
         Assert.NotEmpty(renderOptions.SaveLocation);
         Assert.Contains("diagrams", renderOptions.SaveLocation);
     }

src/ArchlensTests/Infra/Renderers/JsonRendererTests.cs

@@ -24,15 +24,15 @@ private RenderOptions Opts(
             FullRootPath: _fs.Root),
         Format: default,
         Views: [new View(viewName, packages ?? [], ignore ?? [])],
-        SaveLocation: null);
+        SaveLocation: $"{_fs.Root}/diagrams");
 
-    private JsonObject ParseJson(string json) =>
+    private static JsonObject ParseJson(string json) =>
         JsonNode.Parse(json)!.AsObject();
 
-    private JsonArray Packages(JsonObject root) =>
+    private static JsonArray Packages(JsonObject root) =>
         root["packages"]!.AsArray();
 
-    private JsonArray Edges(JsonObject root) =>
+    private static JsonArray Edges(JsonObject root) =>
         root["edges"]!.AsArray();
 
     private ProjectDependencyGraph DefaultGraph() =>

src/ArchlensTests/Infra/Renderers/PlantUMLRendererTests.cs

@@ -22,7 +22,7 @@ private RenderOptions Opts(
             FullRootPath: _fs.Root),
         Format: default,
         Views: [new View(viewName, packages ?? [], ignore ?? [])],
-        SaveLocation: null);
+        SaveLocation: $"{_fs.Root}/diagrams");
 
     private ProjectDependencyGraph DefaultGraph() =>
         TestDependencyGraph.MakeDependencyGraph(_fs.Root);
@@ -36,8 +36,10 @@ private string RenderDiff(
         RenderOptions opts) =>
         _renderer.RenderDiffView(local, remote, opts.Views[0], opts);
 
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance
     private static IReadOnlyList<string> Lines(string output) =>
-        output.Split('\n').Select(l => l.TrimEnd('\r')).ToList();
+        [.. output.Split('\n').Select(l => l.TrimEnd('\r'))];
+#pragma warning restore CA1859 // Use concrete types when possible for improved performance
 
     [Fact]
     public void FileExtension_IsPuml()

src/ArchlensTests/Infra/SnapshotManagers/LocalSnaphotManagerTests.cs

@@ -94,7 +94,11 @@ public async Task SaveThenLoad_Get_Name_And_LastWriteTime()
         var enums = RelativePath.Directory(rootPath, "./Domain/Models/Enums/");
         var utils = RelativePath.Directory(rootPath, "./Domain/Utils/");
 
-        var loadedItems = loaded.ProjectItems;
+        var loadedItems = loaded?.ProjectItems;
+
+        if (loadedItems is null)
+            Assert.Fail("Loaded items is null");
+
         Assert.Contains(root, loadedItems);
         Assert.Contains(application, loadedItems);
         Assert.Contains(infra, loadedItems);
@@ -106,7 +110,7 @@ public async Task SaveThenLoad_Get_Name_And_LastWriteTime()
         Assert.Contains(enums, loadedItems);
         Assert.Contains(utils, loadedItems);
 
-        Assert.Equal(graph.GetProjectItem(root).LastWriteTime.ToString("dd-MM-yyyy HH:mm:ss"), loaded.GetProjectItem(root).LastWriteTime.ToString("dd-MM-yyyy HH:mm:ss"));
+        Assert.Equal(graph?.GetProjectItem(root)?.LastWriteTime.ToString("dd-MM-yyyy HH:mm:ss"), loaded?.GetProjectItem(root)?.LastWriteTime.ToString("dd-MM-yyyy HH:mm:ss"));
     }
 
     [Fact]
@@ -148,7 +152,7 @@ public async Task Load_ReturnsGraph_WhenFilePresent()
 
         var loaded = await snapshotManager.GetLastSavedDependencyGraphAsync(opts);
 
-        Assert.Equal(graph.ProjectItems, loaded.ProjectItems);
+        Assert.Equal(graph.ProjectItems, loaded?.ProjectItems);
     }
 
     [Fact]
@@ -163,13 +167,13 @@ public async Task Load_ReturnsMultiLevelGraph_WhenPresent()
 
         var loaded = await snapshotManager.GetLastSavedDependencyGraphAsync(opts);
 
-        Assert.Equal(graph.ProjectItems, loaded.ProjectItems);
+        Assert.Equal(graph.ProjectItems, loaded?.ProjectItems);
 
         var rootPath = RelativePath.Directory(root, "./");
-        Assert.Equal(graph.ChildrenOf(rootPath).Count, loaded.ChildrenOf(rootPath).Count);
+        Assert.Equal(graph.ChildrenOf(rootPath).Count, loaded?.ChildrenOf(rootPath).Count);
 
         var domainPath = RelativePath.Directory(root, "./Domain/");
-        var domain = loaded.GetProjectItem(domainPath);
+        var domain = loaded?.GetProjectItem(domainPath);
 
         Assert.NotNull(domain);
         Assert.Equal(3, graph.ChildrenOf(domainPath).Count);

src/ArchlensTests/Utils/TestFileSystem.cs

@@ -30,7 +30,10 @@ public string File(string relPath, string contents = "", DateTime? lastWriteUtc
         return abs;
     }
 
+#pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
     public void Dispose()
+#pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
+
     {
         try { Directory.Delete(Root, recursive: true); } catch { /* ignore */ }
     }