(RC2) (Test only) Code cleanup (Tests)

test/EFCore.AspNet.InMemory.FunctionalTests/AppServiceProviderFactoryTest.cs

@@ -139,7 +139,8 @@ public static TestWebHost BuildWebHost(string[] args)
     }
 }
 
-public class TestAppServiceProviderFactory(Assembly startupAssembly, IOperationReporter reporter = null) : AppServiceProviderFactory(startupAssembly, reporter ?? new TestOperationReporter());
+public class TestAppServiceProviderFactory(Assembly startupAssembly, IOperationReporter reporter = null)
+    : AppServiceProviderFactory(startupAssembly, reporter ?? new TestOperationReporter());
 
 public class TestWebHost(IServiceProvider services)
 {

test/EFCore.AspNet.InMemory.FunctionalTests/AspNetIdentityCustomTypesDefaultInMemoryTest.cs

@@ -3,7 +3,8 @@
 
 namespace Microsoft.EntityFrameworkCore;
 
-public class AspNetIdentityCustomTypesDefaultInMemoryTest(AspNetIdentityCustomTypesDefaultInMemoryTest.AspNetIdentityCustomTypesDefaultInMemoryFixture fixture)
+public class AspNetIdentityCustomTypesDefaultInMemoryTest(
+    AspNetIdentityCustomTypesDefaultInMemoryTest.AspNetIdentityCustomTypesDefaultInMemoryFixture fixture)
     : AspNetIdentityCustomTypesDefaultTestBase<
         AspNetIdentityCustomTypesDefaultInMemoryTest.AspNetIdentityCustomTypesDefaultInMemoryFixture>(fixture)
 {

test/EFCore.AspNet.InMemory.FunctionalTests/AspNetIdentityCustomTypesIntKeyInMemoryTest.cs

@@ -3,7 +3,8 @@
 
 namespace Microsoft.EntityFrameworkCore;
 
-public class AspNetIdentityCustomTypesIntKeyInMemoryTest(AspNetIdentityCustomTypesIntKeyInMemoryTest.AspNetIdentityCustomTypesIntKeyInMemoryFixture fixture)
+public class AspNetIdentityCustomTypesIntKeyInMemoryTest(
+    AspNetIdentityCustomTypesIntKeyInMemoryTest.AspNetIdentityCustomTypesIntKeyInMemoryFixture fixture)
     : AspNetIdentityCustomTypesIntKeyTestBase<
         AspNetIdentityCustomTypesIntKeyInMemoryTest.AspNetIdentityCustomTypesIntKeyInMemoryFixture>(fixture)
 {

test/EFCore.AspNet.Specification.Tests/AspNetIdentityCustomTypesDefaultTestBase.cs

@@ -330,9 +330,10 @@ protected override List<EntityTypeMapping> ExpectedMappings
         ];
 }
 
-public class CustomTypesIdentityContext(DbContextOptions options) : IdentityDbContext<CustomUserString, CustomRoleString, string, CustomUserClaimString,
-    CustomUserRoleString,
-    CustomUserLoginString, CustomRoleClaimString, CustomUserTokenString>(options)
+public class CustomTypesIdentityContext(DbContextOptions options)
+    : IdentityDbContext<CustomUserString, CustomRoleString, string, CustomUserClaimString,
+        CustomUserRoleString,
+        CustomUserLoginString, CustomRoleClaimString, CustomUserTokenString>(options)
 {
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
@@ -405,9 +406,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 public class CustomUserString : IdentityUser<string>
 {
     public CustomUserString()
-    {
-        Id = Guid.NewGuid().ToString();
-    }
+        => Id = Guid.NewGuid().ToString();
 
     public string CustomTag { get; set; }
 
@@ -422,9 +421,7 @@ public CustomUserString()
 public class CustomRoleString : IdentityRole<string>
 {
     public CustomRoleString()
-    {
-        Id = Guid.NewGuid().ToString();
-    }
+        => Id = Guid.NewGuid().ToString();
 
     public virtual ICollection<CustomUserString> Users { get; set; }
 

test/EFCore.AspNet.Specification.Tests/AspNetIdentityCustomTypesIntKeyTestBase.cs

@@ -172,8 +172,9 @@ protected override List<EntityTypeMapping> ExpectedMappings
         ];
 }
 
-public class CustomTypesIdentityContextInt(DbContextOptions options) : IdentityDbContext<CustomUserInt, CustomRoleInt, int, CustomUserClaimInt, CustomUserRoleInt,
-    CustomUserLoginInt, CustomRoleClaimInt, CustomUserTokenInt>(options)
+public class CustomTypesIdentityContextInt(DbContextOptions options)
+    : IdentityDbContext<CustomUserInt, CustomRoleInt, int, CustomUserClaimInt, CustomUserRoleInt,
+        CustomUserLoginInt, CustomRoleClaimInt, CustomUserTokenInt>(options)
 {
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {

test/EFCore.AspNet.Specification.Tests/ConfigurationDbContextTestBase.cs

@@ -200,14 +200,14 @@ private static async Task SaveApiResources(ConfigurationDbContext context)
                 Name = "ApiResource1",
                 DisplayName = "ApiResource 1",
                 Description = "ApiResource 1",
-                Scopes = [new() { Scope = "S1" }, new() { Scope = "S2" }]
+                Scopes = [new ApiResourceScope { Scope = "S1" }, new ApiResourceScope { Scope = "S2" }]
             },
             new ApiResource
             {
                 Name = "ApiResource2",
                 DisplayName = "ApiResource 2",
                 Description = "ApiResource 2",
-                Scopes = [new() { Scope = "S4" }, new() { Scope = "S5" }]
+                Scopes = [new ApiResourceScope { Scope = "S4" }, new ApiResourceScope { Scope = "S5" }]
             },
             new ApiResource
             {

test/EFCore.AspNet.Specification.Tests/GrpcTestBase.cs

@@ -12,9 +12,7 @@ public abstract class GrpcTestBase<TFixture> : IClassFixture<TFixture>
     where TFixture : GrpcTestBase<TFixture>.GrpcFixtureBase
 {
     protected GrpcTestBase(TFixture fixture)
-    {
-        Fixture = fixture;
-    }
+        => Fixture = fixture;
 
     protected TFixture Fixture { get; }
 

test/EFCore.AspNet.SqlServer.FunctionalTests/AspNetIdentityCustomTypesDefaultSqlServerTest.cs

@@ -3,7 +3,8 @@
 
 namespace Microsoft.EntityFrameworkCore;
 
-public class AspNetIdentityCustomTypesDefaultSqlServerTest(AspNetIdentityCustomTypesDefaultSqlServerTest.AspNetIdentityCustomTypesDefaultSqlServerFixture fixture)
+public class AspNetIdentityCustomTypesDefaultSqlServerTest(
+    AspNetIdentityCustomTypesDefaultSqlServerTest.AspNetIdentityCustomTypesDefaultSqlServerFixture fixture)
     : AspNetIdentityCustomTypesDefaultTestBase<
         AspNetIdentityCustomTypesDefaultSqlServerTest.AspNetIdentityCustomTypesDefaultSqlServerFixture>(fixture)
 {

test/EFCore.AspNet.SqlServer.FunctionalTests/AspNetIdentityCustomTypesIntKeySqlServerTest.cs

@@ -3,7 +3,8 @@
 
 namespace Microsoft.EntityFrameworkCore;
 
-public class AspNetIdentityCustomTypesIntKeySqlServerTest(AspNetIdentityCustomTypesIntKeySqlServerTest.AspNetIdentityCustomTypesIntKeySqlServerFixture fixture)
+public class AspNetIdentityCustomTypesIntKeySqlServerTest(
+    AspNetIdentityCustomTypesIntKeySqlServerTest.AspNetIdentityCustomTypesIntKeySqlServerFixture fixture)
     : AspNetIdentityCustomTypesIntKeyTestBase<
         AspNetIdentityCustomTypesIntKeySqlServerTest.AspNetIdentityCustomTypesIntKeySqlServerFixture>(fixture)
 {

test/EFCore.AspNet.SqlServer.FunctionalTests/AspNetIdentityIntKeySqlServerTest.cs

@@ -4,7 +4,7 @@
 namespace Microsoft.EntityFrameworkCore;
 
 public class AspNetIdentityIntKeySqlServerTest(AspNetIdentityIntKeySqlServerTest.AspNetIdentityIntKeySqlServerFixture fixture)
-        : AspNetIdentityIntKeyTestBase<AspNetIdentityIntKeySqlServerTest.AspNetIdentityIntKeySqlServerFixture>(fixture)
+    : AspNetIdentityIntKeyTestBase<AspNetIdentityIntKeySqlServerTest.AspNetIdentityIntKeySqlServerFixture>(fixture)
 {
     public class AspNetIdentityIntKeySqlServerFixture : AspNetIdentityFixtureBase
     {

test/EFCore.AspNet.SqlServer.FunctionalTests/GrpcSqlServerTest.cs

@@ -5,7 +5,8 @@ namespace Microsoft.EntityFrameworkCore;
 
 #if !EXCLUDE_ON_MAC
 
-public class GrpcSqlServerTest(GrpcSqlServerTest.GrpcSqlServerFixture fixture) : GrpcTestBase<GrpcSqlServerTest.GrpcSqlServerFixture>(fixture)
+public class GrpcSqlServerTest(GrpcSqlServerTest.GrpcSqlServerFixture fixture)
+    : GrpcTestBase<GrpcSqlServerTest.GrpcSqlServerFixture>(fixture)
 {
     public class GrpcSqlServerFixture : GrpcFixtureBase
     {

test/EFCore.AspNet.Sqlite.FunctionalTests/AspNetIdentityCustomTypesDefaultSqliteTest.cs

@@ -3,8 +3,10 @@
 
 namespace Microsoft.EntityFrameworkCore;
 
-public class AspNetIdentityCustomTypesDefaultSqliteTest(AspNetIdentityCustomTypesDefaultSqliteTest.AspNetIdentityCustomTypesDefaultSqliteFixture fixture)
-    : AspNetIdentityCustomTypesDefaultTestBase<AspNetIdentityCustomTypesDefaultSqliteTest.AspNetIdentityCustomTypesDefaultSqliteFixture>(fixture)
+public class AspNetIdentityCustomTypesDefaultSqliteTest(
+    AspNetIdentityCustomTypesDefaultSqliteTest.AspNetIdentityCustomTypesDefaultSqliteFixture fixture)
+    : AspNetIdentityCustomTypesDefaultTestBase<AspNetIdentityCustomTypesDefaultSqliteTest.AspNetIdentityCustomTypesDefaultSqliteFixture>(
+        fixture)
 {
     public class AspNetIdentityCustomTypesDefaultSqliteFixture : AspNetIdentityFixtureBase
     {

test/EFCore.AspNet.Sqlite.FunctionalTests/AspNetIdentityCustomTypesIntKeySqliteTest.cs

@@ -3,8 +3,10 @@
 
 namespace Microsoft.EntityFrameworkCore;
 
-public class AspNetIdentityCustomTypesIntKeySqliteTest(AspNetIdentityCustomTypesIntKeySqliteTest.AspNetIdentityCustomTypesIntKeySqliteFixture fixture)
-    : AspNetIdentityCustomTypesIntKeyTestBase<AspNetIdentityCustomTypesIntKeySqliteTest.AspNetIdentityCustomTypesIntKeySqliteFixture>(fixture)
+public class AspNetIdentityCustomTypesIntKeySqliteTest(
+    AspNetIdentityCustomTypesIntKeySqliteTest.AspNetIdentityCustomTypesIntKeySqliteFixture fixture)
+    : AspNetIdentityCustomTypesIntKeyTestBase<AspNetIdentityCustomTypesIntKeySqliteTest.AspNetIdentityCustomTypesIntKeySqliteFixture>(
+        fixture)
 {
     public class AspNetIdentityCustomTypesIntKeySqliteFixture : AspNetIdentityFixtureBase
     {

test/EFCore.Cosmos.FunctionalTests/ConcurrencyDetectorEnabledCosmosTest.cs

@@ -5,8 +5,9 @@ namespace Microsoft.EntityFrameworkCore;
 
 #nullable disable
 
-public class ConcurrencyDetectorEnabledCosmosTest(ConcurrencyDetectorEnabledCosmosTest.ConcurrencyDetectorCosmosFixture fixture) : ConcurrencyDetectorEnabledTestBase<
-    ConcurrencyDetectorEnabledCosmosTest.ConcurrencyDetectorCosmosFixture>(fixture)
+public class ConcurrencyDetectorEnabledCosmosTest(ConcurrencyDetectorEnabledCosmosTest.ConcurrencyDetectorCosmosFixture fixture)
+    : ConcurrencyDetectorEnabledTestBase<
+        ConcurrencyDetectorEnabledCosmosTest.ConcurrencyDetectorCosmosFixture>(fixture)
 {
     [ConditionalTheory(Skip = "Issue #17246")]
     public override Task Any(bool async)

test/EFCore.Cosmos.FunctionalTests/ConnectionSpecificationTest.cs

@@ -38,7 +38,8 @@ public async Task Throws_for_missing_connection_info()
         using var context = new NoConnectionContext();
         var creator = context.GetService<IDatabaseCreator>();
 
-        Assert.Equal(CosmosStrings.ConnectionInfoMissing,
+        Assert.Equal(
+            CosmosStrings.ConnectionInfoMissing,
             (await Assert.ThrowsAsync<InvalidOperationException>(() => creator.EnsureDeletedAsync())).Message);
     }
 
@@ -49,7 +50,6 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                 .ConfigureWarnings(w => w.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning));
     }
 
-
     public class Blog
     {
         public int Id { get; set; }

test/EFCore.Cosmos.FunctionalTests/CosmosApiConsistencyTest.cs

@@ -7,7 +7,8 @@ namespace Microsoft.EntityFrameworkCore;
 
 #nullable disable
 
-public class CosmosApiConsistencyTest(CosmosApiConsistencyTest.CosmosApiConsistencyFixture fixture) : ApiConsistencyTestBase<CosmosApiConsistencyTest.CosmosApiConsistencyFixture>(fixture)
+public class CosmosApiConsistencyTest(CosmosApiConsistencyTest.CosmosApiConsistencyFixture fixture)
+    : ApiConsistencyTestBase<CosmosApiConsistencyTest.CosmosApiConsistencyFixture>(fixture)
 {
     protected override void AddServices(ServiceCollection serviceCollection)
         => serviceCollection.AddEntityFrameworkCosmos();

test/EFCore.Cosmos.FunctionalTests/CustomConvertersCosmosTest.cs

@@ -11,9 +11,7 @@ public class CustomConvertersCosmosTest : CustomConvertersTestBase<CustomConvert
 {
     public CustomConvertersCosmosTest(CustomConvertersCosmosFixture fixture)
         : base(fixture)
-    {
-        Fixture.TestSqlLoggerFactory.Clear();
-    }
+        => Fixture.TestSqlLoggerFactory.Clear();
 
     [ConditionalTheory(Skip = "Issue #17246 No Explicit Convert")]
     public override Task Can_filter_projection_with_inline_enum_variable(bool async)