Skip to content

Commit 81f34f6

Browse files
d-lundyd-lundy
authored
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
1 parent 0208b5f commit 81f34f6

17 files changed

Lines changed: 177 additions & 177 deletions

‎src/AppAny.HotChocolate.FluentValidation.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<!-- </ItemGroup>-->
3434

3535
<ItemGroup Label="Packages">
36-
<PackageReference Include="FluentValidation" Version="11.9.0" />
37-
<PackageReference Include="HotChocolate.Execution" Version="13.8.1" />
36+
<PackageReference Include="FluentValidation" Version="11.10.0" />
37+
<PackageReference Include="HotChocolate.Execution" Version="14.1.0" />
3838
</ItemGroup>
3939

4040
<ItemGroup Label="Assets">

‎tests/AppAny.HotChocolate.FluentValidation.Tests/ErrorCodes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public async Task CustomErrorCode()
2525
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameWithErrorCodeValidator>();
2626
});
2727

28-
var result = Assert.IsType<QueryResult>(
28+
var result = Assert.IsType<OperationResult>(
2929
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
3030

3131
result.AssertNullResult();

‎tests/AppAny.HotChocolate.FluentValidation.Tests/ErrorMappingContextProperties.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public async Task AddFluentValidation()
3434
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
3535
});
3636

37-
var result = Assert.IsType<QueryResult>(
37+
var result = Assert.IsType<OperationResult>(
3838
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
3939

4040
result.AssertNullResult();
@@ -69,7 +69,7 @@ public async Task UseFluentValidation()
6969
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
7070
});
7171

72-
var result = Assert.IsType<QueryResult>(
72+
var result = Assert.IsType<OperationResult>(
7373
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
7474

7575
result.AssertNullResult();

tests/AppAny.HotChocolate.FluentValidation.Tests/Extensions/QueryResultExtensions.cs renamed to tests/AppAny.HotChocolate.FluentValidation.Tests/Extensions/OperationResultExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
namespace AppAny.HotChocolate.FluentValidation.Tests
88
{
9-
public static class QueryResultExtensions
9+
public static class OperationResultExtensions
1010
{
11-
public static void AssertNullResult(this QueryResult result)
11+
public static void AssertNullResult(this OperationResult result)
1212
{
1313
var (key, value) = Assert.Single(result.Data!);
1414

1515
Assert.Equal("test", key);
1616
Assert.Null(value);
1717
}
1818

19-
public static void AssertSuceessResult(this QueryResult result)
19+
public static void AssertSuccessResult(this OperationResult result)
2020
{
2121
var (key, value) = Assert.Single(result.Data!);
2222

@@ -27,7 +27,7 @@ public static void AssertSuceessResult(this QueryResult result)
2727
}
2828

2929
public static void AssertDefaultErrorMapper(
30-
this QueryResult result,
30+
this OperationResult result,
3131
string code,
3232
string message,
3333
params Action<KeyValuePair<string, object?>>[] elementInspectors)

‎tests/AppAny.HotChocolate.FluentValidation.Tests/InputValidatorContextProperties.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public async Task AddFluentValidation()
3434
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
3535
});
3636

37-
var result = Assert.IsType<QueryResult>(
37+
var result = Assert.IsType<OperationResult>(
3838
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
3939

4040
result.AssertNullResult();
@@ -69,7 +69,7 @@ public async Task UseFluentValidation()
6969
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
7070
});
7171

72-
var result = Assert.IsType<QueryResult>(
72+
var result = Assert.IsType<OperationResult>(
7373
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
7474

7575
result.AssertNullResult();

‎tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleInputs.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task SingleInput()
2626
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
2727
});
2828

29-
var result = Assert.IsType<QueryResult>(
29+
var result = Assert.IsType<OperationResult>(
3030
await executor.ExecuteAsync(TestSetup.Mutations.WithMultipleInputsEmptyName));
3131

3232
result.AssertNullResult();
@@ -53,7 +53,7 @@ public async Task DoubleInput()
5353
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
5454
});
5555

56-
var result = Assert.IsType<QueryResult>(
56+
var result = Assert.IsType<OperationResult>(
5757
await executor.ExecuteAsync(TestSetup.Mutations.WithMultipleInputsEmptyName));
5858

5959
result.AssertNullResult();
@@ -102,7 +102,7 @@ public async Task SecondInput()
102102
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
103103
});
104104

105-
var result = Assert.IsType<QueryResult>(
105+
var result = Assert.IsType<OperationResult>(
106106
await executor.ExecuteAsync(TestSetup.Mutations.WithMultipleInputsEmptyName));
107107

108108
result.AssertNullResult();
@@ -129,10 +129,10 @@ public async Task NoInputs()
129129
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
130130
});
131131

132-
var result = Assert.IsType<QueryResult>(
132+
var result = Assert.IsType<OperationResult>(
133133
await executor.ExecuteAsync(TestSetup.Mutations.WithMultipleInputsEmptyName));
134134

135-
result.AssertSuceessResult();
135+
result.AssertSuccessResult();
136136
}
137137
}
138138
}

‎tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleMutations.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task Multiple()
2626
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
2727
});
2828

29-
var result = Assert.IsType<QueryResult>(
29+
var result = Assert.IsType<OperationResult>(
3030
await executor.ExecuteAsync(TestSetup.Mutations.MultipleMutationsWithEmptyName));
3131

3232
Assert.Collection(result.Data!,

‎tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideAddFluentValidation.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public async Task NullResult_WithCodeExtension()
2727
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
2828
});
2929

30-
var result = Assert.IsType<QueryResult>(
30+
var result = Assert.IsType<OperationResult>(
3131
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
3232

3333
result.AssertNullResult();
@@ -57,7 +57,7 @@ public async Task NullResult_ValidatorOverride()
5757
services.AddTransient<NotEmptyNameValidator>();
5858
});
5959

60-
var result = Assert.IsType<QueryResult>(
60+
var result = Assert.IsType<OperationResult>(
6161
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
6262

6363
result.AssertNullResult();
@@ -87,7 +87,7 @@ public async Task ThrowsNoMessageSet()
8787
services.AddTransient<NotEmptyNameValidator>();
8888
});
8989

90-
var result = Assert.IsType<QueryResult>(
90+
var result = Assert.IsType<OperationResult>(
9191
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
9292

9393
result.AssertNullResult();
@@ -108,7 +108,7 @@ public async Task ThrowsNullInputValidator()
108108
}));
109109
});
110110

111-
var result = Assert.IsType<QueryResult>(
111+
var result = Assert.IsType<OperationResult>(
112112
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
113113

114114
result.AssertNullResult();
@@ -132,10 +132,10 @@ public async Task CustomInputValidatorHasNoValidators()
132132
}));
133133
});
134134

135-
var result = Assert.IsType<QueryResult>(
135+
var result = Assert.IsType<OperationResult>(
136136
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
137137

138-
result.AssertSuceessResult();
138+
result.AssertSuccessResult();
139139
}
140140
}
141141
}

‎tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideErrorMappers.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public async Task AddFluentValidation()
3434
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
3535
});
3636

37-
var result = Assert.IsType<QueryResult>(
37+
var result = Assert.IsType<OperationResult>(
3838
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
3939

4040
result.AssertNullResult();
@@ -74,7 +74,7 @@ public async Task UseFluentValidation()
7474
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
7575
});
7676

77-
var result = Assert.IsType<QueryResult>(
77+
var result = Assert.IsType<OperationResult>(
7878
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
7979

8080
result.AssertNullResult();
@@ -108,7 +108,7 @@ public async Task UseDefaultErrorMapperWithDetails()
108108
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
109109
});
110110

111-
var result = Assert.IsType<QueryResult>(
111+
var result = Assert.IsType<OperationResult>(
112112
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
113113

114114
result.AssertNullResult();
@@ -172,7 +172,7 @@ public async Task UseDefaultErrorMapperWithDetailsWithOperationName()
172172
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
173173
});
174174

175-
var result = Assert.IsType<QueryResult>(
175+
var result = Assert.IsType<OperationResult>(
176176
await executor.ExecuteAsync(TestSetup.Mutations.WithOperationNameEmptyName));
177177

178178
result.AssertNullResult();
@@ -236,7 +236,7 @@ public async Task UseDefaultErrorMapperWithExtendedDetails()
236236
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
237237
});
238238

239-
var result = Assert.IsType<QueryResult>(
239+
var result = Assert.IsType<OperationResult>(
240240
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
241241

242242
result.AssertNullResult();
@@ -288,13 +288,13 @@ public async Task UseDefaultErrorMapperWithExtendedDetails()
288288
Assert.Equal(ValidationDefaults.ExtensionKeys.CustomStateKey, customState.Key);
289289
Assert.Null(customState.Value);
290290
},
291-
formattedMessagePlaceholerValues =>
291+
formattedMessagePlaceholderValues =>
292292
{
293293
Assert.Equal(
294294
ValidationDefaults.ExtensionKeys.FormattedMessagePlaceholderValuesKey,
295-
formattedMessagePlaceholerValues.Key);
295+
formattedMessagePlaceholderValues.Key);
296296

297-
var values = Assert.IsType<Dictionary<string, object>>(formattedMessagePlaceholerValues.Value);
297+
var values = Assert.IsType<Dictionary<string, object>>(formattedMessagePlaceholderValues.Value);
298298

299299
Assert.Collection(values,
300300
propertyName =>
@@ -338,7 +338,7 @@ public async Task UseDefaultErrorMapperWithCustomExtendedDetails()
338338
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
339339
});
340340

341-
var result = Assert.IsType<QueryResult>(
341+
var result = Assert.IsType<OperationResult>(
342342
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
343343

344344
result.AssertNullResult();
@@ -390,13 +390,13 @@ public async Task UseDefaultErrorMapperWithCustomExtendedDetails()
390390
Assert.Equal(ValidationDefaults.ExtensionKeys.CustomStateKey, customState.Key);
391391
Assert.Null(customState.Value);
392392
},
393-
formattedMessagePlaceholerValues =>
393+
formattedMessagePlaceholderValues =>
394394
{
395395
Assert.Equal(
396396
ValidationDefaults.ExtensionKeys.FormattedMessagePlaceholderValuesKey,
397-
formattedMessagePlaceholerValues.Key);
397+
formattedMessagePlaceholderValues.Key);
398398

399-
var values = Assert.IsType<Dictionary<string, object>>(formattedMessagePlaceholerValues.Value);
399+
var values = Assert.IsType<Dictionary<string, object>>(formattedMessagePlaceholderValues.Value);
400400

401401
Assert.Collection(values,
402402
propertyName =>
@@ -443,7 +443,7 @@ public async Task MultipleErrorMappers()
443443
services.AddTransient<IValidator<TestPersonInput>, NotEmptyNameValidator>();
444444
});
445445

446-
var result = Assert.IsType<QueryResult>(
446+
var result = Assert.IsType<OperationResult>(
447447
await executor.ExecuteAsync(TestSetup.Mutations.WithEmptyName));
448448

449449
result.AssertNullResult();

0 commit comments

Comments
 (0)