[richfaces-svn-commits] JBoss Rich Faces SVN: r20702 - in trunk/ui: validator/ui and 10 other directories.

Author: alexsmirnov Date: 2010-12-20 18:33:39 -0500 (Mon, 20 Dec 2010) New Revision: 20702 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java trunk/ui/validator/ui/pom.xml trunk/ui/validator/ui/src/main/config/faces-config.xml trunk/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java trunk/ui/validator/ui/src/test/java/org/richfaces/component/AjaxValidationTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/component/ClientValidationTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorTestBase.java trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/GetScriptTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/el/TestCaptureEL.java trunk/ui/validator/ui/src/test/java/org/richfaces/el/ValueExpressionAnalayserTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/message/ClearMessageTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/message/MessageTestBase.java trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/LengthValidatorTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java trunk/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetClientSideScriptTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java Log: RESOLVED - issue RF-10063: Switch CSV to RichFaces AJAX behavior https://issues.jboss.org/browse/RF-10063 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -98,7 +98,7 @@ BehaviorStack ajaxBehaviors = BehaviorStack.getBehaviorStack(context, true); String eventName = getEventName(); - ajaxBehaviors.pushBehavior(context, ajaxBehavior, AjaxBehavior.BEHAVIOR_ID, eventName); + ajaxBehaviors.pushBehavior(context, ajaxBehavior, getBehaviorId(), eventName); AttachQueueStack attachQueueStack = AttachQueueStack.getStack(context, true); AttachQueueInfo attachQueueInfo = new AttachQueueInfo(parent); @@ -138,6 +138,7 @@ } } + private void applyNested(FaceletContext ctx, UIComponent parent, AjaxBehavior behavior) { if (!ComponentHandler.isNew(parent)) { return; Modified: trunk/ui/validator/ui/pom.xml =================================================================== --- trunk/ui/validator/ui/pom.xml 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/pom.xml 2010-12-20 23:33:39 UTC (rev 20702) @@ -74,6 +74,10 @@ <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + </dependency> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> Modified: trunk/ui/validator/ui/src/main/config/faces-config.xml =================================================================== --- trunk/ui/validator/ui/src/main/config/faces-config.xml 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/main/config/faces-config.xml 2010-12-20 23:33:39 UTC (rev 20702) @@ -3,6 +3,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!-- <behavior> <behavior-id>org.richfaces.behavior.ClientValidator</behavior-id> <behavior-class>org.richfaces.component.behavior.ClientValidatorImpl</behavior-class> @@ -13,6 +14,7 @@ </cdk:tag> </behavior-extension> </behavior> + --> <render-kit> <client-behavior-renderer> <client-behavior-renderer-type>org.richfaces.ClientValidatorRenderer</client-behavior-renderer-type> Modified: trunk/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java =================================================================== --- trunk/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/main/java/org/richfaces/component/behavior/ClientValidatorImpl.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -36,7 +36,6 @@ import javax.faces.component.UIComponent; import javax.faces.component.UIMessage; import javax.faces.component.UIMessages; -import javax.faces.component.behavior.AjaxBehavior; import javax.faces.component.behavior.ClientBehaviorContext; import javax.faces.context.FacesContext; import javax.faces.context.PartialViewContext; @@ -48,7 +47,11 @@ import javax.faces.validator.BeanValidator; import javax.faces.validator.Validator; +import org.ajax4jsf.component.behavior.AjaxBehavior; import org.richfaces.application.ServiceTracker; +import org.richfaces.cdk.annotations.JsfBehavior; +import org.richfaces.cdk.annotations.Tag; +import org.richfaces.cdk.annotations.TagType; import org.richfaces.component.UIRichMessages; import org.richfaces.log.Logger; import org.richfaces.log.RichfacesLogger; @@ -69,6 +72,7 @@ * @author asmirnov(a)exadel.com * */ +@JsfBehavior(id = "org.richfaces.behavior.ClientValidator", tag = @Tag(name = "validator", handler = "org.richfaces.view.facelets.html.ClientValidatorHandler", type = TagType.Facelets)) public class ClientValidatorImpl extends AjaxBehavior implements ClientValidatorBehavior { @@ -359,5 +363,14 @@ } } } + + /* (non-Javadoc) + * @see org.richfaces.component.behavior.ClientValidatorBehavior#isImmediateSet() + */ + public boolean isImmediateSet() { + // TODO - implement this method in RichFaces AjaxBehavior + return false; + } + } Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/component/AjaxValidationTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/component/AjaxValidationTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/component/AjaxValidationTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -69,9 +69,9 @@ HtmlInput input = getInput(page); input.setValueAttribute(value); input.fireEvent("blur"); + System.out.println(page.asXml()); HtmlElement message = page.getElementById("uiMessage"); assertThat(message.getTextContent(), matcher); -// System.out.println(page.asXml()); } private HtmlInput getInput(HtmlPage page) { HtmlForm htmlForm = page.getFormByName("form"); Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/component/ClientValidationTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/component/ClientValidationTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/component/ClientValidationTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -11,7 +11,6 @@ import org.jboss.test.faces.htmlunit.HtmlUnitEnvironment; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import com.gargoylesoftware.htmlunit.html.HtmlElement; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorGetValidatorTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,11 +1,8 @@ package org.richfaces.component.behavior; -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; -import java.util.Arrays; import java.util.Collection; import javax.el.ValueExpression; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorTestBase.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorTestBase.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/BehaviorTestBase.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,6 +1,6 @@ package org.richfaces.component.behavior; -import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.*; import javax.faces.component.UIComponent; import javax.faces.component.UIInput; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/GetScriptTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/GetScriptTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/component/behavior/GetScriptTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,15 +1,15 @@ package org.richfaces.component.behavior; -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; import javax.faces.FacesException; import javax.faces.component.UICommand; import javax.faces.component.UIComponent; import javax.faces.component.UIOutput; -import javax.faces.component.behavior.AjaxBehavior; import javax.faces.component.behavior.ClientBehaviorContext; import javax.faces.render.RenderKit; +import org.ajax4jsf.component.behavior.AjaxBehavior; import org.jboss.test.faces.mock.Mock; import org.jboss.test.faces.mock.MockTestRunner; import org.jboss.test.faces.mock.Stub; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/el/TestCaptureEL.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/el/TestCaptureEL.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/el/TestCaptureEL.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,9 +1,6 @@ package org.richfaces.el; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.Assert.*; import javax.el.ValueExpression; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/el/ValueExpressionAnalayserTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/el/ValueExpressionAnalayserTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/el/ValueExpressionAnalayserTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,7 +1,7 @@ package org.richfaces.el; -import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.*; import static org.junit.Assert.*; import javax.el.ELException; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/converter/ConverterTestBase.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -2,14 +2,11 @@ import static org.junit.Assert.*; - import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import org.ajax4jsf.javascript.JSFunction; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; import org.richfaces.javascript.client.MockTestBase; import org.richfaces.javascript.client.RunParameters; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/message/ClearMessageTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/message/ClearMessageTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/message/ClearMessageTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -28,7 +28,6 @@ import org.junit.Test; import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; /** * <p class="changed_added_4_0"></p> Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/message/MessageTestBase.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/message/MessageTestBase.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/message/MessageTestBase.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -14,15 +14,15 @@ public class MessageTestBase { - @Rule - public final Qunit qunit; - public static final String COMPONENT = "form:component"; public static final String MY_MESSAGE = "form:uiMessage"; public static final String MESSAGE_INIT = "new RichFaces.ui.Message(\"" + MY_MESSAGE + "\", {forComponentId:\"" + COMPONENT + "\"})"; + @Rule + public final Qunit qunit; + public MessageTestBase() { this.qunit = createQunitPage().build(); } Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/LengthValidatorTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/LengthValidatorTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/LengthValidatorTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -3,8 +3,6 @@ */ package org.richfaces.javascript.client.validator; -import static org.easymock.EasyMock.anyObject; - import java.util.List; import java.util.Map; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/javascript/client/validator/ValidatorTestBase.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,6 +1,6 @@ package org.richfaces.javascript.client.validator; -import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.*; import static org.junit.Assert.*; import java.util.Collections; @@ -12,7 +12,6 @@ import javax.faces.validator.ValidatorException; import javax.validation.ValidationException; - import net.sourceforge.htmlunit.corejs.javascript.JavaScriptException; import net.sourceforge.htmlunit.corejs.javascript.NativeObject; @@ -26,58 +25,58 @@ public abstract class ValidatorTestBase extends MockTestBase { private static final Converter NUMBER_CONVERTER = new Converter() { - - public String getAsString(FacesContext context, UIComponent component, Object value) { - - return String.valueOf(value); - } - - public Object getAsObject(FacesContext context, UIComponent component, String value) { - return Double.valueOf(value); - } - }; + public String getAsString(FacesContext context, UIComponent component, Object value) { + + return String.valueOf(value); + } + + public Object getAsObject(FacesContext context, UIComponent component, String value) { + return Double.valueOf(value); + } + }; + public ValidatorTestBase(RunParameters criteria) { super(criteria); } - @Test public void testValidator() throws Exception { Validator validator = createValidator(); try { - validator.validate(facesEnvironment.getFacesContext(), component, criteria.getValue()); - validateOnClient(); + validator.validate(facesEnvironment.getFacesContext(), component, criteria.getValue()); + validateOnClient(); } catch (ValidatorException e) { // client-side script has to throw exception too. try { validateOnClient(); - assertFalse("JSF validator throws exception for value: "+criteria.getValue(),true); + assertFalse("JSF validator throws exception for value: " + criteria.getValue(), true); } catch (ScriptException e2) { // both methods throws exceptions - it's ok. e2.printStackTrace(); Throwable cause = e2.getCause(); assertTrue(cause instanceof JavaScriptException); - NativeObject value = (NativeObject) ((JavaScriptException)cause).getValue(); + NativeObject value = (NativeObject) ((JavaScriptException) cause).getValue(); assertEquals(getErrorMessage().getDetail(), value.get("detail")); } } } - + protected Object validateOnClient() throws ValidationException { - JSFunction clientSideFunction = new JSFunction("RichFaces.csv." + getJavaScriptFunctionName(),criteria.getValue(),getErrorMessage(),getJavaScriptOptions()); + JSFunction clientSideFunction = + new JSFunction("RichFaces.csv." + getJavaScriptFunctionName(), criteria.getValue(), getErrorMessage(), + getJavaScriptOptions()); return qunit.runScript(clientSideFunction.toScript()); } - + protected abstract Validator createValidator(); - @Override protected void recordMocks() { super.recordMocks(); expect(component.getAttributes()).andStubReturn(Collections.EMPTY_MAP); - expect(component.getClientId(facesEnvironment.getFacesContext())).andStubReturn("testComponent"); + expect(component.getClientId(facesEnvironment.getFacesContext())).andStubReturn("testComponent"); expect(facesEnvironment.getApplication().createConverter("javax.faces.Number")).andStubReturn(NUMBER_CONVERTER); } } Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetClientSideScriptTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetClientSideScriptTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/renderkit/html/RendererGetClientSideScriptTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,8 +1,7 @@ package org.richfaces.renderkit.html; -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; import java.util.Collection; import java.util.Collections; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/validator/BeanValidatorServiceConstrainsTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,8 +1,7 @@ package org.richfaces.validator; -import static junit.framework.Assert.assertEquals; -import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.*; import static org.junit.Assert.*; import java.lang.annotation.Annotation; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesConverterServiceTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,8 +1,7 @@ package org.richfaces.validator; -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; import java.util.HashMap; import java.util.Locale; Modified: trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java =================================================================== --- trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2010-12-20 20:43:19 UTC (rev 20701) +++ trunk/ui/validator/ui/src/test/java/org/richfaces/validator/FacesValidatorServiceTest.java 2010-12-20 23:33:39 UTC (rev 20702) @@ -1,8 +1,7 @@ package org.richfaces.validator; -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.*; import java.util.HashMap; import java.util.Locale;