Skip to content

Commit 97591c9

Browse files
authored
Merge pull request #15 from aboutbits/validation_checking
Validation checking
2 parents f57ea69 + 40bb2e1 commit 97591c9

4 files changed

Lines changed: 21 additions & 3 deletions

File tree

src/main/java/it/aboutbits/springboot/testing/testdata/base/ModifyableTestDataCreator.java renamed to src/main/java/it/aboutbits/springboot/testing/testdata/base/ModifiableTestDataCreator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@SuppressWarnings("unchecked")
1414
@Slf4j
15-
public abstract class ModifyableTestDataCreator<CREATOR extends ModifyableTestDataCreator<CREATOR, ITEM, PARAMETER>, ITEM, PARAMETER> extends TestDataCreator<ITEM> {
15+
public abstract class ModifiableTestDataCreator<CREATOR extends ModifiableTestDataCreator<CREATOR, ITEM, PARAMETER>, ITEM, PARAMETER> extends TestDataCreator<ITEM> {
1616
protected static final FakerExtended FAKER = new FakerExtended();
1717

1818
private boolean mutatorSet = false;
@@ -25,7 +25,7 @@ public abstract class ModifyableTestDataCreator<CREATOR extends ModifyableTestDa
2525
protected ObjIntConsumer<ITEM> resultMutator = (item, index) -> {
2626
};
2727

28-
protected ModifyableTestDataCreator(int count) {
28+
protected ModifiableTestDataCreator(int count) {
2929
super(count);
3030
}
3131

src/main/java/it/aboutbits/springboot/testing/validation/core/RuleValidator.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,19 @@ private static <P> void assertThatValidationIsCompliantForEachProperty(
117117
var violations = validator.validate(copy);
118118

119119
// Check if there are any violations
120+
var violatingFieldMessages = violations
121+
.stream()
122+
.map(violation ->
123+
"%s => %s".formatted(
124+
violation.getPropertyPath().toString(),
125+
violation.getMessage()
126+
)
127+
);
128+
120129
assertThat(violations)
121130
.withFailMessage(
122-
"More than one property failed to validate during mutation. The supplied parameter possibly contains invalid values."
131+
"More than one property failed to validate during mutation. The supplied parameter possibly contains invalid values: %s",
132+
violatingFieldMessages.collect(Collectors.joining(" | "))
123133
)
124134
.hasSizeLessThan(2);
125135

src/main/java/it/aboutbits/springboot/testing/validation/rule/NotBlankRule.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import it.aboutbits.springboot.testing.validation.core.Rule;
55
import it.aboutbits.springboot.testing.validation.core.ValidationRulesData;
66
import it.aboutbits.springboot.testing.validation.source.BlankValueSource;
7+
import it.aboutbits.springboot.testing.validation.source.NullValueSource;
78
import lombok.NonNull;
89

910
@SuppressWarnings("unchecked")
@@ -12,6 +13,9 @@ default V notBlank(@NonNull String property) {
1213
addRule(
1314
new Rule(property, BlankValueSource.class)
1415
);
16+
addRule(
17+
new Rule(property, NullValueSource.class)
18+
);
1519
return (V) this;
1620
}
1721
}

src/main/java/it/aboutbits/springboot/testing/validation/rule/NotEmptyRule.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import it.aboutbits.springboot.testing.validation.core.Rule;
55
import it.aboutbits.springboot.testing.validation.core.ValidationRulesData;
66
import it.aboutbits.springboot.testing.validation.source.EmptyValueSource;
7+
import it.aboutbits.springboot.testing.validation.source.NullValueSource;
78
import lombok.NonNull;
89

910
@SuppressWarnings("unchecked")
@@ -12,6 +13,9 @@ default V notEmpty(@NonNull String property) {
1213
addRule(
1314
new Rule(property, EmptyValueSource.class)
1415
);
16+
addRule(
17+
new Rule(property, NullValueSource.class)
18+
);
1519
return (V) this;
1620
}
1721
}

0 commit comments

Comments
 (0)