Author: konstantin.mishin Date: 2008-11-24 10:19:20 -0500 (Mon, 24 Nov 2008) New Revision: 11324 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/orderingList/orderingListTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java Log: RF-5010 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java 2008-11-24 14:16:58 UTC (rev 11323) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java 2008-11-24 15:19:20 UTC (rev 11324) @@ -27,8 +27,11 @@ import java.util.LinkedHashSet; 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.validator.ValidatorException; import org.ajax4jsf.model.ListShuttleItem; @@ -43,6 +46,8 @@ private String string; private Boolean immediate; private Boolean valueChanged; + private Boolean attrValidator; + private Boolean tagValidator; public OrderingListTestBean() { init(); @@ -60,6 +65,8 @@ setString("something"); immediate = false; valueChanged = false; + attrValidator = false; + tagValidator = false; } public Object getActionResult() { @@ -158,4 +165,26 @@ public Boolean getValueChanged() { return valueChanged; } + public void validate(FacesContext context, UIComponent component, + Object value) throws ValidatorException { + if (attrValidator) { + throw new ValidatorException(new FacesMessage("attrValidator")); + } + } + + public void setTagValidator(Boolean tagValidator) { + this.tagValidator = tagValidator; + } + + public Boolean getTagValidator() { + return tagValidator; + } + + public Boolean getAttrValidator() { + return attrValidator; + } + + public void setAttrValidator(Boolean attrValidator) { + this.attrValidator = attrValidator; + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/orderingList/orderingListTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2008-11-24 14:16:58 UTC (rev 11323) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2008-11-24 15:19:20 UTC (rev 11324) @@ -27,6 +27,7 @@ import java.util.Map; import org.ajax4jsf.template.Template; +import org.ajax4jsf.validators.ValidatorWithAttribute; import org.richfaces.SeleniumEvent; import org.richfaces.SeleniumTestBase; import org.testng.Assert; @@ -89,7 +90,33 @@ private String renderedId; private String immediateId; + + private String attrValidatorId; + private String tagValidatorId; + + /** + * validator defined by component attribute and nested tags work + */ + @Test + public void testValidators(Template template) { + renderPage(template, initMethod); + initFields(); + Assert.assertTrue(selenium.getText(messagesId).length() == 0, "Message mustn't be rendered."); + selenium.click(attrValidatorId); + waitForAjaxCompletion(); + clickAjaxCommandAndWait(submitId); + Assert.assertEquals(selenium.getText(messagesId), "attrValidator"); + selenium.click(attrValidatorId); + waitForAjaxCompletion(); + clickAjaxCommandAndWait(submitId); + Assert.assertTrue(selenium.getText(messagesId).length() == 0, "Message mustn't be rendered."); + selenium.click(tagValidatorId); + waitForAjaxCompletion(); + clickAjaxCommandAndWait(submitId); + Assert.assertEquals(selenium.getText(messagesId), ValidatorWithAttribute.MESSAGE); + } + /** * style and classes, standard HTML attributes are output to client */ @@ -385,7 +412,7 @@ */ @Test public void testCaptionFacet(Template template) { - renderPage(template); + renderPage(template, initMethod); initFields(); Assert.assertEquals(selenium.getText("xpath=id('" + orderingListId + "table')/tbody/tr[1]"), "Caption Faset"); } @@ -572,6 +599,8 @@ showButtonLabelsId = attrFormId + ":showButtonLabelsId"; renderedId = attrFormId + ":renderedId"; immediateId = attrFormId + ":immediateId"; + attrValidatorId = attrFormId + ":attrValidatorId"; + tagValidatorId = attrFormId + ":tagValidatorId"; } public String getTestUrl() {