Resharper: Use lambda expression

bkoelman · bkoelman · commit cde7b63738a2 · 2023-11-22T00:48:52.000+01:00
diff --git a/test/DapperTests/IntegrationTests/AtomicOperations/AtomicOperationsTests.cs b/test/DapperTests/IntegrationTests/AtomicOperations/AtomicOperationsTests.cs
@@ -396,10 +396,7 @@ public async Task Can_rollback_on_error()
 
         const string personLocalId = "new-person";
 
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return _testContext.ClearAllTablesAsync(dbContext);
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => _testContext.ClearAllTablesAsync(dbContext));
 
         var requestBody = new
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs
@@ -21,10 +21,7 @@ public ArchiveTests(IntegrationTestContext<TestableStartup<TelevisionDbContext>,
         testContext.UseController<TelevisionBroadcastsController>();
         testContext.UseController<BroadcastCommentsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddResourceDefinition<TelevisionBroadcastDefinition>();
-        });
+        testContext.ConfigureServices(services => services.AddResourceDefinition<TelevisionBroadcastDefinition>());
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs
@@ -26,10 +26,7 @@ public AtomicCreateResourceTests(IntegrationTestContext<TestableStartup<Operatio
         testContext.UseController<MusicTracksController>();
         testContext.UseController<PlaylistsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddSingleton<ISystemClock, FrozenSystemClock>();
-        });
+        testContext.ConfigureServices(services => services.AddSingleton<ISystemClock, FrozenSystemClock>());
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.AllowUnknownFieldsInRequestBody = false;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs
@@ -25,10 +25,7 @@ public AtomicAbsoluteLinksTests(IntegrationTestContext<TestableStartup<Operation
         testContext.UseController<TextLanguagesController>();
         testContext.UseController<RecordCompaniesController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs
@@ -26,10 +26,7 @@ public AtomicRelativeLinksWithNamespaceTests(
         testContext.UseController<TextLanguagesController>();
         testContext.UseController<RecordCompaniesController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicTraceLoggingTests.cs
@@ -29,10 +29,7 @@ public AtomicTraceLoggingTests(IntegrationTestContext<TestableStartup<Operations
             options.AddFilter((category, _) => category != null && category.StartsWith("JsonApiDotNetCore.", StringComparison.Ordinal));
         });
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddSingleton(loggerFactory);
-        });
+        testContext.ConfigureServices(services => services.AddSingleton(loggerFactory));
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs
@@ -17,10 +17,7 @@ public AtomicModelStateValidationTests(IntegrationTestContext<TestableStartup<Op
     {
         _testContext = testContext;
 
-        _testContext.ConfigureServices(services =>
-        {
-            services.AddSingleton<ISystemClock, FrozenSystemClock>();
-        });
+        _testContext.ConfigureServices(services => services.AddSingleton<ISystemClock, FrozenSystemClock>());
 
         testContext.UseController<OperationsController>();
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs
@@ -42,10 +42,7 @@ public async Task Transforms_on_create_resource_with_side_effects()
 
         List<RecordCompany> newCompanies = _fakers.RecordCompany.Generate(2);
 
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTableAsync<RecordCompany>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<RecordCompany>());
 
         var requestBody = new
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
@@ -27,10 +27,7 @@ public async Task Can_rollback_on_error()
         DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
         string newTitle = _fakers.MusicTrack.Generate().Title;
 
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTablesAsync<Performer, MusicTrack>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTablesAsync<Performer, MusicTrack>());
 
         string unknownPerformerId = Unknown.StringId.For<Performer, int>();
 
@@ -113,10 +110,7 @@ public async Task Can_restore_to_previous_savepoint_on_error()
         // Arrange
         string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTablesAsync<Performer, MusicTrack>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTablesAsync<Performer, MusicTrack>());
 
         const string trackLid = "track-1";
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobTests.cs
@@ -19,10 +19,7 @@ public BlobTests(IntegrationTestContext<TestableStartup<BlobDbContext>, BlobDbCo
 
         testContext.UseController<ImageContainersController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs
@@ -225,10 +225,7 @@ public async Task Denies_JsonApi_in_Accept_headers_at_operations_endpoint()
         const string route = "/operations";
         const string contentType = HeaderConstants.AtomicOperationsMediaType;
 
-        Action<HttpRequestHeaders> setRequestHeaders = headers =>
-        {
-            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(HeaderConstants.MediaType));
-        };
+        Action<HttpRequestHeaders> setRequestHeaders = headers => headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(HeaderConstants.MediaType));
 
         // Act
         (HttpResponseMessage httpResponse, Document responseDocument) =
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeLogTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeLogTests.cs
@@ -22,10 +22,7 @@ public ApiControllerAttributeLogTests()
             options.AddProvider(_loggerFactory);
         });
 
-        ConfigureServices(services =>
-        {
-            services.AddSingleton(_loggerFactory);
-        });
+        ConfigureServices(services => services.AddSingleton(_loggerFactory));
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs
@@ -23,10 +23,8 @@ public ModelStateValidationTests(IntegrationTestContext<TestableStartup<ModelSta
 
 #if NET6_0
         testContext.ConfigureServices(services =>
-        {
             // Polyfill for missing DateOnly/TimeOnly support in .NET 6 ModelState validation.
-            services.AddDateOnlyTimeOnlyStringConverters();
-        });
+            services.AddDateOnlyTimeOnlyStringConverters());
 #endif
     }
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs
@@ -17,10 +17,7 @@ public WorkflowTests(IntegrationTestContext<TestableStartup<WorkflowDbContext>,
 
         testContext.UseController<WorkflowsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddResourceDefinition<WorkflowDefinition>();
-        });
+        testContext.ConfigureServices(services => services.AddResourceDefinition<WorkflowDefinition>());
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs
@@ -25,10 +25,7 @@ public AbsoluteLinksWithNamespaceTests(IntegrationTestContext<AbsoluteLinksInApi
         testContext.UseController<PhotoAlbumsController>();
         testContext.UseController<PhotosController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.IncludeTotalResourceCount = true;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs
@@ -25,10 +25,7 @@ public AbsoluteLinksWithoutNamespaceTests(IntegrationTestContext<AbsoluteLinksNo
         testContext.UseController<PhotoAlbumsController>();
         testContext.UseController<PhotosController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.IncludeTotalResourceCount = true;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs
@@ -25,10 +25,7 @@ public RelativeLinksWithNamespaceTests(IntegrationTestContext<RelativeLinksInApi
         testContext.UseController<PhotoAlbumsController>();
         testContext.UseController<PhotosController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.IncludeTotalResourceCount = true;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs
@@ -25,10 +25,7 @@ public RelativeLinksWithoutNamespaceTests(IntegrationTestContext<RelativeLinksNo
         testContext.UseController<PhotoAlbumsController>();
         testContext.UseController<PhotosController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.IncludeTotalResourceCount = true;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs
@@ -30,10 +30,7 @@ public LoggingTests(IntegrationTestContext<TestableStartup<LoggingDbContext>, Lo
             options.AddFilter((category, _) => category != null && category.StartsWith("JsonApiDotNetCore.", StringComparison.Ordinal));
         });
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddSingleton(loggerFactory);
-        });
+        testContext.ConfigureServices(services => services.AddSingleton(loggerFactory));
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs
@@ -19,10 +19,7 @@ public ResponseMetaTests(IntegrationTestContext<TestableStartup<MetaDbContext>,
         testContext.UseController<ProductFamiliesController>();
         testContext.UseController<SupportTicketsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddSingleton<IResponseMeta, SupportResponseMeta>();
-        });
+        testContext.ConfigureServices(services => services.AddSingleton<IResponseMeta, SupportResponseMeta>());
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.IncludeTotalResourceCount = false;
@@ -32,10 +29,7 @@ public ResponseMetaTests(IntegrationTestContext<TestableStartup<MetaDbContext>,
     public async Task Returns_top_level_meta()
     {
         // Arrange
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTableAsync<SupportTicket>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<SupportTicket>());
 
         const string route = "/supportTickets";
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -21,10 +21,7 @@ public TopLevelCountTests(IntegrationTestContext<TestableStartup<MetaDbContext>,
         testContext.UseController<ProductFamiliesController>();
         testContext.UseController<SupportTicketsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-        });
+        testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.IncludeTotalResourceCount = true;
@@ -86,10 +83,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     public async Task Renders_resource_count_for_empty_collection()
     {
         // Arrange
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTableAsync<SupportTicket>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<SupportTicket>());
 
         const string route = "/supportTickets";
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs
@@ -19,10 +19,7 @@ public async Task Create_group_writes_to_outbox()
 
         string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTableAsync<OutgoingMessage>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<OutgoingMessage>());
 
         var requestBody = new
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs
@@ -20,10 +20,7 @@ public async Task Create_user_writes_to_outbox()
         string newLoginName = _fakers.DomainUser.Generate().LoginName;
         string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-        await _testContext.RunOnDatabaseAsync(dbContext =>
-        {
-            return dbContext.ClearTableAsync<OutgoingMessage>();
-        });
+        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<OutgoingMessage>());
 
         var requestBody = new
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
@@ -22,10 +22,7 @@ public CreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableS
         testContext.UseController<WorkItemGroupsController>();
         testContext.UseController<RgbColorsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
-        });
+        testContext.ConfigureServices(services => services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>());
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.ClientIdGeneration = ClientIdGenerationMode.Required;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
@@ -25,10 +25,7 @@ public RemoveFromToManyRelationshipTests(IntegrationTestContext<TestableStartup<
         testContext.UseController<WorkItemsController>();
         testContext.UseController<WorkItemGroupsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddSingleton<IResourceDefinition<WorkItem, int>, RemoveExtraFromWorkItemDefinition>();
-        });
+        testContext.ConfigureServices(services => services.AddSingleton<IResourceDefinition<WorkItem, int>, RemoveExtraFromWorkItemDefinition>());
 
         var workItemDefinition = (RemoveExtraFromWorkItemDefinition)testContext.Factory.Services.GetRequiredService<IResourceDefinition<WorkItem, int>>();
         workItemDefinition.Reset();
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
@@ -22,10 +22,7 @@ public ReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<Rea
         testContext.UseController<WorkItemGroupsController>();
         testContext.UseController<UserAccountsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
-        });
+        testContext.ConfigureServices(services => services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>());
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
@@ -22,10 +22,7 @@ public UpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<ReadW
         testContext.UseController<RgbColorsController>();
         testContext.UseController<UserAccountsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
-        });
+        testContext.ConfigureServices(services => services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>());
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs
@@ -21,10 +21,7 @@ public ResourceInjectionTests(IntegrationTestContext<TestableStartup<InjectionDb
         testContext.UseController<GiftCertificatesController>();
         testContext.UseController<PostOfficesController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddSingleton<ISystemClock, FrozenSystemClock>();
-        });
+        testContext.ConfigureServices(services => services.AddSingleton<ISystemClock, FrozenSystemClock>());
 
         _fakers = new InjectionFakers(testContext.Factory.Services);
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceReadTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceReadTests.cs
@@ -35,10 +35,7 @@ protected ResourceInheritanceReadTests(IntegrationTestContext<TestableStartup<TD
         testContext.UseController<ChromeWheelsController>();
         testContext.UseController<CarbonWheelsController>();
 
-        testContext.ConfigureServices(services =>
-        {
-            services.AddResourceDefinition<WheelSortDefinition>();
-        });
+        testContext.ConfigureServices(services => services.AddResourceDefinition<WheelSortDefinition>());
 
         var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
         options.UseRelativeLinks = true;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs
diff --git a/test/TestBuildingBlocks/IntegrationTestContext.cs b/test/TestBuildingBlocks/IntegrationTestContext.cs

Original file line number	Diff line number	Diff line change
`@@ -396,10 +396,7 @@ public async Task Can_rollback_on_error()`
`396`	`396`
`397`	`397`	`const string personLocalId = "new-person";`
`398`	`398`
`399`		`- await _testContext.RunOnDatabaseAsync(dbContext =>`
`400`		`- {`
`401`		`- return _testContext.ClearAllTablesAsync(dbContext);`
`402`		`- });`
	`399`	`+ await _testContext.RunOnDatabaseAsync(dbContext => _testContext.ClearAllTablesAsync(dbContext));`
`403`	`400`
`404`	`401`	`var requestBody = new`
`405`	`402`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,7 @@ public AtomicModelStateValidationTests(IntegrationTestContext<TestableStartup<Op`
`17`	`17`	`{`
`18`	`18`	`_testContext = testContext;`
`19`	`19`
`20`		`- _testContext.ConfigureServices(services =>`
`21`		`- {`
`22`		`- services.AddSingleton<ISystemClock, FrozenSystemClock>();`
`23`		`- });`
	`20`	`+ _testContext.ConfigureServices(services => services.AddSingleton<ISystemClock, FrozenSystemClock>());`
`24`	`21`
`25`	`22`	`testContext.UseController<OperationsController>();`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,7 @@ public async Task Transforms_on_create_resource_with_side_effects()`
`42`	`42`
`43`	`43`	`List<RecordCompany> newCompanies = _fakers.RecordCompany.Generate(2);`
`44`	`44`
`45`		`- await _testContext.RunOnDatabaseAsync(dbContext =>`
`46`		`- {`
`47`		`- return dbContext.ClearTableAsync<RecordCompany>();`
`48`		`- });`
	`45`	`+ await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<RecordCompany>());`
`49`	`46`
`50`	`47`	`var requestBody = new`
`51`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,7 @@ public BlobTests(IntegrationTestContext<TestableStartup<BlobDbContext>, BlobDbCo`
`19`	`19`
`20`	`20`	`testContext.UseController<ImageContainersController>();`
`21`	`21`
`22`		`- testContext.ConfigureServices(services =>`
`23`		`- {`
`24`		`- services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));`
`25`		`- });`
	`22`	`+ testContext.ConfigureServices(services => services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));`
`26`	`23`	`}`
`27`	`24`
`28`	`25`	`[Fact]`