Author: andrei_exadel Date: 2008-11-06 06:53:32 -0500 (Thu, 06 Nov 2008) New Revision: 11042 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/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java Log: Context Menu test 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-11-06 08:27:13 UTC (rev 11041) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/ContextMenuTestBean.java 2008-11-06 11:53:32 UTC (rev 11042) @@ -35,6 +35,7 @@ private String submitMode = "none"; private Boolean attached = false; private String attacheTo = ""; + private Boolean disableDefault = true; public ContextMenuTestBean() { value = ""; @@ -68,6 +69,11 @@ attached = true; return null; } + + public String testDisableDefault() { + disableDefault = false; + return null; + } public String getValue() { return value; @@ -95,6 +101,7 @@ attached = false; attacheTo = ""; status = null; + disableDefault = true; } public int getValue2() { @@ -170,4 +177,18 @@ this.status = status; } + /** + * @return the disableDefault + */ + public Boolean getDisableDefault() { + return disableDefault; + } + + /** + * @param disableDefault the disableDefault to set + */ + public void setDisableDefault(Boolean disableDefault) { + this.disableDefault = disableDefault; + } + } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenu.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml 2008-11-06 08:27:13 UTC (rev 11041) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml 2008-11-06 11:53:32 UTC (rev 11042) @@ -11,14 +11,14 @@ <rich:contextMenu id="componentId" immediate="#{autoTestBean.immediate}" ajaxSingle="#{autoTestBean.ajaxSingle}" - + reRender="#{autoTestBean.reRender}" limitToList="#{autoTestBean.limitToList}" bypassUpdates="#{autoTestBean.bypassUpdate}" + actionListener="#{autoTestBean.actionListener}" rendered="#{autoTestBean.rendered}" submitMode="ajax" <rich:menuItem id="item1" - actionListener="#{autoTestBean.actionListener}" value="Item1" oncomplete="#{autoTestBean.oncomplete}" /> <f:param name="parameter1" value="value1" /> 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-11-06 08:27:13 UTC (rev 11041) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2008-11-06 11:53:32 UTC (rev 11042) @@ -44,6 +44,12 @@ String contextMenuId; String autoCreatedId; String contextMenuBody; + + final static Map<String, String> PARAMS = new HashMap<String, String>(); + static { + PARAMS.put("parameter1", "value1"); + PARAMS.put("parameter2", "value2"); + } void initIds(String parentId, String contextMenuId) { parentId = getParentId() + FORMID; @@ -75,8 +81,56 @@ } + @Test + public void testLimitToList(Template template) { + AutoTester autoTester = getAutoTester(this); + autoTester.renderPage(template, RESET_METHOD); + + autoTester.testLimitToList(); + } @Test + public void testByPassUpdate(Template template) { + AutoTester autoTester = getAutoTester(this); + autoTester.renderPage(template, RESET_METHOD); + + autoTester.testBypassUpdate(); + } + + @Test + public void testReRender(Template template) { + AutoTester autoTester = getAutoTester(this); + autoTester.renderPage(template, RESET_METHOD); + + autoTester.testReRender(); + } + + @Test + public void testNestedParams(Template template) { + AutoTester autoTester = getAutoTester(this); + autoTester.renderPage(template, RESET_METHOD); + + autoTester.testRequestParameters(PARAMS); + } + + @Test + public void testDisableDefault(Template template) { + renderPage(template, RESET_METHOD); + initIds(getParentId(), "contextMenu2"); + + String menuScript = getContextMenuScript(contextMenuId); + Assert.assertTrue(menuScript.indexOf("Richfaces.disableDefaultHandler") != -1, "DisableDefaultMenu = true does not work"); + + String controlId = getParentId() + "_controls:testDisableDefault"; + clickCommandAndWait(controlId); + + menuScript = getContextMenuScript(contextMenuId); + Assert.assertTrue(menuScript.indexOf("Richfaces.disableDefaultHandler") == -1, "DisableDefaultMenu = false does not work"); + + } + + + @Test public void testRendered(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -256,8 +310,13 @@ Assert.fail(message + e.getMessage()); } } + + private String getContextMenuScript(String id) { + return getHTMLById(id); + + } - @Test + @Test public void testContextMenuStandAlone(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); @@ -279,7 +338,7 @@ AssertNotVisible(contextMenuBody, "Context menu has not been hidden"); } - @Test + @Test public void testComponentControlManagement(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); @@ -301,7 +360,7 @@ AssertNotVisible(contextMenuBody, "Context menu has not been hidden"); } - @Test + @Test public void testMacrodefinitions(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU);