adding allOf validation and test cases #438
Conversation
|
First of all, thank you for the proposal. Instead of test cases being a,b,c,x,y,z blah blah, please use use cases that explain why you need this feature. See also #191 |
| @@ -42,6 +42,7 @@ enum Default implements ViolationMessage { | |||
| OBJECT_EQUAL_TO("object.equalTo", "\"{0}\" must be equal to {1}"), // | |||
| OBJECT_ONE_OF("object.oneOf", "\"{0}\" must be one of the following values: {1}"), // | |||
| OBJECT_NOT_ONE_OF("object.notOneOf", "\"{0}\" must not be one of the following values: {1}"), // | |||
| OBJECT_ALL_OF("object.allOf", "\"{0}\" must be have of all of the following values: {1}, missing values: {2}"), // | |||
There was a problem hiding this comment.
object. prefix is not correct in this case
| @@ -69,6 +70,22 @@ public CollectionConstraint<T, L, E> unique() { | |||
| return this; | |||
| } | |||
|
|
|||
| public CollectionConstraint<T, L, E> allOf(Collection<? extends E> values) { | |||
There was a problem hiding this comment.
allOf sounds misleading. It seems that contains is more appropriate.
AssertJ's Collection assert method
https://assertj.github.io/doc/#assertj-core-group-contains
There was a problem hiding this comment.
@making using contains can be a misnomer. It does not explain whether any or all items need to be contained. How about containsAll?
| this.predicates().add(ConstraintPredicate.withViolatedValue(collection -> { | ||
| final Set<E> missingValues = new HashSet<>(values); | ||
|
|
||
| if (collection instanceof Set) |
| if (collection instanceof Set) | ||
| missingValues.removeAll(collection); | ||
| else | ||
| missingValues.removeAll(new HashSet<>(collection)); |
There was a problem hiding this comment.
Is there a need to wrap it in a Set?
There was a problem hiding this comment.
It becomes efficient. If you check removeAll implementation in AbstractSet, items are checked in collection so using set will be efficient. See below method for removeAll in AbstractSet.
public boolean removeAll(Collection<?> c) {
Objects.requireNonNull(c);
boolean modified = false;
if (size() > c.size()) {
for (Object e : c)
modified |= remove(e);
} else {
for (Iterator<?> i = iterator(); i.hasNext(); ) {
if (c.contains(i.next())) {
i.remove();
modified = true;
}
}
}
return modified;
}
@making I followed the test case format already present in the same test file. The use case is simply to verify whether all items from one collection are present in an expected collection. For example, consider a person on vacation with a planned list of places to visit. There might be certain locations they definitely want to visit. This type of validation can be useful in such scenarios. |
Adding validation for
allOf