Author: andrei_exadel Date: 2008-11-05 10:18:00 -0500 (Wed, 05 Nov 2008) New Revision: 11029 Removed: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuDescription.xhtml Modified: 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/AutoTester.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 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/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-05 11:02:27 UTC (rev 11028) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml 2008-11-05 15:18:00 UTC (rev 11029) @@ -11,15 +11,18 @@ <rich:contextMenu id="componentId" immediate="#{autoTestBean.immediate}" ajaxSingle="#{autoTestBean.ajaxSingle}" - reRender="#{autoTestBean.reRender}" + limitToList="#{autoTestBean.limitToList}" bypassUpdates="#{autoTestBean.bypassUpdate}" rendered="#{autoTestBean.rendered}" - oncomplete="#{autoTestBean.oncomplete}" - submitMode="#{contextMenuBean.submitMode}" + submitMode="ajax" - <rich:menuItem id="item1" actionListener="#{autoTestBean.actionListener}" value="Item1" /> + <rich:menuItem id="item1" + actionListener="#{autoTestBean.actionListener}" + value="Item1" + oncomplete="#{autoTestBean.oncomplete}" /> <f:param name="parameter1" value="value1" /> + <f:param name="parameter2" value="value2" /> </rich:contextMenu> <a href="#" id="showMenu" onclick="$(getParentId() + 'autoTestForm:componentId').component.show(event)">Show</a> <a href="#" onclick="$(getParentId() + 'autoTestForm:componentId').component.hide()">Hide</a> Deleted: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuDescription.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-11-05 11:02:27 UTC (rev 11028) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2008-11-05 15:18:00 UTC (rev 11029) @@ -83,7 +83,7 @@ "ReRender attribute does not work"); String oncomplete = base.runScript("window._ajaxOncomplete"); - Assert.assertEquals("true", oncomplete, "Oncomplete attribute does not work."); + Assert.assertEquals(oncomplete,"true", "Oncomplete attribute does not work."); } public void testActionListener() { Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-11-05 11:02:27 UTC (rev 11028) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-11-05 15:18:00 UTC (rev 11029) @@ -494,7 +494,7 @@ */ public void AssertTextNotEquals(String id, String value) { String _v = getTextById(id); - Assert.assertNotSame(_v, value); + Assert.assertFalse(value.equals(_v)); } /** @@ -508,7 +508,7 @@ */ public void AssertTextNotEquals(String id, String value, String message) { String _v = getTextById(id); - Assert.assertNotSame(_v, value, message); + Assert.assertFalse(value.equals(_v), message); } /** 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-05 11:02:27 UTC (rev 11028) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2008-11-05 15:18:00 UTC (rev 11029) @@ -21,7 +21,11 @@ package org.richfaces.testng; +import java.util.HashMap; +import java.util.Map; + import org.ajax4jsf.template.Template; +import org.richfaces.AutoTester; import org.richfaces.SeleniumTestBase; import org.testng.Assert; import org.testng.annotations.Test; @@ -33,7 +37,6 @@ static final String UNATTACHED_CONTEXTMENU = "contextMenu"; static final String RESET_METHOD = "#{contextMenuBean.reset}"; - String linkShowId; String linkHideId; String componentControlShowLinkId; @@ -59,7 +62,28 @@ return "pages/contextMenu/contextMenuAutoTest.xhtml"; } + @Override + public void sendAjax() { + String showId = "showMenu"; + String contextMenuId = getAutoTester(this). + getClientId(AutoTester.COMPONENT_ID, getTemplate()); + String itemId = getAutoTester(this). + getClientId("item1", getTemplate()); + clickById(showId); + waitForMenuShow(contextMenuId); + clickAjaxCommandAndWait(itemId); + + } + + + @Test + public void testRendered(Template template) { + AutoTester autoTester = getAutoTester(this); + autoTester.renderPage(template, RESET_METHOD); + autoTester.testRendered(); + } + @Test public void testActionListener(Template template) { renderPage(template, RESET_METHOD); @@ -112,7 +136,7 @@ AssertPresent(contextMenuBody, "Context menu has not been shown"); } - @Test + @Test public void testSubmitMode(Template template) { renderPage(template, RESET_METHOD); initIds(getParentId(), UNATTACHED_CONTEXTMENU); @@ -143,7 +167,7 @@ } - @Test + @Test public void testContextMenuRendering(Template template) { renderPage(template, RESET_METHOD);