Fixed Service Tests

ChilliCream · Oct 16, 2024 · d7f67ed · d7f67ed
1 parent 81a40ed
commit d7f67ed
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 48 deletions.
diff --git a/src/HotChocolate/Core/src/Execution/Processing/MiddlewareContext.Global.cs b/src/HotChocolate/Core/src/Execution/Processing/MiddlewareContext.Global.cs
@@ -171,7 +171,7 @@ public T Resolver<T>()
     public T Service<T>() where T : notnull => Services.GetRequiredService<T>();
 
 #if NET8_0_OR_GREATER
-    public T Service<T>(object key) where T : notnull => parentContext.Service<T>(key);
+    public T Service<T>(object key) where T : notnull => Services.GetRequiredKeyedService<T>(key);
 #endif
 
     public object Service(Type service)

diff --git a/src/HotChocolate/Core/src/Types/Resolvers/Expressions/Parameters/ServiceExpressionHelper.cs b/src/HotChocolate/Core/src/Types/Resolvers/Expressions/Parameters/ServiceExpressionHelper.cs
@@ -11,7 +11,9 @@ namespace HotChocolate.Resolvers.Expressions.Parameters;
 internal static class ServiceExpressionHelper
 {
     private const string _serviceResolver = nameof(GetService);
+#if NET8_0_OR_GREATER
     private const string _keyedServiceResolver = nameof(GetKeyedService);
+#endif
     private static readonly Expression _true = Expression.Constant(true);
     private static readonly Expression _false = Expression.Constant(false);
 
@@ -46,12 +48,18 @@ public static Expression Build(
 
     private static Expression BuildDefaultService(ParameterInfo parameter, Expression context)
     {
+#if NET7_0_OR_GREATER
         var parameterType = parameter.ParameterType;
         var argumentMethod = _getServiceMethod.MakeGenericMethod(parameterType);
         var nullabilityContext = new NullabilityInfoContext();
         var nullabilityInfo = nullabilityContext.Create(parameter);
         var isRequired = nullabilityInfo.ReadState == NullabilityState.NotNull;
         return Expression.Call(argumentMethod, context, isRequired ? _true : _false);
+#else
+        var parameterType = parameter.ParameterType;
+        var argumentMethod = _getServiceMethod.MakeGenericMethod(parameterType);
+        return Expression.Call(argumentMethod, context, _true);
+#endif
     }
 
 #if NET8_0_OR_GREATER
@@ -65,6 +73,7 @@ private static Expression BuildDefaultService(ParameterInfo parameter, Expressio
         var isRequired = nullabilityInfo.ReadState == NullabilityState.NotNull;
         return Expression.Call(argumentMethod, context, keyExpression, isRequired ? _true : _false);
     }
+#endif
 
     public static TService? GetService<TService>(
         IResolverContext context,
@@ -76,6 +85,7 @@ private static Expression BuildDefaultService(ParameterInfo parameter, Expressio
             : context.Services.GetService<TService>();
     }
 
+#if NET8_0_OR_GREATER
     public static TService? GetKeyedService<TService>(
         IResolverContext context,
         object? key,

diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Tests/DataLoaderTests.cs b/src/HotChocolate/Core/test/Types.Analyzers.Tests/DataLoaderTests.cs
@@ -450,6 +450,7 @@ public static Task<IDictionary<int, string>> GetEntityByIdAsync(
             """).MatchMarkdownAsync();
     }
 
+#if NET8_0_OR_GREATER
     [Fact]
     public async Task GenerateSource_BatchDataLoader_With_SelectorBuilder_MatchesSnapshot()
     {
@@ -499,4 +500,5 @@ public static Task<IDictionary<int, string>> GetEntityByIdAsync(
             }
             """).MatchMarkdownAsync();
     }
+#endif
 }
diff --git a/...erTests.GenerateSource_BatchDataLoader_With_PredicateBuilder_MatchesSnapshot.md b/...erTests.GenerateSource_BatchDataLoader_With_PredicateBuilder_MatchesSnapshot.md
@@ -100,26 +100,3 @@ namespace Microsoft.Extensions.DependencyInjection
 
 ```
 
-## Compilation Diagnostics
-
-```json
-[
-  {
-    "Id": "GD0002",
-    "Title": "Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.",
-    "Severity": "Error",
-    "WarningLevel": 0,
-    "Location": ": (13,8)-(13,47)",
-    "HelpLinkUri": "https://msdn.microsoft.com/query/roslyn.query?appId=roslyn&k=k(CS9204)",
-    "MessageFormat": "'{0}' is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.",
-    "Message": "'GreenDonut.Predicates.IPredicateBuilder' is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.",
-    "Category": "Compiler",
-    "CustomTags": [
-      "Compiler",
-      "Telemetry",
-      "CustomObsolete"
-    ]
-  }
-]
-```
-
diff --git a/...derTests.GenerateSource_BatchDataLoader_With_SelectorBuilder_MatchesSnapshot.md b/...derTests.GenerateSource_BatchDataLoader_With_SelectorBuilder_MatchesSnapshot.md
@@ -100,26 +100,3 @@ namespace Microsoft.Extensions.DependencyInjection
 
 ```
 
-## Compilation Diagnostics
-
-```json
-[
-  {
-    "Id": "GD0001",
-    "Title": "Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.",
-    "Severity": "Error",
-    "WarningLevel": 0,
-    "Location": ": (13,8)-(13,45)",
-    "HelpLinkUri": "https://msdn.microsoft.com/query/roslyn.query?appId=roslyn&k=k(CS9204)",
-    "MessageFormat": "'{0}' is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.",
-    "Message": "'GreenDonut.Selectors.ISelectorBuilder' is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.",
-    "Category": "Compiler",
-    "CustomTags": [
-      "Compiler",
-      "Telemetry",
-      "CustomObsolete"
-    ]
-  }
-]
-```
-
diff --git a/src/HotChocolate/Core/test/Types.Tests/Resolvers/ResolverServiceTests.cs b/src/HotChocolate/Core/test/Types.Tests/Resolvers/ResolverServiceTests.cs
@@ -317,7 +317,6 @@ public async Task Resolver_KeyedService()
 
         result.MatchMarkdownSnapshot();
     }
-#endif
 
     [Fact]
     public async Task Resolver_Optional_KeyedService_Does_Not_Exist()
@@ -350,6 +349,7 @@ public async Task Resolver_Optional_KeyedService_Exists()
 
         result.MatchMarkdownSnapshot();
     }
+#endif
 
     public sealed class SayHelloService
     {