Move all class to internal and DI (#39)

304NotModified · web-flow · commit eb6890e32ebe · 2026-03-13T21:12:28.000+01:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,15 +1,18 @@
 <Project>
 
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
-  <PropertyGroup>
-    <Authors>Julian Verdurmen</Authors>
-    <Product>JulianVerdurmen.SlnxValidator</Product>
-    <Deterministic>true</Deterministic>
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
-    <IsPackable>false</IsPackable>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/304NotModified/SLNX-validator</RepositoryUrl>
-  </PropertyGroup>
+	<PropertyGroup>
+		<Authors>Julian Verdurmen</Authors>
+		<Product>JulianVerdurmen.SlnxValidator</Product>
+		<Deterministic>true</Deterministic>
+		<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+		<IsPackable>false</IsPackable>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<RepositoryUrl>https://github.com/304NotModified/SLNX-validator</RepositoryUrl>
+	</PropertyGroup>
+	<ItemGroup>
+		<InternalsVisibleTo Include="$(MSBuildProjectName).Tests" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/SLNX-validator.Core/FileSystem/ISlnxFileResolver.cs b/src/SLNX-validator.Core/FileSystem/ISlnxFileResolver.cs
@@ -0,0 +1,7 @@
+﻿namespace JulianVerdurmen.SlnxValidator.Core.FileSystem
+{
+    public interface ISlnxFileResolver
+    {
+        IReadOnlyList<string> Resolve(string input);
+    }
+}
diff --git a/src/SLNX-validator.Core/FileSystem/SlnxFileResolver.cs b/src/SLNX-validator.Core/FileSystem/SlnxFileResolver.cs
@@ -1,6 +1,6 @@
 namespace JulianVerdurmen.SlnxValidator.Core.FileSystem;
 
-public sealed class SlnxFileResolver(IFileSystem fileSystem)
+internal sealed class SlnxFileResolver(IFileSystem fileSystem) : ISlnxFileResolver
 {
     /// <summary>
     /// Resolves one or more .slnx file paths from the given input.
diff --git a/src/SLNX-validator.Core/ServiceCollectionExtensions.cs b/src/SLNX-validator.Core/ServiceCollectionExtensions.cs
@@ -13,8 +13,8 @@ public static IServiceCollection AddSlnxValidator(this IServiceCollection servic
         services.AddSingleton<ISonarReporter, SonarReporter>();
         services.AddSingleton<ISlnxXsdProvider, SlnxXsdProvider>();
         services.AddSingleton<IXsdValidator, XsdValidator>();
-        services.AddSingleton<Validation.SlnxValidator>();
-        services.AddSingleton<SlnxFileResolver>();
+        services.AddSingleton<ISlnxValidator, Validation.SlnxValidator>();
+        services.AddSingleton<ISlnxFileResolver, SlnxFileResolver>();
         return services;
     }
 }
diff --git a/src/SLNX-validator.Core/Validation/ISlnxValidator.cs b/src/SLNX-validator.Core/Validation/ISlnxValidator.cs
@@ -0,0 +1,8 @@
+﻿using JulianVerdurmen.SlnxValidator.Core.ValidationResults;
+
+namespace JulianVerdurmen.SlnxValidator.Core.Validation;
+
+public interface ISlnxValidator
+{
+    Task<ValidationResult> ValidateAsync(string slnxContent, string slnxDirectory, CancellationToken cancellationToken = default);
+}
diff --git a/src/SLNX-validator.Core/Validation/SlnxValidator.cs b/src/SLNX-validator.Core/Validation/SlnxValidator.cs
@@ -5,7 +5,7 @@
 
 namespace JulianVerdurmen.SlnxValidator.Core.Validation;
 
-public sealed class SlnxValidator(IFileSystem fileSystem, IXsdValidator xsdValidator)
+internal sealed class SlnxValidator(IFileSystem fileSystem, IXsdValidator xsdValidator) : ISlnxValidator
 {
     /// <summary>
     /// Validates a .slnx file against the XSD schema and checks that all referenced files exist on disk.
diff --git a/src/SLNX-validator.Core/Validation/SlnxXsdProvider.cs b/src/SLNX-validator.Core/Validation/SlnxXsdProvider.cs
@@ -2,7 +2,7 @@
 
 namespace JulianVerdurmen.SlnxValidator.Core.Validation;
 
-public sealed class SlnxXsdProvider : ISlnxXsdProvider
+internal sealed class SlnxXsdProvider : ISlnxXsdProvider
 {
     // Source: https://github.com/microsoft/vs-solutionpersistence/blob/main/src/Microsoft.VisualStudio.SolutionPersistence/Serializer/Xml/Slnx.xsd
     private const string XsdResourceName = "JulianVerdurmen.SlnxValidator.Slnx.xsd";
diff --git a/src/SLNX-validator.Core/Validation/XsdValidator.cs b/src/SLNX-validator.Core/Validation/XsdValidator.cs
@@ -4,7 +4,7 @@
 
 namespace JulianVerdurmen.SlnxValidator.Core.Validation;
 
-public sealed class XsdValidator(ISlnxXsdProvider xsdProvider) : IXsdValidator
+internal sealed class XsdValidator(ISlnxXsdProvider xsdProvider) : IXsdValidator
 {
     public async Task ValidateAsync(string slnxContent, ValidationResult result, CancellationToken cancellationToken)
     {
diff --git a/src/SLNX-validator/ValidationCollector.cs b/src/SLNX-validator/ValidationCollector.cs
@@ -1,10 +1,10 @@
 using JulianVerdurmen.SlnxValidator.Core.FileSystem;
+using JulianVerdurmen.SlnxValidator.Core.Validation;
 using JulianVerdurmen.SlnxValidator.Core.ValidationResults;
-using CoreSlnxValidator = JulianVerdurmen.SlnxValidator.Core.Validation.SlnxValidator;
 
 namespace JulianVerdurmen.SlnxValidator;
 
-internal sealed class ValidationCollector(IFileSystem fileSystem, CoreSlnxValidator validator)
+internal sealed class ValidationCollector(IFileSystem fileSystem, ISlnxValidator validator)
 {
     public async Task<IReadOnlyList<FileValidationResult>> CollectAsync(IReadOnlyList<string> files, CancellationToken cancellationToken)
     {
diff --git a/src/SLNX-validator/ValidatorRunner.cs b/src/SLNX-validator/ValidatorRunner.cs
@@ -4,7 +4,7 @@
 
 namespace JulianVerdurmen.SlnxValidator;
 
-internal sealed class ValidatorRunner(SlnxFileResolver resolver, ValidationCollector collector, ISonarReporter sonarReporter)
+internal sealed class ValidatorRunner(ISlnxFileResolver resolver, ValidationCollector collector, ISonarReporter sonarReporter)
 {
     public async Task<int> RunAsync(string input, string? sonarqubeReportPath, bool continueOnError, CancellationToken cancellationToken)
     {
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -14,6 +14,7 @@
     <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.*" />
     <PackageReference Include="AwesomeAssertions" Version="9.4.*" />
     <PackageReference Include="Verify.TUnit" Version="31.*" />
+    <PackageReference Include="NSubstitute" Version="5.*" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/SLNX-validator.Tests/ValidatorRunnerTests.cs b/tests/SLNX-validator.Tests/ValidatorRunnerTests.cs
@@ -2,19 +2,16 @@
 using JulianVerdurmen.SlnxValidator.Core.FileSystem;
 using JulianVerdurmen.SlnxValidator.Core.SonarQubeReporting;
 using JulianVerdurmen.SlnxValidator.Core.Validation;
-using CoreSlnxValidator = JulianVerdurmen.SlnxValidator.Core.Validation.SlnxValidator;
-
+using NSubstitute;
 namespace JulianVerdurmen.SlnxValidator.Tests;
 
 public class ValidatorRunnerTests
 {
     private static ValidatorRunner CreateRunner(IFileSystem fileSystem)
     {
-        var resolver = new SlnxFileResolver(fileSystem);
-        var validator = new CoreSlnxValidator(fileSystem, new XsdValidator(new SlnxXsdProvider()));
-        var collector = new ValidationCollector(fileSystem, validator);
+        var collector = new ValidationCollector(fileSystem, Substitute.For<ISlnxValidator>());
         var sonarReporter = new SonarReporter(fileSystem);
-        return new ValidatorRunner(resolver, collector, sonarReporter);
+        return new ValidatorRunner(Substitute.For<ISlnxFileResolver>(), collector, sonarReporter);
     }
 
     [Test]

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace JulianVerdurmen.SlnxValidator.Core.FileSystem;`
`2`	`2`
`3`		`-public sealed class SlnxFileResolver(IFileSystem fileSystem)`
	`3`	`+internal sealed class SlnxFileResolver(IFileSystem fileSystem) : ISlnxFileResolver`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Resolves one or more .slnx file paths from the given input.`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public static IServiceCollection AddSlnxValidator(this IServiceCollection servic`
`13`	`13`	`services.AddSingleton<ISonarReporter, SonarReporter>();`
`14`	`14`	`services.AddSingleton<ISlnxXsdProvider, SlnxXsdProvider>();`
`15`	`15`	`services.AddSingleton<IXsdValidator, XsdValidator>();`
`16`		`- services.AddSingleton<Validation.SlnxValidator>();`
`17`		`- services.AddSingleton<SlnxFileResolver>();`
	`16`	`+ services.AddSingleton<ISlnxValidator, Validation.SlnxValidator>();`
	`17`	`+ services.AddSingleton<ISlnxFileResolver, SlnxFileResolver>();`
`18`	`18`	`return services;`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace JulianVerdurmen.SlnxValidator.Core.Validation;`
`7`	`7`
`8`		`-public sealed class SlnxValidator(IFileSystem fileSystem, IXsdValidator xsdValidator)`
	`8`	`+internal sealed class SlnxValidator(IFileSystem fileSystem, IXsdValidator xsdValidator) : ISlnxValidator`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Validates a .slnx file against the XSD schema and checks that all referenced files exist on disk.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace JulianVerdurmen.SlnxValidator.Core.Validation;`
`4`	`4`
`5`		`-public sealed class SlnxXsdProvider : ISlnxXsdProvider`
	`5`	`+internal sealed class SlnxXsdProvider : ISlnxXsdProvider`
`6`	`6`	`{`
`7`	`7`	`// Source: https://github.com/microsoft/vs-solutionpersistence/blob/main/src/Microsoft.VisualStudio.SolutionPersistence/Serializer/Xml/Slnx.xsd`
`8`	`8`	`private const string XsdResourceName = "JulianVerdurmen.SlnxValidator.Slnx.xsd";`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace JulianVerdurmen.SlnxValidator.Core.Validation;`
`6`	`6`
`7`		`-public sealed class XsdValidator(ISlnxXsdProvider xsdProvider) : IXsdValidator`
	`7`	`+internal sealed class XsdValidator(ISlnxXsdProvider xsdProvider) : IXsdValidator`
`8`	`8`	`{`
`9`	`9`	`public async Task ValidateAsync(string slnxContent, ValidationResult result, CancellationToken cancellationToken)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`using JulianVerdurmen.SlnxValidator.Core.FileSystem;`
	`2`	`+using JulianVerdurmen.SlnxValidator.Core.Validation;`
`2`	`3`	`using JulianVerdurmen.SlnxValidator.Core.ValidationResults;`
`3`		`-using CoreSlnxValidator = JulianVerdurmen.SlnxValidator.Core.Validation.SlnxValidator;`
`4`	`4`
`5`	`5`	`namespace JulianVerdurmen.SlnxValidator;`
`6`	`6`
`7`		`-internal sealed class ValidationCollector(IFileSystem fileSystem, CoreSlnxValidator validator)`
	`7`	`+internal sealed class ValidationCollector(IFileSystem fileSystem, ISlnxValidator validator)`
`8`	`8`	`{`
`9`	`9`	`public async Task<IReadOnlyList<FileValidationResult>> CollectAsync(IReadOnlyList<string> files, CancellationToken cancellationToken)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace JulianVerdurmen.SlnxValidator;`
`6`	`6`
`7`		`-internal sealed class ValidatorRunner(SlnxFileResolver resolver, ValidationCollector collector, ISonarReporter sonarReporter)`
	`7`	`+internal sealed class ValidatorRunner(ISlnxFileResolver resolver, ValidationCollector collector, ISonarReporter sonarReporter)`
`8`	`8`	`{`
`9`	`9`	`public async Task<int> RunAsync(string input, string? sonarqubeReportPath, bool continueOnError, CancellationToken cancellationToken)`
`10`	`10`	`{`