Author: andrei_exadel Date: 2008-10-29 06:18:42 -0400 (Wed, 29 Oct 2008) New Revision: 10961 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ContextMenuTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenu.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java Log: RF-4766 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ContextMenuTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ContextMenuTestBean.java 2008-10-28 18:45:15 UTC (rev 10960) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ContextMenuTestBean.java 2008-10-29 10:18:42 UTC (rev 10961) @@ -28,6 +28,7 @@ private String value; private int value2; + public ContextMenuTestBean() { value = ""; value2 = 0; @@ -61,5 +62,14 @@ public void setValue2(int value2) { this.value2 = value2; } + + public String getMessage3() { + return "Menu3"; + } + + public String getMessage4() { + return "Menu4"; + } + } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenu.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2008-10-28 18:45:15 UTC (rev 10960) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2008-10-29 10:18:42 UTC (rev 10961) @@ -28,31 +28,89 @@ public class ContextMenuTest extends SeleniumTestBase { + static final String FORMID = "_form:"; + static final String UNATTACHED_CONTEXTMENU = "contextMenu"; + String linkShowId; + String linkHideId; + String componentControlShowLinkId; + String componentControlHideLinkId; + String contextMenuId; + String autoCreatedId; + String contextMenuBody; + void initIds(String parentId, String contextMenuId) { + parentId = getParentId() + FORMID; + linkShowId = "showMenu"; + linkHideId = "hideMenu"; + componentControlShowLinkId = parentId + linkShowId; + componentControlHideLinkId = parentId + linkHideId; + contextMenuId = parentId + contextMenuId; + autoCreatedId = contextMenuId + ":_auto_created"; + contextMenuBody = contextMenuId + "_menu"; + } + + @Test public void testContextMenuStandAlone(Template template) { renderPage(template); - String parentId = getParentId() + "_form:"; - String contextMenuId = parentId + "contextMenu"; - String menuItemId = parentId + "item1"; - String autoCreatedId = contextMenuId + ":_auto_created"; + initIds(getParentId(), UNATTACHED_CONTEXTMENU); - String linkId = "showMenu"; + String menuItemId = getParentId() + FORMID + "item2"; + + AssertNotPresent(menuItemId, "Context menu should be hidden"); + AssertNotPresent(autoCreatedId, "Context menu should be hidden"); + + clickById(linkShowId); + + AssertPresent(menuItemId, "Context menu has not been shown"); + AssertPresent(autoCreatedId, "Context menu has not been shown"); + AssertTextEquals(menuItemId, "Menu2", "Context menu displays incorrect."); + + clickById(linkHideId); + + AssertNotVisible(contextMenuBody, "Context menu has not been hidden"); + } + + @Test + public void testComponentControlManagement(Template template) { + renderPage(template); + initIds(getParentId(), UNATTACHED_CONTEXTMENU); + + String menuItemId = getParentId() + FORMID + "item2"; + AssertNotPresent(menuItemId, "Context menu should be hidden"); AssertNotPresent(autoCreatedId, "Context menu should be hidden"); - clickById(linkId); + clickById(componentControlShowLinkId); AssertPresent(menuItemId, "Context menu has not been shown"); AssertPresent(autoCreatedId, "Context menu has not been shown"); - AssertTextEquals(menuItemId, "Menu1", "Context menu displays incorrect."); + AssertTextEquals(menuItemId, "Menu2", "Context menu displays incorrect."); - menuItemId = parentId + "item2"; - AssertTextEquals(menuItemId, "Menu2", "Macrosubstitution does not work."); + clickById(componentControlHideLinkId); + AssertNotVisible(contextMenuBody, "Context menu has not been hidden"); } + + @Test + public void testMacrodefinitions(Template template) { + renderPage(template); + initIds(getParentId(), UNATTACHED_CONTEXTMENU); + String menuItemId = getParentId() + FORMID + "item1"; + + clickById(linkShowId); + + AssertTextEquals(menuItemId, "Menu1", "Macrosubstitution does not work."); + + clickById(componentControlShowLinkId); + menuItemId = getParentId() + FORMID + "item3"; + AssertTextEquals(menuItemId, "Menu3", "Macrosubstitution does not work."); + menuItemId = getParentId() + FORMID + "item4"; + AssertTextEquals(menuItemId, "Menu4", "Macrosubstitution does not work."); + + } //@Test public void testContextMenuComponent(Template template) {