Caching of ILoggerFactory during testing is not required anymore.

Author: PawelGerr

samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples/Program.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Thinktecture.Database;
-using Thinktecture.EntityFrameworkCore.BulkOperations;
 
 namespace Thinktecture;
 

src/Thinktecture.EntityFrameworkCore.Relational/EntityFrameworkCore/Migrations/DefaultSchemaRespectingMigrationAssembly.cs

@@ -1,7 +1,6 @@
 using System.Reflection;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations.Operations;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Thinktecture.EntityFrameworkCore.Migrations;

src/Thinktecture.EntityFrameworkCore.Relational/EntityFrameworkCore/Query/ThinktectureRelationalQueryContextFactory.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.Internal;
 using Thinktecture.EntityFrameworkCore.Infrastructure;

tests/Thinktecture.EntityFrameworkCore.Relational.Tests/IntegrationTestsBase.cs

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using System.Data.Common;
 using Microsoft.Extensions.Logging;
 using Serilog;
@@ -10,8 +9,6 @@ namespace Thinktecture;
 
 public class IntegrationTestsBase : SqliteDbContextIntegrationTests<DbContextWithSchema>
 {
-   private static readonly ConcurrentDictionary<ITestOutputHelper, ILoggerFactory> _loggerFactoryCache = new();
-
    protected Action<DbContextOptionsBuilder<DbContextWithSchema>>? ConfigureOptionsBuilder { get; set; }
    protected Action<ModelBuilder>? ConfigureModel { get; set; }
    protected string? Schema { get; set; }
@@ -43,14 +40,11 @@ private static ILoggerFactory CreateLoggerFactory(ITestOutputHelper testOutputHe
    {
       ArgumentNullException.ThrowIfNull(testOutputHelper);
 
-      return _loggerFactoryCache.GetOrAdd(testOutputHelper, _ =>
-                                                            {
-                                                               var loggerConfig = new LoggerConfiguration()
-                                                                                  .WriteTo.TestOutput(testOutputHelper, outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}");
+      var loggerConfig = new LoggerConfiguration()
+                         .WriteTo.TestOutput(testOutputHelper, outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}");
 
-                                                               return new LoggerFactory()
-                                                                  .AddSerilog(loggerConfig.CreateLogger());
-                                                            });
+      return new LoggerFactory()
+         .AddSerilog(loggerConfig.CreateLogger());
    }
 
    protected DbContextWithSchema CreateContextWithSchema(string schema)

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/TestContext.cs

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Serilog;
@@ -11,8 +10,6 @@ public class TestContext
 
    public static TestContext Instance => _lazy.Value;
 
-   private readonly ConcurrentDictionary<ITestOutputHelper, ILoggerFactory> _loggerFactoryCache = new();
-
    public IConfiguration Configuration { get; }
 
    public string ConnectionString => Configuration.GetConnectionString("default");
@@ -40,13 +37,10 @@ public ILoggerFactory GetLoggerFactory(ITestOutputHelper testOutputHelper)
    {
       ArgumentNullException.ThrowIfNull(testOutputHelper);
 
-      return _loggerFactoryCache.GetOrAdd(testOutputHelper, helper =>
-                                                            {
-                                                               var loggerConfig = new LoggerConfiguration()
-                                                                                  .WriteTo.TestOutput(helper, outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}");
+      var loggerConfig = new LoggerConfiguration()
+                         .WriteTo.TestOutput(testOutputHelper, outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}");
 
-                                                               return new LoggerFactory()
-                                                                  .AddSerilog(loggerConfig.CreateLogger());
-                                                            });
+      return new LoggerFactory()
+         .AddSerilog(loggerConfig.CreateLogger());
    }
 }

tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/IntegrationTestsBase.cs

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using System.Data.Common;
 using System.Diagnostics;
 using Microsoft.EntityFrameworkCore.Diagnostics;
@@ -15,8 +14,6 @@ namespace Thinktecture;
 
 public class IntegrationTestsBase : SqliteDbContextIntegrationTests<TestDbContext>
 {
-   private static readonly ConcurrentDictionary<ITestOutputHelper, ILoggerFactory> _loggerFactoryCache = new();
-
    protected Action<DbContextOptionsBuilder<TestDbContext>>? ConfigureOptionsBuilder { get; set; }
    protected Action<ModelBuilder>? ConfigureModel { get; set; }
 
@@ -66,17 +63,14 @@ protected override TestDbContext CreateContext(DbContextOptions<TestDbContext> o
       return ctx;
    }
 
-   private ILoggerFactory CreateLoggerFactory(ITestOutputHelper testOutputHelper)
+   private static ILoggerFactory CreateLoggerFactory(ITestOutputHelper testOutputHelper)
    {
       ArgumentNullException.ThrowIfNull(testOutputHelper);
 
-      return _loggerFactoryCache.GetOrAdd(testOutputHelper, helper =>
-                                                            {
-                                                               var loggerConfig = new LoggerConfiguration()
-                                                                                  .WriteTo.TestOutput(helper, outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}");
+      var loggerConfig = new LoggerConfiguration()
+                         .WriteTo.TestOutput(testOutputHelper, outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}");
 
-                                                               return new LoggerFactory()
-                                                                  .AddSerilog(loggerConfig.CreateLogger());
-                                                            });
+      return new LoggerFactory()
+         .AddSerilog(loggerConfig.CreateLogger());
    }
 }