Reviewers: rchandia,

Description:
Handle custom constraint violation messages.
[JSR 303 TCK Result] 110 of 257 (42.80%) Pass with 20 Failures and 9
Errors.


Please review this at http://gwt-code-reviews.appspot.com/1379801/

Affected files:
M user/src/com/google/gwt/validation/client/impl/ConstraintValidatorContextImpl.java M user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java


Index: user/src/com/google/gwt/validation/client/impl/ConstraintValidatorContextImpl.java
===================================================================
--- user/src/com/google/gwt/validation/client/impl/ConstraintValidatorContextImpl.java (revision 9825) +++ user/src/com/google/gwt/validation/client/impl/ConstraintValidatorContextImpl.java (working copy)
@@ -58,6 +58,7 @@
     }

     public ConstraintValidatorContext addConstraintViolation() {
+      messages.add(new MessageAndPath(context.basePath, messageTemplate));
       return context;
     }

@@ -181,6 +182,7 @@

   private boolean disableDefault;
private Set<ConstraintViolation<T>> violations = new HashSet<ConstraintViolation<T>>();
+  private HashSet<MessageAndPath> messages = new HashSet<MessageAndPath>();

   public ConstraintValidatorContextImpl(PathImpl path,
       ConstraintDescriptor<A> descriptor) {
@@ -205,10 +207,10 @@
   }

   public Set<MessageAndPath> getMessageAndPaths() {
-    // TODO handle custom.
-    HashSet<MessageAndPath> messages = new HashSet<MessageAndPath>();
+    if (!disableDefault) {
     messages.add(new MessageAndPath(this.basePath,
         this.getDefaultConstraintMessageTemplate()));
+    }
     return messages;
   }

Index: user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java
===================================================================
--- user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java (revision 9825) +++ user/test/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionGwtTest.java (working copy)
@@ -66,7 +66,6 @@
     delegate.testPayloadPropagationInComposedConstraints();
   }

-  @Failing(issue = 5799)
   public void testValidationOfMainAnnotationIsAlsoApplied() {
     delegate.testValidationOfMainAnnotationIsAlsoApplied();
   }


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to