瀏覽代碼

Rename BeanValidationValidator to BeanValidator based on review.

tags/7.0.0.alpha1
Henri Sara 12 年之前
父節點
當前提交
29d7012647

+ 2
- 2
src/com/vaadin/data/fieldbinder/BeanFieldGroup.java 查看文件

@@ -7,7 +7,7 @@ import java.lang.reflect.Method;
import com.vaadin.data.Item;
import com.vaadin.data.util.BeanItem;
import com.vaadin.data.validator.BeanValidationValidator;
import com.vaadin.data.validator.BeanValidator;
import com.vaadin.ui.Field;
public class BeanFieldGroup<T> extends FieldGroup {
@@ -120,7 +120,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
super.configureField(field);
// Add Bean validators if there are annotations
if (isBeanValidationImplementationAvailable()) {
BeanValidationValidator validator = new BeanValidationValidator(
BeanValidator validator = new BeanValidator(
beanType, getPropertyId(field).toString());
field.addValidator(validator);
if (field.getLocale() != null) {

src/com/vaadin/data/validator/BeanValidationValidator.java → src/com/vaadin/data/validator/BeanValidator.java 查看文件

@@ -34,7 +34,7 @@ import com.vaadin.data.Validator;
* @author Petri Hakala
* @author Henri Sara
*/
public class BeanValidationValidator implements Validator {
public class BeanValidator implements Validator {
private static final long serialVersionUID = 1L;
private static ValidatorFactory factory;
@@ -85,7 +85,7 @@ public class BeanValidationValidator implements Validator {
* @param propertyName
* property to validate
*/
public BeanValidationValidator(Class<?> beanClass, String propertyName) {
public BeanValidator(Class<?> beanClass, String propertyName) {
this.beanClass = beanClass;
this.propertyName = propertyName;
locale = Locale.getDefault();
@@ -158,7 +158,7 @@ public class BeanValidationValidator implements Validator {
/**
* Returns a shared Validator instance to use. An instance is created using
* the validator factory if necessary and thereafter reused by the
* {@link BeanValidationValidator} instance.
* {@link BeanValidator} instance.
*
* @return the JSR-303 {@link javax.validation.Validator} to use
*/

+ 13
- 15
tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java 查看文件

@@ -3,56 +3,54 @@ package com.vaadin.tests.server.validation;
import org.junit.Test;

import com.vaadin.data.Validator.InvalidValueException;
import com.vaadin.data.validator.BeanValidationValidator;
import com.vaadin.data.validator.BeanValidator;
import com.vaadin.tests.data.bean.BeanToValidate;

public class TestBeanValidation {
@Test(expected = InvalidValueException.class)
public void testBeanValidationNull() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "firstname");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"firstname");
validator.validate(null);
}

@Test(expected = InvalidValueException.class)
public void testBeanValidationStringTooShort() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "firstname");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"firstname");
validator.validate("aa");
}

@Test
public void testBeanValidationStringOk() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "firstname");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"firstname");
validator.validate("aaa");
}

@Test(expected = InvalidValueException.class)
public void testBeanValidationIntegerTooSmall() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "age");
BeanValidator validator = new BeanValidator(BeanToValidate.class, "age");
validator.validate(17);
}

@Test
public void testBeanValidationIntegerOk() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "age");
BeanValidator validator = new BeanValidator(BeanToValidate.class, "age");
validator.validate(18);
}

@Test(expected = InvalidValueException.class)
public void testBeanValidationTooManyDigits() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "decimals");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"decimals");
validator.validate("1234.567");
}

@Test
public void testBeanValidationDigitsOk() {
BeanValidationValidator validator = new BeanValidationValidator(
BeanToValidate.class, "decimals");
BeanValidator validator = new BeanValidator(BeanToValidate.class,
"decimals");
validator.validate("123.45");
}


Loading…
取消
儲存