Author: konstantin.mishin Date: 2008-11-12 09:34:00 -0500 (Wed, 12 Nov 2008) New Revision: 11113 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-4894 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-12 14:01:02 UTC (rev 11112) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java 2008-11-12 14:34:00 UTC (rev 11113) @@ -41,6 +41,8 @@ private Boolean orderControlsVisible; private Boolean showButtonLabels; private Boolean rendered; + private String string; + private Boolean immediate; public OrderingListTestBean() { init(); @@ -56,6 +58,8 @@ orderControlsVisible = true; showButtonLabels = true; setRendered(true); + setString("something"); + immediate = false; } public Object getActionResult() { @@ -134,6 +138,24 @@ } + public void setString(String string) { + this.string = string; + } + + public String getString() { + return string; + } + + + public void setImmediate(Boolean immediate) { + this.immediate = immediate; + } + + public Boolean getImmediate() { + return immediate; + } + + private class ItemConverter implements Converter { /* (non-Javadoc) 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-12 14:01:02 UTC (rev 11112) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2008-11-12 14:34:00 UTC (rev 11113) @@ -29,7 +29,9 @@ public class OrderingListTest extends SeleniumTestBase { private String initMethod = "#{orderingListBean.init}"; - + + private String inputTextId; + private String orderingListId; private String submitId; @@ -72,7 +74,24 @@ private String renderedId; - /** + private String immediateId; + + /** + * immediate = true component works respectively + */ + @Test + public void testImmediate(Template template) { + renderPage(template, initMethod); + initFields(); + selenium.type(inputTextId, ""); + clickAjaxCommandAndWait(getParentId() + "testRequiredAndImmediate:submit"); + Assert.assertEquals(selenium.getText(messagesId), "Input is required"); + clickAjaxCommandAndWait(immediateId); + clickAjaxCommandAndWait(getParentId() + "testRequiredAndImmediate:submit"); + Assert.assertFalse("Input is required".equals(selenium.getText(messagesId))); + } + + /** * component with rendered = false is not present on the page */ @Test @@ -197,7 +216,7 @@ renderPage(template); initFields(); Assert.assertTrue(selenium.getText(messagesId).length() == 0); - clickAjaxCommandAndWait(getParentId() + "testRequired:submit"); + clickAjaxCommandAndWait(getParentId() + "testRequiredAndImmediate:submit"); Assert.assertFalse(selenium.getText(messagesId).length() == 0); } @@ -339,6 +358,7 @@ private void initFields() { String formId = getParentId() + "_form:"; String attrFormId = getParentId() + "attrFormId"; + inputTextId = getParentId() + "testRequiredAndImmediate:inputTextId"; orderingListId = formId + "orderingList"; submitId = formId + "submitId"; firstButton = orderingListId + "first"; @@ -365,6 +385,7 @@ orderControlsVisibleId = attrFormId + ":orderControlsVisibleId"; showButtonLabelsId = attrFormId + ":showButtonLabelsId"; renderedId = attrFormId + ":renderedId"; + immediateId = attrFormId + ":immediateId"; } public String getTestUrl() {