[hibernate-commits] Hibernate SVN: r17504 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-09-10 10:16:48 -0400 (Thu, 10 Sep 2009)
New Revision: 17504

Modified:
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java
Log:
HV-224 - ConstraintValidatorContextTest#testDisableDefaultErrorWithoutAddingCustomError should raise a ValidationException


Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java	2009-09-10 13:29:31 UTC (rev 17503)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java	2009-09-10 14:16:48 UTC (rev 17504)
@@ -21,8 +21,8 @@
 import java.util.Map;
 import java.util.Set;
 import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
 import javax.validation.ValidationException;
+import javax.validation.Validator;
 
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecAssertions;
@@ -30,7 +30,6 @@
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.ArtifactType;
 import org.jboss.testharness.impl.packaging.Classes;
-import static org.testng.Assert.assertEquals;
 import org.testng.annotations.Test;
 
 import org.hibernate.jsr303.tck.util.TestUtil;
@@ -70,9 +69,7 @@
 		DummyValidator.setCustomErrorMessages( errors );
 
 		DummyBean bean = new DummyBean( "foobar" );
-
-		Set<ConstraintViolation<DummyBean>> constraintViolations = validator.validate( bean );
-		//assertEquals( constraintViolations.size(), 0, "Wrong number of constraints" );
+		validator.validate( bean );
 	}
 
 	@Test

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java	2009-09-10 13:29:31 UTC (rev 17503)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java	2009-09-10 14:16:48 UTC (rev 17504)
@@ -21,6 +21,7 @@
 import java.util.List;
 import javax.validation.ConstraintValidatorContext;
 import javax.validation.Path;
+import javax.validation.ValidationException;
 import javax.validation.metadata.ConstraintDescriptor;
 
 /**
@@ -56,6 +57,10 @@
 	}
 
 	public List<ErrorMessage> getErrorMessages() {
+		if(defaultDisabled && errorMessages.size() == 0) {
+			throw new ValidationException("At least one custom message must be created if the default error message gets disabled.");
+		}
+
 		List<ErrorMessage> returnedErrorMessages = new ArrayList<ErrorMessage>( errorMessages );
 		if ( !defaultDisabled ) {
 			returnedErrorMessages.add(