[richfaces-svn-commits] JBoss Rich Faces SVN: r12643 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/listShuttle and 1 other directories.

Author: konstantin.mishin Date: 2009-02-12 11:06:24 -0500 (Thu, 12 Feb 2009) New Revision: 12643 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ListShuttleBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle/listShuttleTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java Log: RF-4711 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ListShuttleBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ListShuttleBean.java 2009-02-12 15:06:19 UTC (rev 12642) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ListShuttleBean.java 2009-02-12 16:06:24 UTC (rev 12643) @@ -53,7 +53,8 @@ private boolean valueChangeListener; private boolean attrValidator; private boolean tagValidator; - + private Boolean renderControlFacet; + public ListShuttleBean() { init(); } @@ -79,6 +80,7 @@ freeItems.add(item); } controlsVisible = true; + renderControlFacet = false; } public void hide(ActionEvent event) { @@ -238,4 +240,12 @@ public boolean isTagValidator() { return tagValidator; } + + public void setRenderControlFacet(Boolean renderControlFacet) { + this.renderControlFacet = renderControlFacet; + } + + public Boolean getRenderControlFacet() { + return renderControlFacet; + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/listShuttle/listShuttleTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2009-02-12 15:06:19 UTC (rev 12642) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2009-02-12 16:06:24 UTC (rev 12643) @@ -100,6 +100,8 @@ String tagValidatorId; + String renderControlFacet; + private void init(Template template) { renderPage(template, initMethod); parentId = getParentId() + "_form:"; @@ -132,6 +134,7 @@ immediateId = attrFormId + ":immediateId"; attrValidatorId = attrFormId + ":attrValidatorId"; tagValidatorId = attrFormId + ":tagValidatorId"; + renderControlFacet = attrFormId + ":renderControlFacet"; } /** @@ -163,18 +166,33 @@ @Test public void testControlFacets(Template template) { init(template); - String orderingListId = getParentId() + "testControlFacets"; - Assert.assertTrue(selenium.isElementPresent(orderingListId + ":topControlFacet")); - Assert.assertTrue(selenium.isElementPresent(orderingListId + ":topControlDisabledFacet")); - Assert.assertTrue(selenium.isElementPresent(orderingListId + ":bottomControlFacet")); - Assert.assertTrue(selenium.isElementPresent(orderingListId + ":bottomControlDisabledFacet")); - Assert.assertTrue(selenium.isElementPresent(orderingListId + ":upControlFacet")); - Assert.assertTrue(selenium.isElementPresent(orderingListId + ":upControlDisabledFacet")); - Assert.assertTrue(selenium.isElementPresent(orderingListId + ":downControlFacet")); - Assert.assertTrue(selenium.isElementPresent(orderingListId + ":downControlDisabledFacet")); - _checkVisibility(false); + clickAjaxCommandAndWait(renderControlFacet); + _selectItem(parentId + "ls:1"); + _checkControlFacet("copyAll", true); + _checkControlFacet("copy", true); + _checkControlFacet("removeAll", false); + _checkControlFacet("remove", false); + _checkControlFacet("top", false); + _checkControlFacet("bottom", false); + _checkControlFacet("up", false); + _checkControlFacet("down", false); + selenium.click(lsId + ":copyAllControlFacet"); + _selectItem(parentId + "ls:1"); + _checkControlFacet("copyAll", false); + _checkControlFacet("copy", false); + _checkControlFacet("removeAll", true); + _checkControlFacet("remove", true); + _checkControlFacet("top", true); + _checkControlFacet("bottom", true); + _checkControlFacet("up", true); + _checkControlFacet("down", true); } + private void _checkControlFacet(String facet, boolean enabled) { + Assert.assertEquals(selenium.isVisible(lsId + ":" + facet + "ControlFacet"), enabled); + Assert.assertEquals(selenium.isVisible(lsId + ":" + facet + "ControlDisabledFacet"), !enabled); + } + /** * check internationalization */