Migrated breaking changes for use with Hotchocolate 14 (#114)

* Migrated breaking changes for use with Hotchocolate 14-rc QueryResult is now OperationResult * Renamed QueryResultExtensions to OperationResultExtensions Renamed QueryResultExtensions to OperationResultExtensions * Fixed spelling mistakes Fixed simple spelling mistakes: AssertSuceessResult is now AssertSuccessResult formattedMessagePlaceholerValues is now formattedMessagePlaceholderValues FieldSkipValidationPredecate is now FieldSkipValidationPredicate * Updated HotChocolate.Execute to 14.0.0-rc.3.2 * Updated HotChocolate.Execution to 14 * Updated HotChocolate.Execution nuget package to 14.1.0
appany · Nov 26, 2024 · 81f34f6 · 81f34f6
1 parent 0208b5f
commit 81f34f6
Show file tree

Hide file tree

Showing 17 changed files with 177 additions and 177 deletions.
diff --git a/src/AppAny.HotChocolate.FluentValidation.csproj b/src/AppAny.HotChocolate.FluentValidation.csproj
@@ -33,8 +33,8 @@
 <!--  </ItemGroup>-->
 
   <ItemGroup Label="Packages">
-    <PackageReference Include="FluentValidation" Version="11.9.0" />
-    <PackageReference Include="HotChocolate.Execution" Version="13.8.1" />
+    <PackageReference Include="FluentValidation" Version="11.10.0" />
+    <PackageReference Include="HotChocolate.Execution" Version="14.1.0" />
   </ItemGroup>
 
   <ItemGroup Label="Assets">

diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/ErrorCodes.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/ErrorCodes.cs
@@ -25,7 +25,7 @@ public async Task CustomErrorCode()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameWithErrorCodeValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();

diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/ErrorMappingContextProperties.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/ErrorMappingContextProperties.cs
@@ -34,7 +34,7 @@ public async Task AddFluentValidation()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -69,7 +69,7 @@ public async Task UseFluentValidation()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();

diff --git a/...Tests/Extensions/QueryResultExtensions.cs → ...s/Extensions/OperationResultExtensions.cs b/...Tests/Extensions/QueryResultExtensions.cs → ...s/Extensions/OperationResultExtensions.cs
@@ -6,17 +6,17 @@
 
 namespace AppAny.HotChocolate.FluentValidation.Tests
 {
-  public static class QueryResultExtensions
+  public static class OperationResultExtensions
   {
-    public static void AssertNullResult(this QueryResult result)
+    public static void AssertNullResult(this OperationResult result)
     {
       var (key, value) = Assert.Single(result.Data!);
 
       Assert.Equal("test", key);
       Assert.Null(value);
     }
 
-    public static void AssertSuceessResult(this QueryResult result)
+    public static void AssertSuccessResult(this OperationResult result)
     {
       var (key, value) = Assert.Single(result.Data!);
 
@@ -27,7 +27,7 @@ public static void AssertSuceessResult(this QueryResult result)
     }
 
     public static void AssertDefaultErrorMapper(
-      this QueryResult result,
+      this OperationResult result,
       string code,
       string message,
       params Action<KeyValuePair<string, object?>>[] elementInspectors)

diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/InputValidatorContextProperties.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/InputValidatorContextProperties.cs
@@ -34,7 +34,7 @@ public async Task AddFluentValidation()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -69,7 +69,7 @@ public async Task UseFluentValidation()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();

diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleInputs.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleInputs.cs
@@ -26,7 +26,7 @@ public async Task SingleInput()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithMultipleInputsEmptyName));
 
       result.AssertNullResult();
@@ -53,7 +53,7 @@ public async Task DoubleInput()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithMultipleInputsEmptyName));
 
       result.AssertNullResult();
@@ -102,7 +102,7 @@ public async Task SecondInput()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithMultipleInputsEmptyName));
 
       result.AssertNullResult();
@@ -129,10 +129,10 @@ public async Task NoInputs()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithMultipleInputsEmptyName));
 
-      result.AssertSuceessResult();
+      result.AssertSuccessResult();
     }
   }
 }
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleMutations.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleMutations.cs
@@ -26,7 +26,7 @@ public async Task Multiple()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.MultipleMutationsWithEmptyName));
 
       Assert.Collection(result.Data!,

diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideAddFluentValidation.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideAddFluentValidation.cs
@@ -27,7 +27,7 @@ public async Task NullResult_WithCodeExtension()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -57,7 +57,7 @@ public async Task NullResult_ValidatorOverride()
           services.AddTransient<NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -87,7 +87,7 @@ public async Task ThrowsNoMessageSet()
           services.AddTransient<NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -108,7 +108,7 @@ public async Task ThrowsNullInputValidator()
           }));
       });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -132,10 +132,10 @@ public async Task CustomInputValidatorHasNoValidators()
           }));
       });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
-      result.AssertSuceessResult();
+      result.AssertSuccessResult();
     }
   }
 }
diff --git a/tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideErrorMappers.cs b/tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideErrorMappers.cs
@@ -34,7 +34,7 @@ public async Task AddFluentValidation()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -74,7 +74,7 @@ public async Task UseFluentValidation()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -108,7 +108,7 @@ public async Task UseDefaultErrorMapperWithDetails()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -172,7 +172,7 @@ public async Task UseDefaultErrorMapperWithDetailsWithOperationName()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithOperationNameEmptyName));
 
       result.AssertNullResult();
@@ -236,7 +236,7 @@ public async Task UseDefaultErrorMapperWithExtendedDetails()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -288,13 +288,13 @@ public async Task UseDefaultErrorMapperWithExtendedDetails()
               Assert.Equal(ValidationDefaults.ExtensionKeys.CustomStateKey, customState.Key);
               Assert.Null(customState.Value);
             },
-            formattedMessagePlaceholerValues =>
+            formattedMessagePlaceholderValues =>
             {
               Assert.Equal(
                 ValidationDefaults.ExtensionKeys.FormattedMessagePlaceholderValuesKey,
-                formattedMessagePlaceholerValues.Key);
+                formattedMessagePlaceholderValues.Key);
 
-              var values = Assert.IsType<Dictionary<string, object>>(formattedMessagePlaceholerValues.Value);
+              var values = Assert.IsType<Dictionary<string, object>>(formattedMessagePlaceholderValues.Value);
 
               Assert.Collection(values,
                 propertyName =>
@@ -338,7 +338,7 @@ public async Task UseDefaultErrorMapperWithCustomExtendedDetails()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();
@@ -390,13 +390,13 @@ public async Task UseDefaultErrorMapperWithCustomExtendedDetails()
               Assert.Equal(ValidationDefaults.ExtensionKeys.CustomStateKey, customState.Key);
               Assert.Null(customState.Value);
             },
-            formattedMessagePlaceholerValues =>
+            formattedMessagePlaceholderValues =>
             {
               Assert.Equal(
                 ValidationDefaults.ExtensionKeys.FormattedMessagePlaceholderValuesKey,
-                formattedMessagePlaceholerValues.Key);
+                formattedMessagePlaceholderValues.Key);
 
-              var values = Assert.IsType<Dictionary<string, object>>(formattedMessagePlaceholerValues.Value);
+              var values = Assert.IsType<Dictionary<string, object>>(formattedMessagePlaceholderValues.Value);
 
               Assert.Collection(values,
                 propertyName =>
@@ -443,7 +443,7 @@ public async Task MultipleErrorMappers()
           services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
         });
 
-      var result = Assert.IsType<QueryResult>(
+      var result = Assert.IsType<OperationResult>(
         await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
 
       result.AssertNullResult();