Skip to content
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

Jump to bottom

adds TestValidateAsync extensions to utilize ValidationContext<T> arg #2052

Merged
merged 1 commit into from
Jan 19, 2023
Merged

adds TestValidateAsync extensions to utilize ValidationContext<T> arg #2052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/FluentValidation/TestHelper/ValidatorTestExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,16 @@ public static class ValidationTestExtension {
/// </summary>
public static TestValidationResult<T> TestValidate<T>(this IValidator<T> validator, T objectToTest, Action<ValidationStrategy<T>> options = null) {
options ??= _ => { };
return TestValidate(validator, ValidationContext<T>.CreateWithOptions(objectToTest, options));
}

/// <summary>
/// Performs validation, returning a TestValidationResult which allows assertions to be performed.
/// </summary>
public static TestValidationResult<T> TestValidate<T>(this IValidator<T> validator, ValidationContext<T> context) {
ValidationResult validationResult;
try {
validationResult = validator.Validate(objectToTest, options);
validationResult = validator.Validate(context);
}
catch (AsyncValidatorInvokedSynchronouslyException ex) {
throw new AsyncValidatorInvokedSynchronouslyException(ex.ValidatorType.Name + " contains asynchronous rules - please use the asynchronous test methods instead.");
Expand All @@ -99,14 +106,21 @@ public static class ValidationTestExtension {
/// <summary>
/// Performs async validation, returning a TestValidationResult which allows assertions to be performed.
/// </summary>
public static async Task<TestValidationResult<T>> TestValidateAsync<T>(this IValidator<T> validator, T objectToTest, Action<ValidationStrategy<T>> options = null, CancellationToken cancellationToken = default) {
public static Task<TestValidationResult<T>> TestValidateAsync<T>(this IValidator<T> validator, T objectToTest, Action<ValidationStrategy<T>> options = null, CancellationToken cancellationToken = default) {
options ??= _ => { };
var validationResult = await validator.ValidateAsync(objectToTest, options, cancellationToken);
return TestValidateAsync(validator, ValidationContext<T>.CreateWithOptions(objectToTest, options), cancellationToken);
}

/// <summary>
/// Performs async validation, returning a TestValidationResult which allows assertions to be performed.
/// </summary>
public static async Task<TestValidationResult<T>> TestValidateAsync<T>(this IValidator<T> validator, ValidationContext<T> context, CancellationToken cancellationToken = default) {
var validationResult = await validator.ValidateAsync(context, cancellationToken);
return new TestValidationResult<T>(validationResult);
}

// TODO: 12.0: Move this to an instance method on TestValidationResult
public static ITestValidationContinuation ShouldHaveAnyValidationError<T>(this TestValidationResult<T> testValidationResult) {
public static ITestValidationContinuation ShouldHaveAnyValidationError<T>(this TestValidationResult<T> testValidationResult) {
if (!testValidationResult.Errors.Any())
throw new ValidationTestException($"Expected at least one validation error, but none were found.");

Expand Down