Author: andrei_exadel Date: 2008-04-29 07:49:41 -0400 (Tue, 29 Apr 2008) New Revision: 8281 Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java Log: simple toggle panel refactoring Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml =================================================================== --- trunk/test-applications/seleniumTest/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml 2008-04-29 11:43:56 UTC (rev 8280) +++ trunk/test-applications/seleniumTest/src/main/webapp/pages/simpleTogglePanel/simpleTogglePanel.xhtml 2008-04-29 11:49:41 UTC (rev 8281) @@ -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"> </ui:define> <ui:define name="component"> + <h:form id="_form"> <rich:simpleTogglePanel switchType="ajax" id="panel1" label="ajax switchType" action="#{panelBean.increment}" actionListener="#{panelBean.actionListener}" opened="false" @@ -56,9 +57,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="simpleTogglePanelDescription.xhtml" /> - </ui:define> </ui:composition> </html> \ No newline at end of file Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java 2008-04-29 11:43:56 UTC (rev 8280) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java 2008-04-29 11:49:41 UTC (rev 8281) @@ -1,110 +1,109 @@ -/** - * 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 SimpleTogglePanelTest extends SeleniumTestBase implements RichSeleniumTest { - - public SimpleTogglePanelTest() { - 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 testSimpleTogglePanelComponent() throws Exception { - renderPage("/faces/pages/simpleTogglePanel/simpleTogglePanel.xhtml"); - -// _testSimpleTogglePanelComponent(COMPONENT_PREFIX_SIMPLE); -// _testSimpleTogglePanelComponent(COMPONENT_PREFIX_INSIDE_TABLE); - } - - private void _testSimpleTogglePanelComponent(String parentId) { - String inputId = parentId + "_value"; - String outputId = parentId + "_value2"; - - String ajaxHeader = parentId + "panel1_header"; - String serverHeader = parentId + "panel2_header"; - String clientHeader = parentId + "panel3_header"; - - String ajaxBody = parentId + "panel1_body"; - String serverBody = parentId + "panel2_body"; - String clientBody = parentId + "panel3_body"; - - clickById(clientHeader); - Assert.assertTrue(isVisibleById(clientBody)); - clickById(clientHeader); - Assert.assertFalse(isVisibleById(clientBody)); - - clickById(ajaxHeader); - waitForAjaxCompletion(5000); - AssertValueEquals(inputId, "panel1"); - AssertTextEquals(outputId, "1"); - Assert.assertTrue(isVisibleById(ajaxBody)); - - clickById(ajaxHeader); - waitForAjaxCompletion(5000); - AssertValueEquals(inputId, "panel1"); - AssertTextEquals(outputId, "2"); - Assert.assertFalse(isVisibleById(ajaxBody)); - - clickById(serverHeader); - waitForPageToLoad(); - AssertValueEquals(inputId, "panel2"); - AssertTextEquals(outputId, "3"); - Assert.assertTrue(isVisibleById(serverBody)); - - clickById(serverHeader); - waitForPageToLoad(); - AssertValueEquals(inputId, "panel2"); - AssertTextEquals(outputId, "4"); - Assert.assertFalse(isVisibleById(serverBody)); - } - - 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 SimpleTogglePanelTest extends SeleniumTestBase implements RichSeleniumTest { + + public SimpleTogglePanelTest() { + 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 testSimpleTogglePanelComponent() throws Exception { + _testSimpleTogglePanelComponent(Templates.SIMPLE); + _testSimpleTogglePanelComponent(Templates.DATATABLE); + } + + private void _testSimpleTogglePanelComponent(Templates template) { + renderPage(getTestUrl(), template); + String parentId = getParentId() + "_form:"; + String inputId = parentId + "_value"; + String outputId = parentId + "_value2"; + + String ajaxHeader = parentId + "panel1_header"; + String serverHeader = parentId + "panel2_header"; + String clientHeader = parentId + "panel3_header"; + + String ajaxBody = parentId + "panel1_body"; + String serverBody = parentId + "panel2_body"; + String clientBody = parentId + "panel3_body"; + + clickById(clientHeader); + Assert.assertTrue(isVisibleById(clientBody)); + clickById(clientHeader); + Assert.assertFalse(isVisibleById(clientBody)); + + clickById(ajaxHeader); + waitForAjaxCompletion(5000); + AssertValueEquals(inputId, "panel1"); + AssertTextEquals(outputId, "1"); + Assert.assertTrue(isVisibleById(ajaxBody)); + + clickById(ajaxHeader); + waitForAjaxCompletion(5000); + AssertValueEquals(inputId, "panel1"); + AssertTextEquals(outputId, "2"); + Assert.assertFalse(isVisibleById(ajaxBody)); + + clickCommandAndWait(serverHeader); + AssertValueEquals(inputId, "panel2"); + AssertTextEquals(outputId, "3"); + Assert.assertTrue(isVisibleById(serverBody)); + + clickCommandAndWait(serverHeader); + AssertValueEquals(inputId, "panel2"); + AssertTextEquals(outputId, "4"); + Assert.assertFalse(isVisibleById(serverBody)); + } + + public String getTestUrl() { + return "/faces/pages/simpleTogglePanel/simpleTogglePanel.xhtml"; + } + + +}