Merge pull request #28 from Barsonax/feature/ContainerReuse

Prepare for container reuse
Barsonax · Apr 5, 2024 · bd923eb · bd923eb
2 parents 2340e67 + e185e34
commit bd923eb
Show file tree

Hide file tree

Showing 34 changed files with 145 additions and 133 deletions.
diff --git a/Examples/AngularAuth/AngularAuth.Backend.Sut/BloggingContext.cs b/Examples/AngularAuth/AngularAuth.Backend.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace AngularAuth.Backend.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/AngularAuth/AngularAuth.Backend.Sut/Program.cs b/Examples/AngularAuth/AngularAuth.Backend.Sut/Program.cs
@@ -8,10 +8,7 @@
     WebRootPath = "wwwroot/browser"
 });
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
     .AddJwtBearer(JwtBearerDefaults.AuthenticationScheme);

diff --git a/Examples/AngularAuth/AngularAuth.Playwright/TestSetup/AngularAuthSut.cs b/Examples/AngularAuth/AngularAuth.Playwright/TestSetup/AngularAuthSut.cs
@@ -56,10 +56,7 @@ protected override IHost CreateHost(IHostBuilder builder)
         builder.UseEnvironment(Environments.Production);
         builder.ConfigureHostConfiguration(config =>
         {
-            config.AddInMemoryCollection(new Dictionary<string, string?>
-            {
-                { "DbConnectionString", _pooledDatabase.ConnectionString }
-            });
+            config.AddInMemoryCollection(new Dictionary<string, string?> { { "DbConnectionString", _pooledDatabase.ConnectionString } });
         });
 
         builder.ConfigureLogging(loggingBuilder =>
@@ -90,7 +87,7 @@ protected override IHost CreateHost(IHostBuilder builder)
         // enough" for the address it is listening on to be available.
         _host = builder.Build();
         _host.Start();
-        _pooledDatabase.EnsureInitialized(_host);
+        _pooledDatabase.EnsureDatabaseIsReadyForTest(_host);
 
         // Extract the selected dynamic port out of the Kestrel server
         // and assign it onto the client options for convenience so it
@@ -111,12 +108,6 @@ protected override IHost CreateHost(IHostBuilder builder)
         return testHost;
     }
 
-    public override async ValueTask DisposeAsync()
-    {
-        await base.DisposeAsync();
-        await _pooledDatabase.DisposeAsync();
-    }
-
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
@@ -128,6 +119,7 @@ protected override void Dispose(bool disposing)
                 _host?.Dispose();
             }
 
+            _pooledDatabase.Dispose();
             _disposed = true;
         }
     }

diff --git a/Examples/Api/MsSql/Api.MsSql.Nunit/TestSetup/ApiMsSqlSut.cs b/Examples/Api/MsSql/Api.MsSql.Nunit/TestSetup/ApiMsSqlSut.cs
@@ -37,15 +37,15 @@ protected override IHost CreateHost(IHostBuilder builder)
         });
 
         var app = base.CreateHost(builder);
-        _pooledDatabase.EnsureInitialized(app);
+        _pooledDatabase.EnsureDatabaseIsReadyForTest(app);
 
         return app;
     }
 
-    public override async ValueTask DisposeAsync()
+    protected override void Dispose(bool disposing)
     {
-        await base.DisposeAsync();
-        await _pooledDatabase.DisposeAsync();
+        base.Dispose(disposing);
+        _pooledDatabase.Dispose();
     }
 
     public void SeedData(Action<BloggingContext> seedAction)

diff --git a/Examples/Api/MsSql/Api.MsSql.Sut/BloggingContext.cs b/Examples/Api/MsSql/Api.MsSql.Sut/BloggingContext.cs
@@ -4,17 +4,20 @@ namespace Api.MsSql.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
-    {
+    public BloggingContext() { }
 
+    public BloggingContext(IConfiguration configuration)
+    {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
-
+        optionsBuilder.UseSqlServer(_connectionString);
     }
 }
 

diff --git a/Examples/Api/MsSql/Api.MsSql.Sut/Program.cs b/Examples/Api/MsSql/Api.MsSql.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseSqlServer(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/Examples/Api/MsSql/Api.MsSql.Xunit/TestSetup/ApiMsSqlSut.cs b/Examples/Api/MsSql/Api.MsSql.Xunit/TestSetup/ApiMsSqlSut.cs
@@ -37,15 +37,15 @@ protected override IHost CreateHost(IHostBuilder builder)
         });
 
         var app = base.CreateHost(builder);
-        _pooledDatabase.EnsureInitialized(app);
+        _pooledDatabase.EnsureDatabaseIsReadyForTest(app);
 
         return app;
     }
 
-    public override async ValueTask DisposeAsync()
+    protected override void Dispose(bool disposing)
     {
-        await base.DisposeAsync();
-        await _pooledDatabase.DisposeAsync();
+        base.Dispose(disposing);
+        _pooledDatabase.Dispose();
     }
 
     public void SeedData(Action<BloggingContext> seedAction)

diff --git a/Examples/Api/PostgreSql/Api.PostgreSql.Nunit/TestSetup/ApiPostgreSqlSut.cs b/Examples/Api/PostgreSql/Api.PostgreSql.Nunit/TestSetup/ApiPostgreSqlSut.cs
@@ -37,15 +37,15 @@ protected override IHost CreateHost(IHostBuilder builder)
         });
 
         var app = base.CreateHost(builder);
-        _pooledDatabase.EnsureInitialized(app);
+        _pooledDatabase.EnsureDatabaseIsReadyForTest(app);
 
         return app;
     }
 
-    public override async ValueTask DisposeAsync()
+    protected override void Dispose(bool disposing)
     {
-        await base.DisposeAsync();
-        await _pooledDatabase.DisposeAsync();
+        base.Dispose(disposing);
+        _pooledDatabase.Dispose();
     }
 
     public void SeedData(Action<BloggingContext> seedAction)

diff --git a/Examples/Api/PostgreSql/Api.PostgreSql.Sut/BloggingContext.cs b/Examples/Api/PostgreSql/Api.PostgreSql.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace Api.PostgreSql.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/Api/PostgreSql/Api.PostgreSql.Sut/Program.cs b/Examples/Api/PostgreSql/Api.PostgreSql.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/Examples/Api/PostgreSql/Api.PostgreSql.Xunit/TestSetup/ApiPostgreSqlSut.cs b/Examples/Api/PostgreSql/Api.PostgreSql.Xunit/TestSetup/ApiPostgreSqlSut.cs
@@ -37,15 +37,15 @@ protected override IHost CreateHost(IHostBuilder builder)
         });
 
         var app = base.CreateHost(builder);
-        _pooledDatabase.EnsureInitialized(app);
+        _pooledDatabase.EnsureDatabaseIsReadyForTest(app);
 
         return app;
     }
 
-    public override async ValueTask DisposeAsync()
+    protected override void Dispose(bool disposing)
     {
-        await base.DisposeAsync();
-        await _pooledDatabase.DisposeAsync();
+        base.Dispose(disposing);
+        _pooledDatabase.Dispose();
     }
 
     public void SeedData(Action<BloggingContext> seedAction)

diff --git a/Examples/ApiJwtAuth/ApiJwtAuth.Nunit/TestSetup/ApiJwtAuthSut.cs b/Examples/ApiJwtAuth/ApiJwtAuth.Nunit/TestSetup/ApiJwtAuthSut.cs
@@ -44,15 +44,15 @@ protected override IHost CreateHost(IHostBuilder builder)
         });
 
         var app = base.CreateHost(builder);
-        _pooledDatabase.EnsureInitialized(app);
+        _pooledDatabase.EnsureDatabaseIsReadyForTest(app);
 
         return app;
     }
 
-    public override async ValueTask DisposeAsync()
+    protected override void Dispose(bool disposing)
     {
-        await base.DisposeAsync();
-        await _pooledDatabase.DisposeAsync();
+        base.Dispose(disposing);
+        _pooledDatabase.Dispose();
     }
 
     public void SeedData(Action<BloggingContext> seedAction)

diff --git a/Examples/ApiJwtAuth/ApiJwtAuth.Sut/BloggingContext.cs b/Examples/ApiJwtAuth/ApiJwtAuth.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace ApiJwtAuth.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/ApiJwtAuth/ApiJwtAuth.Sut/Program.cs b/Examples/ApiJwtAuth/ApiJwtAuth.Sut/Program.cs
@@ -10,10 +10,7 @@
 
 builder.Services.AddAuthorization();
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/...ns.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Nunit/MigrationTests.cs b/...ns.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Nunit/MigrationTests.cs
@@ -49,7 +49,7 @@ private sealed class MigrationTestCases : IEnumerable
     {
         public IEnumerator GetEnumerator()
         {
-            using DbContext context = new BloggingContext(new DbContextOptionsBuilder<BloggingContext>().UseSqlServer().Options);
+            using DbContext context = new BloggingContext();
             var migrations = context.GenerateMigrationScripts();
 
             foreach (var migration in migrations)

diff --git a/...ons.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Sut/BloggingContext.cs b/...ons.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Sut/BloggingContext.cs
@@ -4,17 +4,20 @@ namespace Migrations.MsSql.EntityFrameworkCore.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
-    {
+    public BloggingContext() { }
 
+    public BloggingContext(IConfiguration configuration)
+    {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
-
+        optionsBuilder.UseSqlServer(_connectionString);
     }
 }
 

diff --git a/.../Migrations.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Sut/Program.cs b/.../Migrations.MsSql.EntityFrameworkCore/Migrations.MsSql.EntityFrameworkCore.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseSqlServer(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 var app = builder.Build();
 

diff --git a/Examples/Razor/Razor.Playwright/TestSetup/RazorSut.cs b/Examples/Razor/Razor.Playwright/TestSetup/RazorSut.cs
@@ -86,7 +86,7 @@ protected override IHost CreateHost(IHostBuilder builder)
         // enough" for the address it is listening on to be available.
         _host = builder.Build();
         _host.Start();
-        _pooledDatabase.EnsureInitialized(_host);
+        _pooledDatabase.EnsureDatabaseIsReadyForTest(_host);
 
         // Extract the selected dynamic port out of the Kestrel server
         // and assign it onto the client options for convenience so it
@@ -107,12 +107,6 @@ protected override IHost CreateHost(IHostBuilder builder)
         return testHost;
     }
 
-    public override async ValueTask DisposeAsync()
-    {
-        await base.DisposeAsync();
-        await _pooledDatabase.DisposeAsync();
-    }
-
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
@@ -123,7 +117,7 @@ protected override void Dispose(bool disposing)
             {
                 _host?.Dispose();
             }
-
+            _pooledDatabase.Dispose();
             _disposed = true;
         }
     }

diff --git a/Examples/Razor/Razor.Sut/BloggingContext.cs b/Examples/Razor/Razor.Sut/BloggingContext.cs
@@ -4,15 +4,20 @@ namespace Razor.PostgreSql.Sut;
 
 public class BloggingContext : DbContext
 {
+    private readonly string? _connectionString;
     public DbSet<Blog> Blogs => Set<Blog>();
     public DbSet<Post> Posts => Set<Post>();
 
-    public BloggingContext()
+    public BloggingContext() { }
+
+    public BloggingContext(IConfiguration configuration)
     {
+        _connectionString = configuration["DbConnectionString"];
     }
 
-    public BloggingContext(DbContextOptions<BloggingContext> context) : base(context)
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
+        optionsBuilder.UseNpgsql(_connectionString);
     }
 }
 

diff --git a/Examples/Razor/Razor.Sut/Program.cs b/Examples/Razor/Razor.Sut/Program.cs
@@ -3,10 +3,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddDbContext<BloggingContext>(options =>
-{
-    options.UseNpgsql(builder.Configuration["DbConnectionString"]);
-});
+builder.Services.AddDbContext<BloggingContext>();
 
 builder.Services.AddRazorPages();