Author: andrei_exadel Date: 2008-04-29 06:33:06 -0400 (Tue, 29 Apr 2008) New Revision: 8277 Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/panelBar/panelBarTest.xhtml trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java Log: Panel Bar test refactoring Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/panelBar/panelBarTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/src/main/webapp/pages/panelBar/panelBarTest.xhtml 2008-04-29 10:23:35 UTC (rev 8276) +++ trunk/test-applications/seleniumTest/src/main/webapp/pages/panelBar/panelBarTest.xhtml 2008-04-29 10:33:06 UTC (rev 8277) @@ -6,11 +6,12 @@ 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} </ui:define> <ui:define name="component"> + <h:form id="_form"> <rich:panelBar id="panelBar" width="300" height="300" > <rich:panelBarItem id="item1" > <f:facet name="label"> @@ -36,9 +37,7 @@ <h:commandButton id="button_simple" value="Simple submit" /> <a4j:commandButton id="button_ajax" value="Ajax submit" reRender="panelBar" /> <br/> + </h:form> </ui:define> - <ui:define name="description"> - <ui:include src="panelBarDescription.xhtml" /> - </ui:define> </ui:composition> </html> \ No newline at end of file Modified: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-04-29 10:23:35 UTC (rev 8276) +++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-04-29 10:33:06 UTC (rev 8277) @@ -359,6 +359,15 @@ selenium.click("id=" + id); checkJSError(); } + + /** + * This method should be used for click on command controls instead of 'clickById' method. + * @param commandId + */ + public void clickCommandAndWait(String commandId) { + selenium.click("id=" + commandId); + waitForPageToLoad(); + } /** * Return true if element is visible Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java 2008-04-29 10:23:35 UTC (rev 8276) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java 2008-04-29 10:33:06 UTC (rev 8277) @@ -1,103 +1,104 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -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; - -public class PanelBarTest extends SeleniumTestBase implements RichSeleniumTest { - - - public PanelBarTest() { - 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 testPanelBarComponent() throws Exception { - renderPage("/faces/pages/panelBar/panelBarTest.xhtml"); - -// _testPanelBarComponent(COMPONENT_PREFIX_SIMPLE); -// _testPanelBarComponent(COMPONENT_PREFIX_INSIDE_TABLE); - } - - private void _testPanelBarComponent(String parentId) { - String label2 = parentId + "label2"; - String label3 = parentId + "label3"; - - String output1 = parentId + "output1"; - String output2 = parentId + "output2"; - String output3 = parentId + "output3"; - - String ajaxButton = parentId + "button_ajax"; - String simpleButton = parentId + "button_simple"; - - clickById(label2); - Assert.assertFalse(isVisibleById(output1)); - Assert.assertTrue(isVisibleById(output2)); - Assert.assertFalse(isVisibleById(output3)); - - clickById(simpleButton); - waitForPageToLoad(); - Assert.assertFalse(isVisibleById(output1)); - Assert.assertTrue(isVisibleById(output2)); - Assert.assertFalse(isVisibleById(output3)); - - clickById(label3); - Assert.assertFalse(isVisibleById(output1)); - Assert.assertFalse(isVisibleById(output2)); - Assert.assertTrue(isVisibleById(output3)); - - clickById(ajaxButton); - waitForAjaxCompletion(); - Assert.assertFalse(isVisibleById(output1)); - Assert.assertFalse(isVisibleById(output2)); - Assert.assertTrue(isVisibleById(output3)); - } - - public String getTestUrl() { - return null; - } - -} +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +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 PanelBarTest extends SeleniumTestBase implements RichSeleniumTest { + + + public PanelBarTest() { + 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 testPanelBarComponent() throws Exception { + renderPage("/faces/pages/panelBar/panelBarTest.xhtml"); + _testPanelBarComponent(Templates.SIMPLE); + } + + private void _testPanelBarComponent(Templates template) { + renderPage(getTestUrl(), template); + String parentId = getParentId() + "_form:"; + + String label2 = parentId + "label2"; + String label3 = parentId + "label3"; + + String output1 = parentId + "output1"; + String output2 = parentId + "output2"; + String output3 = parentId + "output3"; + + String ajaxButton = parentId + "button_ajax"; + String simpleButton = parentId + "button_simple"; + + clickById(label2); + Assert.assertFalse(isVisibleById(output1)); + Assert.assertTrue(isVisibleById(output2)); + Assert.assertFalse(isVisibleById(output3)); + + clickCommandAndWait(simpleButton); + Assert.assertFalse(isVisibleById(output1)); + Assert.assertTrue(isVisibleById(output2)); + Assert.assertFalse(isVisibleById(output3)); + + clickById(label3); + Assert.assertFalse(isVisibleById(output1)); + Assert.assertFalse(isVisibleById(output2)); + Assert.assertTrue(isVisibleById(output3)); + + clickById(ajaxButton); + waitForAjaxCompletion(); + Assert.assertFalse(isVisibleById(output1)); + Assert.assertFalse(isVisibleById(output2)); + Assert.assertTrue(isVisibleById(output3)); + } + + public String getTestUrl() { + return "/faces/pages/panelBar/panelBarTest.xhtml"; + } + +}