You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/05/20 01:41:12 UTC
svn commit: r946483 - in
/myfaces/extensions/validator/branches/branch_for_jsf_1_1:
test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/
test-modules/bean-validation-tests/src/test/java/org/apache/myfac...
Author: gpetracek
Date: Wed May 19 23:41:11 2010
New Revision: 946483
URL: http://svn.apache.org/viewvc?rev=946483&view=rev
Log:
EXTVAL-97
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/CascadedValidationTestCase.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/model/CascadedValidationTestCase1Bean.java
myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/CascadedValidationTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/CascadedValidationTestCase.java?rev=946483&r1=946482&r2=946483&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/CascadedValidationTestCase.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/CascadedValidationTestCase.java Wed May 19 23:41:11 2010
@@ -90,6 +90,20 @@ public class CascadedValidationTestCase
checkMessageSeverities(FacesMessage.SEVERITY_ERROR);
}
+ public void testCascadedValidationNullValue()
+ {
+ createValueBindingForComponent(this.inputComponent1, "#{testBean.nullProperty}");
+ setValueToValidate(this.inputComponent1, "");
+ this.inputComponent1.setConverter(createCustomTypeConverter());
+
+ validateComponents();
+
+ assertComponentValid(this.inputComponent1);
+ assertNavigationBlocked(false);
+
+ checkMessageCount(0);
+ }
+
private Converter createCustomTypeConverter()
{
return new Converter()
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/model/CascadedValidationTestCase1Bean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/model/CascadedValidationTestCase1Bean.java?rev=946483&r1=946482&r2=946483&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/model/CascadedValidationTestCase1Bean.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/test-modules/bean-validation-tests/src/test/java/org/apache/myfaces/extensions/validator/test/beanval/model/CascadedValidationTestCase1Bean.java Wed May 19 23:41:11 2010
@@ -27,6 +27,9 @@ public class CascadedValidationTestCase1
@Valid
private CustomTypeForCascadedValidationTestCase1Bean property;
+ @Valid
+ private CustomTypeForCascadedValidationTestCase1Bean nullProperty;
+
public CustomTypeForCascadedValidationTestCase1Bean getProperty()
{
return property;
@@ -36,4 +39,14 @@ public class CascadedValidationTestCase1
{
this.property = property;
}
-}
+
+ public CustomTypeForCascadedValidationTestCase1Bean getNullProperty()
+ {
+ return nullProperty;
+ }
+
+ public void setNullProperty(CustomTypeForCascadedValidationTestCase1Bean nullProperty)
+ {
+ this.nullProperty = nullProperty;
+ }
+}
\ No newline at end of file
Modified: myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java?rev=946483&r1=946482&r2=946483&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_1_1/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java Wed May 19 23:41:11 2010
@@ -70,7 +70,7 @@ public class BeanValidationUtils
.getValidator()
.validateValue(baseClass, propertyName, objectToValidate, groups);
- if(result.isEmpty() && cascadedValidation)
+ if(result.isEmpty() && cascadedValidation && objectToValidate != null)
{
result = processCascadedValidation(validatorFactory, baseClass, propertyName, objectToValidate, groups);
}