serilog in tests

Author: Stepami

src/HydraScript/Program.cs

@@ -35,10 +35,7 @@ private static ExecuteCommand GetCommand()
         category: "AotAnalysis",
         checkId: "IL3050:RequiresDynamicCode",
         Justification = SuppressMessage)]
-    internal static ServiceProvider GetServiceProvider(
-        FileInfo fileInfo,
-        bool dump,
-        Action<IServiceCollection>? configureServices = null)
+    private static ServiceProvider GetServiceProvider(FileInfo fileInfo, bool dump)
     {
         var services = new ServiceCollection();
         services.AddLogging(c => c.ClearProviders()
@@ -48,7 +45,6 @@ internal static ServiceProvider GetServiceProvider(
             .AddDomain()
             .AddApplication()
             .AddInfrastructure(dump, fileInfo);
-        configureServices?.Invoke(services);
         return services.BuildServiceProvider();
     }
 }

src/Infrastructure/HydraScript.Infrastructure/ServiceCollectionExtensions.cs

@@ -33,7 +33,7 @@ public static IServiceCollection AddApplication(this IServiceCollection services
         .AddStaticAnalysis()
         .AddCodeGeneration();
 
-    public static void AddInfrastructure(
+    public static IServiceCollection AddInfrastructure(
         this IServiceCollection services,
         bool dump,
         FileInfo inputFileInfo)
@@ -59,5 +59,7 @@ public static void AddInfrastructure(
         }
 
         services.AddSingleton<Executor>();
+
+        return services;
     }
 }

tests/Directory.Packages.props

@@ -5,12 +5,13 @@
     <PackageVersion Include="AutoFixture.Xunit3" Version="4.19.0" />
     <PackageVersion Include="Fare" Version="2.2.1" />
     <PackageVersion Include="AwesomeAssertions" Version="9.2.0" />
-    <PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.9.0" />
     <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="PolymorphicContracts.AutoFixture" Version="2.0.0" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
+    <PackageVersion Include="Serilog.Sinks.XUnit3" Version="1.1.0" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="xunit.v3" Version="3.0.1" />
   </ItemGroup>

tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj

@@ -6,9 +6,10 @@
 
     <ItemGroup>
         <PackageReference Include="AwesomeAssertions" />
-        <PackageReference Include="MartinCostello.Logging.XUnit.v3" />
         <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
         <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
+        <PackageReference Include="Serilog.Extensions.Logging" />
+        <PackageReference Include="Serilog.Sinks.XUnit3" />
     </ItemGroup>
 
     <ItemGroup>

tests/HydraScript.IntegrationTests/ImplicitTestOutputHelperAccessor.cs

@@ -3,6 +3,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
+using Serilog;
+using Serilog.Sinks.XUnit3;
 
 namespace HydraScript.IntegrationTests;
 
@@ -31,39 +33,40 @@ public void Dispose()
 
     public Runner GetRunner(Options options, Action<IServiceCollection>? configureTestServices = null)
     {
-        var serviceProvider = Program.GetServiceProvider(
-            new FileInfo(options.FileName),
-            options.Dump,
-            services =>
+        var services = new ServiceCollection()
+            .AddDomain()
+            .AddApplication()
+            .AddInfrastructure(options.Dump, new FileInfo(options.FileName));
+        const string serilogTemplate = "[{Timestamp:HH:mm:ss} {Level:u} [{SourceContext}]] {Message:lj} {Exception}";
+        services.AddLogging(x => x.ClearProviders()
+            .AddSerilog(new LoggerConfiguration().WriteTo.XUnit3TestOutput(serilogTemplate).CreateLogger())
+            .AddFakeLogging(fakeLogOptions =>
             {
-                services.AddLogging(x => x.ClearProviders()
-                    .AddXUnit(new ImplicitTestOutputHelperAccessor())
-                    .AddFakeLogging(fakeLogOptions =>
+                fakeLogOptions.OutputSink = logMessage => _logMessages.Add(logMessage);
+                fakeLogOptions.OutputFormatter = fakeLogRecord =>
+                    fakeLogRecord.Level switch
                     {
-                        fakeLogOptions.OutputSink = logMessage => _logMessages.Add(logMessage);
-                        fakeLogOptions.OutputFormatter = fakeLogRecord =>
-                            fakeLogRecord.Level switch
-                            {
-                                LogLevel.Error => $"{fakeLogRecord.Message} {fakeLogRecord.Exception?.Message}",
-                                _ => fakeLogRecord.ToString()
-                            };
-                    }));
+                        LogLevel.Error => $"{fakeLogRecord.Message} {fakeLogRecord.Exception?.Message}",
+                        _ => fakeLogRecord.ToString()
+                    };
+            }));
 
-                if (options.MockFileSystem)
-                {
-                    var fileSystem = Substitute.For<IFileSystem>();
-                    services.AddSingleton(fileSystem);
-                }
+        if (options.MockFileSystem)
+        {
+            var fileSystem = Substitute.For<IFileSystem>();
+            services.AddSingleton(fileSystem);
+        }
+
+        if (!string.IsNullOrWhiteSpace(options.InMemoryScript))
+        {
+            var sourceCodeProvider = Substitute.For<ISourceCodeProvider>();
+            sourceCodeProvider.GetText().ReturnsForAnyArgs(options.InMemoryScript);
+            services.AddSingleton(sourceCodeProvider);
+        }
 
-                if (!string.IsNullOrWhiteSpace(options.InMemoryScript))
-                {
-                    var sourceCodeProvider = Substitute.For<ISourceCodeProvider>();
-                    sourceCodeProvider.GetText().ReturnsForAnyArgs(options.InMemoryScript);
-                    services.AddSingleton(sourceCodeProvider);
-                }
+        configureTestServices?.Invoke(services);
 
-                configureTestServices?.Invoke(services);
-            });
+        var serviceProvider = services.BuildServiceProvider();
         var executor = serviceProvider.GetRequiredService<Executor>();
         return new Runner(serviceProvider, executor);
     }