Author: konstantin.mishin Date: 2008-11-05 13:52:26 -0500 (Wed, 05 Nov 2008) New Revision: 11037 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-4840 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:32:30 UTC (rev 11036) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/OrderingListTestBean.java 2008-11-05 18:52:26 UTC (rev 11037) @@ -39,6 +39,7 @@ private Object activeItem; private Boolean orderControlsVisible; + private Boolean showButtonLabels; public OrderingListTestBean() { init(); @@ -52,6 +53,7 @@ } selection = new HashSet<Item>(); orderControlsVisible = true; + showButtonLabels = true; } public Object getActionResult() { @@ -112,6 +114,15 @@ } + public void setShowButtonLabels(Boolean showButtonsLabel) { + this.showButtonLabels = showButtonsLabel; + } + + public Boolean getShowButtonLabels() { + return showButtonLabels; + } + + 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-05 18:32:30 UTC (rev 11036) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/OrderingListTest.java 2008-11-05 18:52:26 UTC (rev 11037) @@ -68,6 +68,8 @@ private String orderControlsVisibleId; + private String showButtonLabelsId; + /** * Check 'fastOrderControlsVisible' and 'orderControlsVisible' attributes */ @@ -88,6 +90,25 @@ } /** + * Check Check 'showButtonsLabel' attribute + */ + @Test + public void testShowButtonsLabel(Template template) { + renderPage(template, initMethod); + initFields(); + Assert.assertTrue(selenium.getText(firstButtonDisabled).length()!=0); + Assert.assertTrue(selenium.getText(upButtonDisabled).length()!=0); + Assert.assertTrue(selenium.getText(downButtonDisabled).length()!=0); + Assert.assertTrue(selenium.getText(lastButtonDisabled).length()!=0); + clickAjaxCommandAndWait(showButtonLabelsId); + clickAjaxCommandAndWait(submitId); + Assert.assertFalse(selenium.getText(firstButtonDisabled).length()!=0); + Assert.assertFalse(selenium.getText(upButtonDisabled).length()!=0); + Assert.assertFalse(selenium.getText(downButtonDisabled).length()!=0); + Assert.assertFalse(selenium.getText(lastButtonDisabled).length()!=0); + } + + /** * 'required' and 'requiredMessage' attributes work */ @Test @@ -252,6 +273,7 @@ server = orderingListId + ":1:_server"; messagesId = formId + "messages"; orderControlsVisibleId = attrFormId + ":orderControlsVisibleId"; + showButtonLabelsId = attrFormId + ":showButtonLabelsId"; } public String getTestUrl() {