Skip to content

Migrated breaking changes for use with Hotchocolate 14 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergeyshaykhullin merged 6 commits into from
Nov 26, 2024
Merged

Migrated breaking changes for use with Hotchocolate 14 #114

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
05a6f94
Migrated breaking changes for use with Hotchocolate 14-rc
d-lundy Oct 1, 2024
5e27e70
Renamed QueryResultExtensions to OperationResultExtensions
d-lundy Oct 1, 2024
292aff6
Fixed spelling mistakes
d-lundy Oct 1, 2024
393e9ee
Updated HotChocolate.Execute to 14.0.0-rc.3.2
d-lundy Oct 12, 2024
6d220cd
Updated HotChocolate.Execution to 14
d-lundy Oct 16, 2024
b80dd32
Updated HotChocolate.Execution nuget package to 14.1.0
d-lundy Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/AppAny.HotChocolate.FluentValidation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0" />
</ItemGroup>

<ItemGroup Label="Assets">
Expand Down
2 changes: 1 addition & 1 deletion tests/AppAny.HotChocolate.FluentValidation.Tests/ErrorCodes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions tests/AppAny.HotChocolate.FluentValidation.Tests/ErrorMappingContextProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions ...Tests/Extensions/QueryResultExtensions.cs → ...s/Extensions/OperationResultExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!);

Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tests/AppAny.HotChocolate.FluentValidation.Tests/InputValidatorContextProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
10 changes: 5 additions & 5 deletions tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleInputs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down Expand Up @@ -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();
Expand All @@ -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();
}
}
}
2 changes: 1 addition & 1 deletion tests/AppAny.HotChocolate.FluentValidation.Tests/MultipleMutations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!,
Expand Down
12 changes: 6 additions & 6 deletions tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideAddFluentValidation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
}
}
}
26 changes: 13 additions & 13 deletions tests/AppAny.HotChocolate.FluentValidation.Tests/OverrideErrorMappers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 =>
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 =>
Expand Down Expand Up @@ -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();
Expand Down
Loading