Fix remaining tests

Author: tobias-tengler

src/HotChocolate/Core/src/Types/SchemaBuilder.cs

@@ -224,7 +224,6 @@ public ISchemaBuilder SetTypeResolver(IsOfTypeFallback isOfType)
     }
 
     /// <inheritdoc />
-    // TODO: Should this be just SetServices?
     public ISchemaBuilder AddServices(IServiceProvider services)
     {
         ArgumentNullException.ThrowIfNull(services);

src/HotChocolate/Core/test/Execution.Tests/Integration/DataLoader/__snapshots__/UseDataLoaderTests.UseDataLoader_Should_ThrowException_When_NotADataLoader.snap

@@ -9,5 +9,5 @@ For more details look at the `Errors` property.
    at HotChocolate.Execution.Integration.DataLoader.UseDataLoaderTests.<>c.<UseDataLoader_Should_ThrowException_When_NotADataLoader>b__0_1(IObjectTypeDescriptor`1 x) in UseDataLoaderTests.cs:line 16
    at HotChocolate.Types.ObjectType`1.CreateConfiguration(ITypeDiscoveryContext context) in ObjectType~1.cs:line 47
    at HotChocolate.Types.TypeSystemObject`1.Initialize(ITypeDiscoveryContext context) in TypeSystemObjectBase~1.cs:line 29
-   at HotChocolate.Configuration.TypeRegistrar.InitializeType(TypeSystemObject typeSystemObject, String scope, Boolean isInferred) in TypeRegistrar.cs:line 177
+   at HotChocolate.Configuration.TypeRegistrar.InitializeType(TypeSystemObject typeSystemObject, String scope, Boolean isInferred) in TypeRegistrar.cs:line 171
 

src/HotChocolate/Data/src/Data/Filters/Visitor/FilterFieldHandlerConfiguration.cs

@@ -15,6 +15,8 @@ public FilterFieldHandlerConfiguration(Func<FilterProviderContext, IFilterFieldH
         _factory = factory;
     }
 
+    public IFilterFieldHandler? Instance => _instance;
+
     public IFilterFieldHandler<TContext> Create<TContext>(FilterProviderContext context)
         where TContext : IFilterVisitorContext
     {

src/HotChocolate/Data/src/Data/Sorting/Visitor/SortFieldHandlerConfiguration.cs

@@ -15,6 +15,8 @@ public SortFieldHandlerConfiguration(Func<SortProviderContext, ISortFieldHandler
         _factory = factory;
     }
 
+    public ISortFieldHandler? Instance => _instance;
+
     public ISortFieldHandler<TContext> Create<TContext>(SortProviderContext context)
         where TContext : ISortVisitorContext
     {

src/HotChocolate/Data/src/Data/Sorting/Visitor/SortOperationHandlerConfiguration.cs

@@ -15,6 +15,8 @@ public SortOperationHandlerConfiguration(Func<SortProviderContext, ISortOperatio
         _factory = factory;
     }
 
+    public ISortOperationHandler? Instance => _instance;
+
     public ISortOperationHandler<TContext> Create<TContext>(SortProviderContext context)
         where TContext : ISortVisitorContext
     {

src/HotChocolate/Data/test/Data.Filters.Tests/FilterProviderExtensionsTests.cs

@@ -34,10 +34,10 @@ public void Merge_Should_Merge_HandlersAndPrependExtensionHandlers()
 
         // assert
         Assert.NotNull(convention.DefinitionAccessor);
-        // Assert.Collection(
-        //     convention.DefinitionAccessor!.HandlerFactories,
-        //     x => Assert.Equal(extensionFieldHandler, x.HandlerInstance),
-        //     x => Assert.Equal(firstFieldHandler, x.HandlerInstance));
+        Assert.Collection(
+            convention.DefinitionAccessor!.FieldHandlerConfigurations,
+            x => Assert.Equal(extensionFieldHandler, x.Instance),
+            x => Assert.Equal(firstFieldHandler, x.Instance));
     }
 
     private sealed class MockProviderExtensions

src/HotChocolate/Data/test/Data.Sorting.Tests/SortProviderExtensionsTests.cs

@@ -29,10 +29,10 @@ public void Merge_Should_Merge_OperationHandlersAndPrependExtensionHandlers()
 
         // assert
         Assert.NotNull(convention.DefinitionAccessor);
-        // Assert.Collection(
-        //     convention.DefinitionAccessor!.OperationHandlerFactories,
-        //     x => Assert.Equal(extensionFieldHandler, x.HandlerInstance),
-        //     x => Assert.Equal(firstFieldHandler, x.HandlerInstance));
+        Assert.Collection(
+            convention.DefinitionAccessor!.OperationHandlerConfigurations,
+            x => Assert.Equal(extensionFieldHandler, x.Instance),
+            x => Assert.Equal(firstFieldHandler, x.Instance));
     }
 
     [Fact]
@@ -57,10 +57,10 @@ public void Merge_Should_Merge_HandlersAndPrependExtensionHandlers()
 
         // assert
         Assert.NotNull(convention.DefinitionAccessor);
-        // Assert.Collection(
-        //     convention.DefinitionAccessor!.HandlerFactories,
-        //     x => Assert.Equal(extensionFieldHandler, x.HandlerInstance),
-        //     x => Assert.Equal(firstFieldHandler, x.HandlerInstance));
+        Assert.Collection(
+            convention.DefinitionAccessor!.FieldHandlerConfigurations,
+            x => Assert.Equal(extensionFieldHandler, x.Instance),
+            x => Assert.Equal(firstFieldHandler, x.Instance));
     }
 
     private sealed class MockFieldHandler : QueryableDefaultSortFieldHandler;

src/HotChocolate/PersistedOperations/test/PersistedOperations.Redis.Tests/IntegrationTests.cs

@@ -154,6 +154,7 @@ public async Task ExecutePersistedOperation_ApplicationDI()
                 // we register the multiplexer on the application services
                 .AddSingleton(_multiplexer)
                 .AddGraphQL()
+                .AddApplicationService<IConnectionMultiplexer>()
                 .AddQueryType(c => c.Name("Query").Field("a").Resolve("b"))
                 // and in the redis storage setup refer to that instance.
                 .AddRedisOperationDocumentStorage(sp => sp.GetRequiredService<IConnectionMultiplexer>())