cleanup

Barsonax · Apr 5, 2024 · e185e34 · e185e34
1 parent eb72030
commit e185e34
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 46 deletions.
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 =>
@@ -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
@@ -42,10 +42,10 @@ protected override IHost CreateHost(IHostBuilder builder)
         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.Xunit/TestSetup/ApiMsSqlSut.cs b/Examples/Api/MsSql/Api.MsSql.Xunit/TestSetup/ApiMsSqlSut.cs
@@ -42,10 +42,10 @@ protected override IHost CreateHost(IHostBuilder builder)
         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
@@ -42,10 +42,10 @@ protected override IHost CreateHost(IHostBuilder builder)
         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.Xunit/TestSetup/ApiPostgreSqlSut.cs b/Examples/Api/PostgreSql/Api.PostgreSql.Xunit/TestSetup/ApiPostgreSqlSut.cs
@@ -42,10 +42,10 @@ protected override IHost CreateHost(IHostBuilder builder)
         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
@@ -49,10 +49,10 @@ protected override IHost CreateHost(IHostBuilder builder)
         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/Razor/Razor.Playwright/TestSetup/RazorSut.cs b/Examples/Razor/Razor.Playwright/TestSetup/RazorSut.cs
@@ -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/Vue/Vue.Playwright/TestSetup/VueSut.cs b/Examples/Vue/Vue.Playwright/TestSetup/VueSut.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 =>
@@ -106,12 +103,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);
@@ -122,7 +113,7 @@ protected override void Dispose(bool disposing)
             {
                 _host?.Dispose();
             }
-
+            _pooledDatabase.Dispose();
             _disposed = true;
         }
     }

diff --git a/TestExamplesDotnet/PooledDatabase.cs b/TestExamplesDotnet/PooledDatabase.cs
@@ -3,7 +3,7 @@
 
 namespace TestExamplesDotnet;
 
-public sealed class PooledDatabase : IAsyncDisposable
+public sealed class PooledDatabase : IDisposable
 {
     private readonly IDatabase _database;
 
@@ -27,9 +27,8 @@ public void EnsureDatabaseIsReadyForTest(IHost host)
         });
     }
 
-    public ValueTask DisposeAsync()
+    public void Dispose()
     {
         _pool.Return(_database);
-        return ValueTask.CompletedTask;
     }
 }