Author: konstantin.mishin Date: 2008-11-05 13:32:30 -0500 (Wed, 05 Nov 2008) New Revision: 11036 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 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-4839 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-05 18:28:56 UTC (rev 11035) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java 2008-11-05 18:32:30 UTC (rev 11036) @@ -38,13 +38,20 @@ private Collection<Item> selection; private Object activeItem; + private Boolean orderControlsVisible; + public OrderingListTestBean() { + init(); + } + + public void init() { converter = new ItemConverter(); items = new ArrayList<Item>(); for (int i = 0; i < 4; i++) { items.add(new Item("item" + i)); } selection = new HashSet<Item>(); + orderControlsVisible = true; } public Object getActionResult() { @@ -96,6 +103,15 @@ } + public void setOrderControlsVisible(Boolean orderControlsVisible) { + this.orderControlsVisible = orderControlsVisible; + } + + public Boolean getOrderControlsVisible() { + return orderControlsVisible; + } + + private class ItemConverter implements Converter { /* (non-Javadoc) 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 2008-11-05 18:28:56 UTC (rev 11035) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2008-11-05 18:32:30 UTC (rev 11036) @@ -144,7 +144,7 @@ <managed-bean> <managed-bean-name>orderingListBean</managed-bean-name> <managed-bean-class>org.ajax4jsf.bean.OrderingListTestBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> + <managed-bean-scope>session</managed-bean-scope> </managed-bean> <managed-bean> <managed-bean-name>dataTableBean</managed-bean-name> 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-05 18:28:56 UTC (rev 11035) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2008-11-05 18:32:30 UTC (rev 11036) @@ -28,8 +28,12 @@ public class OrderingListTest extends SeleniumTestBase { - private String orderingListId; + private String initMethod = "#{orderingListBean.init}"; + private String orderingListId; + + private String submitId; + private String firstButton; private String firstButtonDisabled; @@ -62,7 +66,28 @@ private String messagesId; + private String orderControlsVisibleId; + /** + * Check 'fastOrderControlsVisible' and 'orderControlsVisible' attributes + */ + @Test + public void testOrderControlsVisible(Template template) { + renderPage(template, initMethod); + initFields(); + Assert.assertTrue(selenium.isElementPresent(firstButtonDisabled)); + Assert.assertTrue(selenium.isElementPresent(upButtonDisabled)); + Assert.assertTrue(selenium.isElementPresent(downButtonDisabled)); + Assert.assertTrue(selenium.isElementPresent(lastButtonDisabled)); + clickAjaxCommandAndWait(orderControlsVisibleId); + clickAjaxCommandAndWait(submitId); + Assert.assertFalse(selenium.isElementPresent(firstButtonDisabled)); + Assert.assertFalse(selenium.isElementPresent(upButtonDisabled)); + Assert.assertFalse(selenium.isElementPresent(downButtonDisabled)); + Assert.assertFalse(selenium.isElementPresent(lastButtonDisabled)); + } + + /** * 'required' and 'requiredMessage' attributes work */ @Test @@ -115,7 +140,7 @@ @Test public void testActions(Template template) { - renderPage(template); + renderPage(template, initMethod); initFields(); writeStatus("Select two rows"); @@ -202,8 +227,9 @@ private void initFields() { String formId = getParentId() + "_form:"; + String attrFormId = getParentId() + "attrFormId"; orderingListId = formId + "orderingList"; - + submitId = formId + "submitId"; firstButton = orderingListId + "first"; firstButtonDisabled = orderingListId + "disfirst"; @@ -225,6 +251,7 @@ ajax = firstRow + ":_ajax"; server = orderingListId + ":1:_server"; messagesId = formId + "messages"; + orderControlsVisibleId = attrFormId + ":orderControlsVisibleId"; } public String getTestUrl() {