Skip to content

Commit

Permalink
fix #481. CompositeValidator provides list of validators (#486)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbalderas @manuel-mauky
gbalderas authored and manuel-mauky committed May 22, 2017
1 parent 9b49686 commit 925c8fe
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 11 deletions.
15 changes: 11 additions & 4 deletions mvvmfx-validation/src/main/java/de/saxsys/mvvmfx/utils/validation/CompositeValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
******************************************************************************/
package de.saxsys.mvvmfx.utils.validation;

import java.util.HashMap;
import java.util.Map;

import javafx.beans.property.ListProperty;
import javafx.beans.property.SimpleListProperty;
import javafx.collections.FXCollections;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;

import java.util.HashMap;
import java.util.Map;

/**
* This {@link Validator} implementation is used to compose multiple other validators.
* <p>
Expand All @@ -33,7 +33,7 @@
*/
public class CompositeValidator implements Validator {

CompositeValidationStatus status = new CompositeValidationStatus();
private CompositeValidationStatus status = new CompositeValidationStatus();

private ListProperty<Validator> validators = new SimpleListProperty<>(FXCollections.observableArrayList());
private Map<Validator, ListChangeListener<ValidationMessage>> listenerMap = new HashMap<>();
Expand Down Expand Up @@ -91,6 +91,13 @@ public CompositeValidator(Validator... validators) {
}


/**
* @return an unmodifiable observable list of validators composed by this CompositeValidator.
*/
public ObservableList<Validator> getValidators() {
return FXCollections.unmodifiableObservableList(this.validators);
}

public void addValidators(Validator... validators) {
this.validators.addAll(validators);
}
Expand Down
92 changes: 85 additions & 7 deletions ...fx-validation/src/test/java/de/saxsys/mvvmfx/utils/validation/CompositeValidatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,18 @@
******************************************************************************/
package de.saxsys.mvvmfx.utils.validation;

import static org.assertj.core.api.Assertions.assertThat;

import com.google.common.base.Strings;

import javafx.beans.binding.Bindings;
import javafx.beans.binding.IntegerBinding;
import javafx.beans.property.*;
import org.junit.Before;
import org.junit.Test;

import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors;

import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import static org.assertj.core.api.Assertions.assertThat;

/**
* @author manuel.mauky
Expand Down Expand Up @@ -246,4 +244,84 @@ private List<String> asStrings(List<ValidationMessage> messages) {
.map(ValidationMessage::getMessage)
.collect(Collectors.toList());
}


/**
* Issue #413
*/
@Test
public void validatorPercentageTest(){

final IntegerProperty integerProperty1 = new SimpleIntegerProperty(30);
final IntegerProperty integerProperty2 = new SimpleIntegerProperty(-20);
final IntegerProperty integerProperty3 = new SimpleIntegerProperty(35);
final IntegerProperty integerProperty4 = new SimpleIntegerProperty(55);

Predicate<Number> predicate1 = v -> v.doubleValue() > 50;

final Validator validator1 = new FunctionBasedValidator<>(integerProperty1, predicate1, ValidationMessage.error("Value must be bigger than 50"));
final Validator validator2 = new FunctionBasedValidator<>(integerProperty2, predicate1, ValidationMessage.error("Value must be bigger than 50"));
final Validator validator3 = new FunctionBasedValidator<>(integerProperty3, predicate1, ValidationMessage.error("Value must be bigger than 50"));
final Validator validator4 = new FunctionBasedValidator<>(integerProperty4, predicate1, ValidationMessage.error("Value must be bigger than 50"));

final CompositeValidator compositeValidator = new CompositeValidator(validator1, validator2, validator3);
assertThat(compositeValidator.getValidationStatus().getMessages()).hasSize(3);

IntegerBinding percentage = Bindings.createIntegerBinding(() -> {
int numberOfValidators = compositeValidator.getValidators().size();

if (numberOfValidators == 0) {
return 100;
} else {
int numberOfValidValidators = (int) compositeValidator.getValidators().stream()
.map(Validator::getValidationStatus)
.filter(ValidationStatus::isValid)
.count();

return numberOfValidValidators * 100 / numberOfValidators;
}
}, compositeValidator.getValidationStatus().getMessages(), compositeValidator.getValidators());


assertThat(percentage.intValue()).isEqualTo(0);

// change values
integerProperty1.setValue(70);
assertThat(percentage.intValue()).isEqualTo(33);
integerProperty1.setValue(0);
assertThat(percentage.intValue()).isEqualTo(0);


integerProperty2.setValue(100);
assertThat(percentage.intValue()).isEqualTo(33);

integerProperty1.setValue(70);
assertThat(percentage.intValue()).isEqualTo(66);

integerProperty2.setValue(50);
assertThat(percentage.intValue()).isEqualTo(33);

// add new Validator
compositeValidator.addValidators(validator4);
assertThat(percentage.intValue()).isEqualTo(50);

// 0% valid
integerProperty1.setValue(50);
integerProperty4.setValue(50);
assertThat(percentage.intValue()).isEqualTo(0);

// 100% valid
integerProperty1.setValue(51);
integerProperty2.setValue(100);
integerProperty3.setValue(80);
integerProperty4.setValue(75);
assertThat(percentage.intValue()).isEqualTo(100);

// remove validator
compositeValidator.removeValidators(validator1);
assertThat(percentage.intValue()).isEqualTo(100);
integerProperty2.setValue(30);
assertThat(percentage.intValue()).isEqualTo(66);

}
}

0 comments on commit 925c8fe

Please sign in to comment.