[richfaces-svn-commits] JBoss Rich Faces SVN: r12642 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/WEB-INF and 2 other directories.

Author: konstantin.mishin Date: 2009-02-12 10:06:19 -0500 (Thu, 12 Feb 2009) New Revision: 12642 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ComboBoxTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/comboBox/comboBoxTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComboBoxTest.java Log: RF-6064 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ComboBoxTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ComboBoxTestBean.java 2009-02-12 14:27:41 UTC (rev 12641) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ComboBoxTestBean.java 2009-02-12 15:06:19 UTC (rev 12642) @@ -24,10 +24,15 @@ import java.util.Arrays; import java.util.List; +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; +import javax.faces.validator.Validator; +import javax.faces.validator.ValidatorException; -public class ComboBoxTestBean { +public class ComboBoxTestBean implements Validator{ private String value; private String trace; @@ -83,4 +88,18 @@ public void valueChangeListener(ValueChangeEvent event) { trace = "changed"; } + + public void validate(FacesContext context, UIComponent component, + Object value) throws ValidatorException { + if ("11".equals(value)) { + throw new ValidatorException(new FacesMessage("Value mustn't be equal 11.")); + } + } + + public void validate2(FacesContext context, UIComponent component, + Object value) throws ValidatorException { + if ("44".equals(value)) { + throw new ValidatorException(new FacesMessage("Value mustn't be equal 44.")); + } + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2009-02-12 14:27:41 UTC (rev 12641) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2009-02-12 15:06:19 UTC (rev 12642) @@ -51,6 +51,11 @@ <validator-class>org.ajax4jsf.autotest.bean.AutoTestDefaultValidator</validator-class> </validator> + <validator> + <validator-id>comboBoxValidator</validator-id> + <validator-class>org.ajax4jsf.bean.ComboBoxTestBean</validator-class> + </validator> + <managed-bean> <managed-bean-name>configurator</managed-bean-name> <managed-bean-class>org.ajax4jsf.bean.Configurator</managed-bean-class> Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/comboBox/comboBoxTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComboBoxTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComboBoxTest.java 2009-02-12 14:27:41 UTC (rev 12641) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ComboBoxTest.java 2009-02-12 15:06:19 UTC (rev 12642) @@ -43,6 +43,8 @@ private String trace; + private String message; + private void init(Template template) { renderPage(null, template, "#{comboBean.init}"); //String attrForm = getParentId() + "attrForm"; @@ -53,6 +55,7 @@ submit = mainForm + ":submit"; value = getParentId() + "value"; trace = getParentId() + "trace"; + message = getParentId() + "message"; } @Test @@ -140,12 +143,32 @@ selenium.click(comboboxButton); selenium.mouseMove("xpath=id('" + list + "')/span[2]"); selenium.click("xpath=id('" + list + "')/span[2]"); - //selenium.fireEvent("xpath=id('" + list + "')/span[3]", "click"); clickAjaxCommandAndWait(submit); Assert.assertEquals(selenium.getText(value), "22"); Assert.assertEquals(selenium.getText(trace), "changed"); } + /** + * Check component validation. + * Specific validator defined in "validator" attribute + * should be triggered either as the ones defined using nested validator tags + */ + @Test + public void testValidators(Template template) { + init(template); + Assert.assertEquals(selenium.getText(message), ""); + selenium.click(comboboxButton); + selenium.mouseMove("xpath=id('" + list + "')/span[1]"); + selenium.click("xpath=id('" + list + "')/span[1]"); + clickAjaxCommandAndWait(submit); + Assert.assertEquals(selenium.getText(message), "Value mustn't be equal 11."); + selenium.click(comboboxButton); + selenium.mouseMove("xpath=id('" + list + "')/span[4]"); + selenium.click("xpath=id('" + list + "')/span[4]"); + clickAjaxCommandAndWait(submit); + Assert.assertEquals(selenium.getText(message), "Value mustn't be equal 44."); + } + public String getTestUrl() { return "pages/comboBox/comboBoxTest.xhtml"; }