Skip to content

fix validation logic to allow for complex validations and property va… #19

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
SirCotare merged 1 commit into from
Apr 4, 2025
Merged

fix validation logic to allow for complex validations and property va… #19

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 55 additions & 20 deletions src/main/java/it/aboutbits/springboot/testing/validation/core/RuleValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package it.aboutbits.springboot.testing.validation.core;

import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Valid;
import jakarta.validation.Validation;
import jakarta.validation.Validator;
import jakarta.validation.ValidatorFactory;
import jakarta.validation.groups.Default;
import lombok.NonNull;
import lombok.SneakyThrows;
import org.springframework.lang.Nullable;
Expand Down Expand Up @@ -83,6 +83,12 @@ void assertValidation(AssertionParameter<P> assertionParameter) {

var propertiesWithRules = getPropertyNamesThatHaveRules(rules);

assertThatSuppliedParameterIsValid(
parameterUnderTest,
functionToCallWithParameter,
validator
);

assertThatValidationIsCompliantForEachProperty(
rules,
parameterUnderTest,
Expand All @@ -108,6 +114,52 @@ private static HashSet<String> getPropertyNamesThatHaveRules(List<Rule> rules) {
return propertiesWithRules;
}

private static <P> void assertThatSuppliedParameterIsValid(
P parameterUnderTest,
Consumer<P> functionToCallWithParameter,
Validator validator
) {
if (functionToCallWithParameter != null) {
try {
functionToCallWithParameter.accept(parameterUnderTest);
} catch (ConstraintViolationException e) {
var violatingFieldMessages = getViolatingFieldMessages(e.getConstraintViolations());

assertThat(true)
.withFailMessage(
"The supplied parameter violates the validation rules. The supplied parameter is not valid: %s",
violatingFieldMessages.collect(Collectors.joining(" | "))
)
.isFalse();
} catch (Exception ignored) {
// ignore any other exceptions
}
} else {
// Use Bean Validation to validate
var violations = new HashSet<ConstraintViolation<?>>(validator.validate(parameterUnderTest));

var violatingFieldMessages = getViolatingFieldMessages(violations);

assertThat(violations)
.withFailMessage(
"The supplied parameter possibly contains invalid values: %s",
violatingFieldMessages.collect(Collectors.joining(" | "))
)
.isEmpty();
}
}

private static Stream<String> getViolatingFieldMessages(Set<ConstraintViolation<?>> violations) {
return violations
.stream()
.map(violation ->
"%s => %s".formatted(
violation.getPropertyPath().toString(),
violation.getMessage()
)
);
}

private static <P> void assertThatValidationIsCompliantForEachProperty(
List<Rule> rules,
P parameterUnderTest,
Expand All @@ -128,32 +180,15 @@ private static <P> void assertThatValidationIsCompliantForEachProperty(
} else {

// Use Bean Validation to validate the copy
var violations = validator.validate(copy, Default.class);

// Check if there are any violations
var violatingFieldMessages = violations
.stream()
.map(violation ->
"%s => %s".formatted(
violation.getPropertyPath().toString(),
violation.getMessage()
)
);
var violations = validator.validate(copy);

var violatingProperties = violations.stream().map(
f -> f.getPropertyPath().toString()
).collect(Collectors.toSet());

assertThat(violatingProperties)
.withFailMessage(
"More than one property failed to validate during mutation. The supplied parameter possibly contains invalid values: %s",
violatingFieldMessages.collect(Collectors.joining(" | "))
)
.hasSizeLessThan(2);

assertThat(violatingProperties)
.withFailMessage("Validation failed for property: " + rule.getProperty() + " [" + alteredValue + "]")
.hasSize(1);
.contains(rule.getProperty());
}
});
}
Expand Down