Author: andrei_exadel Date: 2008-04-29 07:43:56 -0400 (Tue, 29 Apr 2008) New Revision: 8280 Modified: trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml trunk/test-applications/seleniumTest/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java Log: Panel Menu test refactoring Modified: trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml =================================================================== --- trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-04-29 10:38:06 UTC (rev 8279) +++ trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-04-29 11:43:56 UTC (rev 8280) @@ -64,7 +64,7 @@ <div id="_Selenium_Test_ControlPoint1" style="display: none;">Control1</div> <h:panelGrid id="_Selenium_Test_Common_Grid"> <div> - <b>Status: </b> <input style="border: 0px; color: black" id="_Selenium_Test_Status_Message" /> + <b>Status: </b> <input style="border: 0px; color: black; width: 500px" id="_Selenium_Test_Status_Message" /> </div> <br/> <div> Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml 2008-04-29 10:38:06 UTC (rev 8279) +++ trunk/test-applications/seleniumTest/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml 2008-04-29 11:43:56 UTC (rev 8280) @@ -6,7 +6,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:composition template="../../layout/template.xhtml"> +<ui:composition template="#{templateBean.template}"> <ui:define name="style"> .link {margin: 0px 5px} @@ -15,7 +15,8 @@ margin: 2px; } </ui:define> - <ui:define name="component"> + <ui:define name="component"> + <h:form id="_form"> <h:panelGroup layout="block" styleClass="component_div" > <b>Multiple</b> <rich:panelMenu id="pMenu" > @@ -86,9 +87,7 @@ <h:inputText value="#{panelBean.value}" id="_value"></h:inputText> <h:outputText value="#{panelBean.value2}" id="_value2"></h:outputText> <br/> + </h:form> </ui:define> - <ui:define name="description"> - <ui:include src="panelMenuDescription.xhtml" /> - </ui:define> </ui:composition> </html> \ No newline at end of file Modified: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-04-29 10:38:06 UTC (rev 8279) +++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-04-29 11:43:56 UTC (rev 8280) @@ -1,6 +1,5 @@ package org.ajax4jsf.test.base; -import sun.java2d.pipe.SpanShapeRenderer.Simple; public class Templates { @@ -31,10 +30,8 @@ public void loadTemplate(SeleniumTestBase test) { setParentId(test); - if (!this.equals(SIMPLE)) { - test.runScript("loadTemplate('" + template + "');", false); - test.waitForPageToLoad(); - } + test.runScript("loadTemplate('" + template + "');", false); + test.waitForPageToLoad(); } public boolean equals(Object obj) { Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java 2008-04-29 10:38:06 UTC (rev 8279) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java 2008-04-29 11:43:56 UTC (rev 8280) @@ -1,203 +1,224 @@ -package org.richfaces; - -import org.ajax4jsf.test.base.RichSeleniumTest; -import org.ajax4jsf.test.base.SeleniumTestBase; -import org.testng.Assert; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import com.thoughtworks.selenium.SeleniumException; - -public class PanelMenuTest extends SeleniumTestBase implements RichSeleniumTest { - - public PanelMenuTest() { - super("http", "localhost", "8080"); - } - - /** - * This method are invoking before selenium tests started - */ - @BeforeTest - @Parameters( { "browser" }) - public void startSelenium(String browser) { - super.startSelenium(browser); - } - - /** - * This method are invoking after selenium tests completed - */ - @AfterTest - public void stopSelenium() { - super.stopSelenium(); - } - - @Test - public void testPanelMenuComponent() throws Exception { - renderPage("/faces/pages/panelMenu/panelMenuTest.xhtml"); - -// _testPanelMenuComponent(COMPONENT_PREFIX_SIMPLE); -// _testPanelMenuComponent(COMPONENT_PREFIX_INSIDE_TABLE); -// -// _testPanelMenuComponentSingleMode(COMPONENT_PREFIX_SIMPLE); -// _testPanelMenuComponentSingleMode(COMPONENT_PREFIX_INSIDE_TABLE); -// -// _testPanelMenuItemAction(COMPONENT_PREFIX_SIMPLE); -// _testPanelMenuItemAction(COMPONENT_PREFIX_INSIDE_TABLE); - } - - private void _testPanelMenuComponent(String parentId) { - String inputId = parentId + "_value"; - String outputId = parentId + "_value2"; - - String ajaxGroup = "tablehide" + parentId + "pGroup1"; - String serverGroup = "tablehide" + parentId + "pGroup2"; - String clientGroup = "tablehide" + parentId + "pGroup3"; - String disabledGroup = "tablehide" + parentId + "pGroup4"; - - String ajaxItem = "tablehide" + parentId + "pItem1"; - String serverItem = "tablehide" + parentId + "pItem2"; - String clientItem = "tablehide" + parentId + "pItem3"; - String disabledItem = "tablehide" + parentId + "pItem4"; - - clickById(ajaxGroup); - waitForAjaxCompletion(); - AssertValueEquals(inputId, "pGroup1"); - AssertTextEquals(outputId, "1"); - Assert.assertTrue(isVisibleById(ajaxItem)); - Assert.assertFalse(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(serverGroup); - waitForPageToLoad(); - AssertValueEquals(inputId, "pGroup2"); - AssertTextEquals(outputId, "2"); - Assert.assertTrue(isVisibleById(ajaxItem)); - Assert.assertTrue(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(ajaxGroup); - waitForAjaxCompletion(); - AssertValueEquals(inputId, "pGroup1"); - AssertTextEquals(outputId, "3"); - Assert.assertFalse(isVisibleById(ajaxItem)); - Assert.assertTrue(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(serverGroup); - waitForPageToLoad(); - AssertValueEquals(inputId, "pGroup2"); - AssertTextEquals(outputId, "4"); - Assert.assertFalse(isVisibleById(ajaxItem)); - Assert.assertFalse(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(clientGroup); - Assert.assertFalse(isVisibleById(ajaxItem)); - Assert.assertFalse(isVisibleById(serverItem)); - Assert.assertTrue(isVisibleById(clientItem)); - - clickById(clientGroup); - Assert.assertFalse(isVisibleById(ajaxItem)); - Assert.assertFalse(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(disabledGroup); - Assert.assertFalse(isVisibleById(disabledItem)); - } - - private void _testPanelMenuComponentSingleMode(String parentId) { - String inputId = parentId + "_value"; - String outputId = parentId + "_value2"; - - String ajaxGroup = "tablehide" + parentId + "pGroup1_single"; - String serverGroup = "tablehide" + parentId + "pGroup2_single"; - String clientGroup = "tablehide" + parentId + "pGroup3_single"; - String disabledGroup = "tablehide" + parentId + "pGroup4_single"; - - String ajaxItem = "tablehide" + parentId + "pItem1_single"; - String serverItem = "tablehide" + parentId + "pItem2_single"; - String clientItem = "tablehide" + parentId + "pItem3_single"; - String disabledItem = "tablehide" + parentId + "pItem4_single"; - - clickById(ajaxGroup); - waitForAjaxCompletion(); - AssertValueEquals(inputId, "pGroup1_single"); - AssertTextEquals(outputId, "1"); - Assert.assertTrue(isVisibleById(ajaxItem)); - Assert.assertFalse(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(serverGroup); - waitForPageToLoad(); - AssertValueEquals(inputId, "pGroup2_single"); - AssertTextEquals(outputId, "2"); - Assert.assertFalse(isVisibleById(ajaxItem)); - Assert.assertTrue(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(ajaxGroup); - waitForAjaxCompletion(); - AssertValueEquals(inputId, "pGroup1_single"); - AssertTextEquals(outputId, "3"); - Assert.assertTrue(isVisibleById(ajaxItem)); - Assert.assertFalse(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(serverGroup); - waitForPageToLoad(); - AssertValueEquals(inputId, "pGroup2_single"); - AssertTextEquals(outputId, "4"); - Assert.assertFalse(isVisibleById(ajaxItem)); - Assert.assertTrue(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(clientGroup); - Assert.assertFalse(isVisibleById(ajaxItem)); - Assert.assertFalse(isVisibleById(serverItem)); - Assert.assertTrue(isVisibleById(clientItem)); - - clickById(clientGroup); - Assert.assertFalse(isVisibleById(ajaxItem)); - Assert.assertFalse(isVisibleById(serverItem)); - Assert.assertFalse(isVisibleById(clientItem)); - - clickById(disabledGroup); - Assert.assertFalse(isVisibleById(disabledItem)); - } - - private void _testPanelMenuItemAction(String parentId) { - String inputId = parentId + "_value"; - String outputId = parentId + "_value2"; - - String group = "tablehide" + parentId + "pGroup1"; - String groupSingle = "tablehide" + parentId + "pGroup1_single"; - - String item = "tablehide" + parentId + "pItem1"; - String itemSingle = "tablehide" + parentId + "pItem1_single"; - - clickById(group); - waitForAjaxCompletion(); - AssertValueEquals(inputId, "pGroup1"); - - clickById(groupSingle); - waitForAjaxCompletion(); - AssertValueEquals(inputId, "pGroup1_single"); - - clickById(item); - waitForPageToLoad(); - AssertValueEquals(inputId, "pItem1"); - AssertTextEquals(outputId, "1"); - - clickById(itemSingle); - waitForPageToLoad(); - AssertValueEquals(inputId, "pItem1_single"); - AssertTextEquals(outputId, "2"); - } - - public String getTestUrl() { - return null; - } - -} +package org.richfaces; + +import org.ajax4jsf.test.base.RichSeleniumTest; +import org.ajax4jsf.test.base.SeleniumTestBase; +import org.ajax4jsf.test.base.Templates; +import org.testng.Assert; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +public class PanelMenuTest extends SeleniumTestBase implements RichSeleniumTest { + + public PanelMenuTest() { + super("http", "localhost", "8080"); + } + + /** + * This method are invoking before selenium tests started + */ + @BeforeTest + @Parameters( { "browser" }) + public void startSelenium(String browser) { + super.startSelenium(browser); + } + + /** + * This method are invoking after selenium tests completed + */ + @AfterTest + public void stopSelenium() { + super.stopSelenium(); + } + + @Test + public void testPanelMenuComponent() throws Exception { + + _testPanelMenuComponent(Templates.SIMPLE); + _testPanelMenuComponent(Templates.DATATABLE); + + _testPanelMenuComponentSingleMode(Templates.SIMPLE); + _testPanelMenuComponentSingleMode(Templates.DATATABLE); + + _testPanelMenuItemAction(Templates.SIMPLE); + _testPanelMenuItemAction(Templates.DATATABLE); + + } + + private void _testPanelMenuComponent(Templates template) { + renderPage(getTestUrl(), template); + String parentId = getParentId() + "_form:"; + + String inputId = parentId + "_value"; + String outputId = parentId + "_value2"; + + String ajaxGroup = "tablehide" + parentId + "pGroup1"; + String serverGroup = "tablehide" + parentId + "pGroup2"; + String clientGroup = "tablehide" + parentId + "pGroup3"; + String disabledGroup = "tablehide" + parentId + "pGroup4"; + + String ajaxItem = "tablehide" + parentId + "pItem1"; + String serverItem = "tablehide" + parentId + "pItem2"; + String clientItem = "tablehide" + parentId + "pItem3"; + String disabledItem = "tablehide" + parentId + "pItem4"; + + writeStatus("Click on ajax group"); + clickById(ajaxGroup); + waitForAjaxCompletion(); + AssertValueEquals(inputId, "pGroup1"); + AssertTextEquals(outputId, "1"); + Assert.assertTrue(isVisibleById(ajaxItem)); + Assert.assertFalse(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on server group"); + clickCommandAndWait(serverGroup); + AssertValueEquals(inputId, "pGroup2"); + AssertTextEquals(outputId, "2"); + Assert.assertTrue(isVisibleById(ajaxItem)); + Assert.assertTrue(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on ajax group"); + clickById(ajaxGroup); + waitForAjaxCompletion(); + AssertValueEquals(inputId, "pGroup1"); + AssertTextEquals(outputId, "3"); + Assert.assertFalse(isVisibleById(ajaxItem)); + Assert.assertTrue(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on server group"); + clickCommandAndWait(serverGroup); + + AssertValueEquals(inputId, "pGroup2"); + AssertTextEquals(outputId, "4"); + Assert.assertFalse(isVisibleById(ajaxItem)); + Assert.assertFalse(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on client group"); + clickById(clientGroup); + Assert.assertFalse(isVisibleById(ajaxItem)); + Assert.assertFalse(isVisibleById(serverItem)); + Assert.assertTrue(isVisibleById(clientItem)); + + writeStatus("Click on client group"); + clickById(clientGroup); + Assert.assertFalse(isVisibleById(ajaxItem)); + Assert.assertFalse(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on disabled client group"); + clickById(disabledGroup); + Assert.assertFalse(isVisibleById(disabledItem)); + } + + private void _testPanelMenuComponentSingleMode(Templates template) { + renderPage(getTestUrl(), template); + String parentId = getParentId() + "_form:"; + + String inputId = parentId + "_value"; + String outputId = parentId + "_value2"; + + String ajaxGroup = "tablehide" + parentId + "pGroup1_single"; + String serverGroup = "tablehide" + parentId + "pGroup2_single"; + String clientGroup = "tablehide" + parentId + "pGroup3_single"; + String disabledGroup = "tablehide" + parentId + "pGroup4_single"; + + String ajaxItem = "tablehide" + parentId + "pItem1_single"; + String serverItem = "tablehide" + parentId + "pItem2_single"; + String clientItem = "tablehide" + parentId + "pItem3_single"; + String disabledItem = "tablehide" + parentId + "pItem4_single"; + + writeStatus("Click on ajax group"); + clickById(ajaxGroup); + waitForAjaxCompletion(); + AssertValueEquals(inputId, "pGroup1_single"); + AssertTextEquals(outputId, "1"); + Assert.assertTrue(isVisibleById(ajaxItem)); + Assert.assertFalse(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on server group"); + clickCommandAndWait(serverGroup); + AssertValueEquals(inputId, "pGroup2_single"); + AssertTextEquals(outputId, "2"); + Assert.assertFalse(isVisibleById(ajaxItem)); + Assert.assertTrue(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on ajax group"); + clickById(ajaxGroup); + waitForAjaxCompletion(); + AssertValueEquals(inputId, "pGroup1_single"); + AssertTextEquals(outputId, "3"); + Assert.assertTrue(isVisibleById(ajaxItem)); + Assert.assertFalse(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on server group"); + clickCommandAndWait(serverGroup); + AssertValueEquals(inputId, "pGroup2_single"); + AssertTextEquals(outputId, "4"); + Assert.assertFalse(isVisibleById(ajaxItem)); + Assert.assertTrue(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on client group"); + clickById(clientGroup); + Assert.assertFalse(isVisibleById(ajaxItem)); + Assert.assertFalse(isVisibleById(serverItem)); + Assert.assertTrue(isVisibleById(clientItem)); + + writeStatus("Click on client group"); + clickById(clientGroup); + Assert.assertFalse(isVisibleById(ajaxItem)); + Assert.assertFalse(isVisibleById(serverItem)); + Assert.assertFalse(isVisibleById(clientItem)); + + writeStatus("Click on disabled client group"); + clickById(disabledGroup); + Assert.assertFalse(isVisibleById(disabledItem)); + } + + private void _testPanelMenuItemAction(Templates template) { + renderPage(getTestUrl(), template); + String parentId = getParentId() + "_form:"; + + String inputId = parentId + "_value"; + String outputId = parentId + "_value2"; + + String group = "tablehide" + parentId + "pGroup1"; + String groupSingle = "tablehide" + parentId + "pGroup1_single"; + + String item = "tablehide" + parentId + "pItem1"; + String itemSingle = "tablehide" + parentId + "pItem1_single"; + + writeStatus("Click on ajax group"); + clickById(group); + waitForAjaxCompletion(); + AssertValueEquals(inputId, "pGroup1"); + + writeStatus("Click on ajax group"); + clickById(groupSingle); + waitForAjaxCompletion(); + AssertValueEquals(inputId, "pGroup1_single"); + + writeStatus("Click on server group"); + clickCommandAndWait(item); + AssertValueEquals(inputId, "pItem1"); + AssertTextEquals(outputId, "1"); + + writeStatus("Click on server group"); + clickCommandAndWait(itemSingle); + AssertValueEquals(inputId, "pItem1_single"); + AssertTextEquals(outputId, "2"); + } + + public String getTestUrl() { + return "/faces/pages/panelMenu/panelMenuTest.xhtml"; + } + +}