More using declarations in tests

test/EFCore.PG.Tests/NpgsqlDatabaseFacadeTest.cs

@@ -11,104 +11,95 @@ public class NpgsqlDatabaseFacadeTest
         [Fact]
         public void IsNpgsql_when_using_OnConfiguring()
         {
-            using (var context = new NpgsqlOnConfiguringContext())
-            {
-                Assert.True(context.Database.IsNpgsql());
-            }
+            using var context = new NpgsqlOnConfiguringContext();
+
+            Assert.True(context.Database.IsNpgsql());
         }
 
         [Fact]
         public void IsNpgsql_in_OnModelCreating_when_using_OnConfiguring()
         {
-            using (var context = new NpgsqlOnModelContext())
-            {
-                var _ = context.Model; // Trigger context initialization
-                Assert.True(context.IsNpgsqlSet);
-            }
+            using var context = new NpgsqlOnModelContext();
+            var _ = context.Model; // Trigger context initialization
+
+            Assert.True(context.IsNpgsqlSet);
         }
 
         [Fact]
         public void IsNpgsql_in_constructor_when_using_OnConfiguring()
         {
-            using (var context = new NpgsqlConstructorContext())
-            {
-                var _ = context.Model; // Trigger context initialization
-                Assert.True(context.IsNpgsqlSet);
-            }
+            using var context = new NpgsqlConstructorContext();
+            var _ = context.Model; // Trigger context initialization
+
+            Assert.True(context.IsNpgsqlSet);
         }
 
         [Fact]
         public void Cannot_use_IsNpgsql_in_OnConfiguring()
         {
-            using (var context = new NpgsqlUseInOnConfiguringContext())
-            {
-                Assert.Equal(
-                    CoreStrings.RecursiveOnConfiguring,
-                    Assert.Throws<InvalidOperationException>(
-                        () =>
-                        {
-                            var _ = context.Model; // Trigger context initialization
-                        }).Message);
-            }
+            using var context = new NpgsqlUseInOnConfiguringContext();
+
+            Assert.Equal(
+                CoreStrings.RecursiveOnConfiguring,
+                Assert.Throws<InvalidOperationException>(
+                    () =>
+                    {
+                        var _ = context.Model; // Trigger context initialization
+                    }).Message);
         }
 
         [Fact]
         public void IsNpgsql_when_using_constructor()
         {
-            using (var context = new ProviderContext(
-                new DbContextOptionsBuilder().UseNpgsql("Database=Maltesers").Options))
-            {
-                Assert.True(context.Database.IsNpgsql());
-            }
+            using var context = new ProviderContext(
+                new DbContextOptionsBuilder().UseNpgsql("Database=Maltesers").Options);
+
+            Assert.True(context.Database.IsNpgsql());
         }
 
         [Fact]
         public void IsNpgsql_in_OnModelCreating_when_using_constructor()
         {
-            using (var context = new ProviderOnModelContext(
-                new DbContextOptionsBuilder().UseNpgsql("Database=Maltesers").Options))
-            {
-                var _ = context.Model; // Trigger context initialization
-                Assert.True(context.IsNpgsqlSet);
-            }
+            using var context = new ProviderOnModelContext(
+                new DbContextOptionsBuilder().UseNpgsql("Database=Maltesers").Options);
+            var _ = context.Model; // Trigger context initialization
+
+            Assert.True(context.IsNpgsqlSet);
         }
 
         [Fact]
         public void IsNpgsql_in_constructor_when_using_constructor()
         {
-            using (var context = new ProviderConstructorContext(
-                new DbContextOptionsBuilder().UseNpgsql("Database=Maltesers").Options))
-            {
-                var _ = context.Model; // Trigger context initialization
-                Assert.True(context.IsNpgsqlSet);
-            }
+            using var context = new ProviderConstructorContext(
+                new DbContextOptionsBuilder().UseNpgsql("Database=Maltesers").Options);
+            var _ = context.Model; // Trigger context initialization
+
+            Assert.True(context.IsNpgsqlSet);
         }
 
         [Fact]
         public void Cannot_use_IsNpgsql_in_OnConfiguring_with_constructor()
         {
-            using (var context = new ProviderUseInOnConfiguringContext(
-                new DbContextOptionsBuilder().UseNpgsql("Database=Maltesers").Options))
-            {
-                Assert.Equal(
-                    CoreStrings.RecursiveOnConfiguring,
-                    Assert.Throws<InvalidOperationException>(
-                        () =>
-                        {
-                            var _ = context.Model; // Trigger context initialization
-                        }).Message);
-            }
+            using var context = new ProviderUseInOnConfiguringContext(
+                new DbContextOptionsBuilder().UseNpgsql("Database=Maltesers").Options);
+
+            Assert.Equal(
+                CoreStrings.RecursiveOnConfiguring,
+                Assert.Throws<InvalidOperationException>(
+                    () =>
+                    {
+                        var _ = context.Model; // Trigger context initialization
+                    }).Message);
         }
 
         /*
         [Fact]
         public void Not_IsNpgsql_when_using_different_provider()
         {
-            using (var context = new ProviderContext(
-                new DbContextOptionsBuilder().UseInMemoryDatabase("Maltesers").Options))
-            {
-                Assert.False(context.Database.IsNpgsql());
-            }
+            using var context = new ProviderContext(
+                new DbContextOptionsBuilder().UseInMemoryDatabase("Maltesers").Options);
+
+            Assert.False(context.Database.IsNpgsql());
         }*/
 
         class ProviderContext : DbContext

test/EFCore.PG.Tests/NpgsqlRelationalConnectionTest.cs

@@ -15,22 +15,18 @@ public class NpgsqlRelationalConnectionTest
         [Fact]
         public void Creates_Npgsql_Server_connection_string()
         {
-            using (var connection = new NpgsqlRelationalConnection(CreateDependencies()))
-            {
-                Assert.IsType<NpgsqlConnection>(connection.DbConnection);
-            }
+            using var connection = new NpgsqlRelationalConnection(CreateDependencies());
+
+            Assert.IsType<NpgsqlConnection>(connection.DbConnection);
         }
 
         [Fact]
         public void Can_create_master_connection_string()
         {
-            using (var connection = new NpgsqlRelationalConnection(CreateDependencies()))
-            {
-                using (var master = connection.CreateMasterConnection())
-                {
-                    Assert.Equal(@"Host=localhost;Database=postgres;Username=some_user;Password=some_password;Pooling=False", master.ConnectionString);
-                }
-            }
+            using var connection = new NpgsqlRelationalConnection(CreateDependencies());
+            using var master = connection.CreateMasterConnection();
+
+            Assert.Equal(@"Host=localhost;Database=postgres;Username=some_user;Password=some_password;Pooling=False", master.ConnectionString);
         }
 
         [Fact]
@@ -42,13 +38,10 @@ public void Can_create_master_connection_string_with_alternate_admin_db()
                     b => b.UseAdminDatabase("template0"))
                 .Options;
 
-            using (var connection = new NpgsqlRelationalConnection(CreateDependencies(options)))
-            {
-                using (var master = connection.CreateMasterConnection())
-                {
-                    Assert.Equal(@"Host=localhost;Database=template0;Username=some_user;Password=some_password;Pooling=False", master.ConnectionString);
-                }
-            }
+            using var connection = new NpgsqlRelationalConnection(CreateDependencies(options));
+            using var master = connection.CreateMasterConnection();
+
+            Assert.Equal(@"Host=localhost;Database=template0;Username=some_user;Password=some_password;Pooling=False", master.ConnectionString);
         }
 
         public static RelationalConnectionDependencies CreateDependencies(DbContextOptions options = null)