[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...

[Gavin King]

  User: gavin   
  Date: 07/06/24 18:24:51

  Modified:    src/main/org/jboss/seam/mock  BaseSeamTest.java
  Log:
  redesign model-based validation, according to advice of Jacob
  JBSEAM-1593
  
  Revision  Changes    Path
  1.20      +6 -3      jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BaseSeamTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/BaseSeamTest.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- BaseSeamTest.java	21 Jun 2007 15:38:19 -0000	1.19
  +++ BaseSeamTest.java	24 Jun 2007 22:24:51 -0000	1.20
  @@ -10,6 +10,7 @@
   import java.util.Map;
   import java.util.Set;
   
  +import javax.el.ValueExpression;
   import javax.faces.application.Application;
   import javax.faces.application.FacesMessage;
   import javax.faces.component.UIViewRoot;
  @@ -36,6 +37,7 @@
   import org.jboss.seam.core.Expressions;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  +import org.jboss.seam.core.Validators;
   import org.jboss.seam.faces.FacesMessages;
   import org.jboss.seam.init.Initialization;
   import org.jboss.seam.jsf.SeamApplication;
  @@ -432,12 +434,13 @@
          */
         protected boolean validateValue(String valueExpression, Object value)
         {
  -         InvalidValue[] ivs = Expressions.instance().getInvalidValues(valueExpression, value);
  +         ValueExpression ve = application.getExpressionFactory()
  +               .createValueExpression(facesContext.getELContext(), valueExpression, Object.class);
  +         InvalidValue[] ivs = Validators.instance().validate(ve, facesContext.getELContext(), value);
            if (ivs.length > 0)
            {
               validationFailed = true;
  -            facesContext.addMessage(null, FacesMessages.createFacesMessage(
  -                     FacesMessage.SEVERITY_WARN, ivs[0].getMessage()));
  +            facesContext.addMessage( null, FacesMessages.createFacesMessage(FacesMessage.SEVERITY_ERROR, ivs[0].getMessage()) );
               return false;
            }
            else