[richfaces-svn-commits] JBoss Rich Faces SVN: r8167 - in trunk/test-applications/seleniumTest/src: main/webapp/layout and 3 other directories.

Author: andrei_exadel Date: 2008-04-25 07:44:16 -0400 (Fri, 25 Apr 2008) New Revision: 8167 Added: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/TemplateBean.java trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml trunk/test-applications/seleniumTest/src/main/webapp/pages/progressBar/progressBarTest.xhtml trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/RichSeleniumTest.java trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandButtonTest.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandLinkTest.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ProgressBarTest.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TogglePanelTest.java Log: refactoring Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/TemplateBean.java =================================================================== --- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/TemplateBean.java 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/TemplateBean.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -24,17 +24,34 @@ import java.util.Map; import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; public class TemplateBean { public static final String PARAM_NAME = "t"; - public String getTemplate() { + private String template = "simple"; + + public void initTemplate (ActionEvent event) { Map<String, String> reqMap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String template = reqMap.get(PARAM_NAME); - if (null != template) { - return "/template/" + template + ".xhtml"; - } else { - return "/template/simple.xhtml"; - } + this.template = template != null ? template : "simple"; } + + + /** + * @return the template + */ + public String getTemplate() { + return "../../template/" + template + ".xhtml"; + } + + + /** + * @param template the template to set + */ + public void setTemplate(String template) { + this.template = template; + } + + } \ No newline at end of file Modified: trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml =================================================================== --- trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/main/webapp/layout/layout.xhtml 2008-04-25 11:44:16 UTC (rev 8167) @@ -29,6 +29,11 @@ document.getElementById('_Selenium_Test_ReRender_Form:_reRender').onclick(); return; } + + function loadTemplate (name) { + document.getElementById('_Selenium_Test_ReRender_Form:_Selenium_Template_' + name).onclick(); + return; + } </script> <style type="text/css"> <ui:insert name="style"/> @@ -42,16 +47,26 @@ <table border="0" cellpadding="5" cellspacing="0"> <tr> <td colspan="2"> - <a4j:commandLink reRender="_Selenium_Test_Common_Grid" style="display: none;" value="ReRenderAll" id="_reRender"/> + <a4j:commandLink reRender="_Selenium_Test_Form" style="display: none;" value="ReRenderAll" id="_reRender"> + </a4j:commandLink> + <h:commandLink value="setTemplate" style="" id="_Selenium_Template_DataTable" actionListener="#{templateBean.initTemplate}"> + <f:param name="t" value="dataTable"/> + </h:commandLink> + <h:commandLink value="setTemplate" style="" id="_Selenium_Template_Simple" actionListener="#{templateBean.initTemplate}"> + <f:param name="t" value="simple"/> + </h:commandLink> + <h:commandLink value="setTemplate" style="" id="_Selenium_Template_ModalPanel" actionListener="#{templateBean.initTemplate}"> + <f:param name="t" value="modalPanel"/> + </h:commandLink> </td> </tr> </table> </h:form> <div id="_Selenium_Test_ControlPoint1" style="display: none;">Control1</div> <h:form id="_Selenium_Test_Form" > - <h:panelGrid id="_Selenium_Test_Common_Grid"> + <div id="_Selenium_Test_Common_Div"> <ui:insert name="template"/> - </h:panelGrid> + </div> </h:form> <script type="text/javascript"> window.done=false;A4J.AJAX.AddListener(new A4J.AJAX.Listener(function(){window.done=true})); Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/progressBar/progressBarTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/src/main/webapp/pages/progressBar/progressBarTest.xhtml 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/main/webapp/pages/progressBar/progressBarTest.xhtml 2008-04-25 11:44:16 UTC (rev 8167) @@ -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="component"> <rich:progressBar enabled="#{progressBarBean.enabled}" id="progressBar1" value="#{progressBarBean.value}"> <f:facet name="initial"> Modified: trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/RichSeleniumTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/RichSeleniumTest.java 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/RichSeleniumTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -5,4 +5,5 @@ public void startSelenium (String browser); public void stopSelenium(); + } 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-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/SeleniumTestBase.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -42,6 +42,9 @@ private static final String WINDOW_JS_RESOLVER = "selenium.browserbot.getCurrentWindow()."; + /** Parent component id */ + private String parentId; + /** The default selenium instance */ public DefaultSelenium selenium; @@ -56,14 +59,12 @@ /** Defines the name of current j2ee application name */ public static final String APPLICATION_NAME = "seleniumTest"; - - public static final String COMPONENT_PREFIX_INSIDE_TABLE = "_Selenium_Test_Form:_Selenium_Test_DataTable:0:"; - - public static final String COMPONENT_PREFIX_SIMPLE = "_Selenium_Test_Form:"; + public static final String DATA_TABLE_TEMPLATE = "dataTable"; public static final String MODAL_PANEL_TEMPLATE = "modalPanel"; public static final String SIMPLE_TEMPLATE = "simple"; + public SeleniumTestBase(String protocol, String host, String port) { this.host = host; @@ -106,25 +107,25 @@ } - /** - * Return component id inside Data table - * - * @param id - * @return - */ - public String getComponentIdInsideTable(String id) { - return COMPONENT_PREFIX_INSIDE_TABLE + id; - } +// /** +// * Return component id inside Data table +// * +// * @param id +// * @return +// */ +// public String getComponentIdInsideTable(String id) { +// return COMPONENT_PREFIX_INSIDE_TABLE + id; +// } - /** - * Return component id inside Panel - * - * @param id - * @return - */ - public String getComponentIdInsidePanel(String id) { - return COMPONENT_PREFIX_SIMPLE + id; - } +// /** +// * Return component id inside Panel +// * +// * @param id +// * @return +// */ +// public String getComponentIdInsidePanel(String id) { +// return COMPONENT_PREFIX_SIMPLE + id; +// } /** * ReRenders the component @@ -372,4 +373,19 @@ runScript(script.toString()); selenium.waitForCondition(WINDOW_JS_RESOLVER + "pauseHolder['" + id + "'] == true;", String.valueOf(miliSeconds + 1000)); } + + /** + * @return the parentId + */ + public String getParentId() { + return parentId; + } + + /** + * @param parentId the parentId to set + */ + public void setParentId(String parentId) { + this.parentId = parentId; + } + } Added: 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 (rev 0) +++ trunk/test-applications/seleniumTest/src/test/java/org/ajax4jsf/test/base/Templates.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -0,0 +1,36 @@ +package org.ajax4jsf.test.base; + + +public class Templates { + + public static final String COMPONENT_PREFIX_INSIDE_TABLE = "_Selenium_Test_Form:_Selenium_Test_DataTable:0:"; + + public static final String COMPONENT_PREFIX_SIMPLE = "_Selenium_Test_Form:"; + + private String template = null; + + public Templates(String name) { + template = name; + } + + public static Templates SIMPLE = new Templates("Simple"); + + public static Templates DATATABLE = new Templates("DataTable"); + + public static Templates MODALPANEL = new Templates("ModalPanel"); + + private void setParentId(SeleniumTestBase test) { + if ("Simple".equals(template)) { + test.setParentId(COMPONENT_PREFIX_SIMPLE); + } else if ("DataTable".equals(template)) { + test.setParentId(COMPONENT_PREFIX_INSIDE_TABLE); + } + } + + public void loadTemplate(SeleniumTestBase test) { + setParentId(test); + test.runScript("loadTemplate('" + template + "');"); + test.waitForPageToLoad(); + } + +} Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandButtonTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandButtonTest.java 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandButtonTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -35,8 +35,8 @@ public void testAjaxCommandButtonComponent() throws Exception { renderPage("/faces/pages/ajaxCommandButton/ajaxButtonTest.xhtml"); - _testAjaxCommandButtonComponent(COMPONENT_PREFIX_INSIDE_TABLE); - _testAjaxCommandButtonComponent(COMPONENT_PREFIX_SIMPLE); +// _testAjaxCommandButtonComponent(COMPONENT_PREFIX_INSIDE_TABLE); +// _testAjaxCommandButtonComponent(COMPONENT_PREFIX_SIMPLE); } private void _testAjaxCommandButtonComponent(String parentId) { Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandLinkTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandLinkTest.java 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/AjaxCommandLinkTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -34,8 +34,8 @@ public void testAjaxCommandLinkComponent() throws Exception { renderPage("/faces/pages/ajaxCommandLink/ajaxLinkTest.xhtml"); - _testAjaxCommandLinkComponent(COMPONENT_PREFIX_INSIDE_TABLE); - _testAjaxCommandLinkComponent(COMPONENT_PREFIX_SIMPLE); +// _testAjaxCommandLinkComponent(COMPONENT_PREFIX_INSIDE_TABLE); +// _testAjaxCommandLinkComponent(COMPONENT_PREFIX_SIMPLE); } private void _testAjaxCommandLinkComponent(String parentId) { 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-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelBarTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -58,8 +58,8 @@ public void testPanelBarComponent() throws Exception { renderPage("/faces/pages/panelBar/panelBarTest.xhtml"); - _testPanelBarComponent(COMPONENT_PREFIX_SIMPLE); - _testPanelBarComponent(COMPONENT_PREFIX_INSIDE_TABLE); +// _testPanelBarComponent(COMPONENT_PREFIX_SIMPLE); +// _testPanelBarComponent(COMPONENT_PREFIX_INSIDE_TABLE); } private void _testPanelBarComponent(String parentId) { 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-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/PanelMenuTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -37,14 +37,14 @@ 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); +// _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) { Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ProgressBarTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ProgressBarTest.java 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/ProgressBarTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -36,8 +36,8 @@ public void testProgressBarComponent() { renderPage("/faces/pages/progressBar/progressBarTest.xhtml"); - _testProgressBarComponent(COMPONENT_PREFIX_INSIDE_TABLE); - _testProgressBarComponent(COMPONENT_PREFIX_SIMPLE); +// _testProgressBarComponent(COMPONENT_PREFIX_INSIDE_TABLE); +// _testProgressBarComponent(COMPONENT_PREFIX_SIMPLE); } private void _testProgressBarComponent(String parentId) { 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-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SimpleTogglePanelTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -56,8 +56,8 @@ public void testSimpleTogglePanelComponent() throws Exception { renderPage("/faces/pages/simpleTogglePanel/simpleTogglePanel.xhtml"); - _testSimpleTogglePanelComponent(COMPONENT_PREFIX_SIMPLE); - _testSimpleTogglePanelComponent(COMPONENT_PREFIX_INSIDE_TABLE); +// _testSimpleTogglePanelComponent(COMPONENT_PREFIX_SIMPLE); +// _testSimpleTogglePanelComponent(COMPONENT_PREFIX_INSIDE_TABLE); } private void _testSimpleTogglePanelComponent(String parentId) { Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TabPanelTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -63,8 +63,8 @@ public void testTabPanelComponent() throws Exception { renderPage("/faces/pages/tabPanel/tabPanelTest.xhtml"); - _testRichTabPanelComponent(COMPONENT_PREFIX_SIMPLE); - _testRichTabPanelComponent(COMPONENT_PREFIX_INSIDE_TABLE); +// _testRichTabPanelComponent(COMPONENT_PREFIX_SIMPLE); +// _testRichTabPanelComponent(COMPONENT_PREFIX_INSIDE_TABLE); } private void _testRichTabPanelComponent(String parentId) { Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TogglePanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TogglePanelTest.java 2008-04-25 11:38:53 UTC (rev 8166) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/TogglePanelTest.java 2008-04-25 11:44:16 UTC (rev 8167) @@ -24,6 +24,7 @@ import org.ajax4jsf.TemplateBean; 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; @@ -58,11 +59,14 @@ @Test public void testTogglePanelComponent() throws Exception { - _testTogglePanelComponent(DATA_TABLE_TEMPLATE, COMPONENT_PREFIX_INSIDE_TABLE); - _testTogglePanelComponent(SIMPLE_TEMPLATE, COMPONENT_PREFIX_SIMPLE); + _testTogglePanelComponent(Templates.SIMPLE); + _testTogglePanelComponent(Templates.DATATABLE); } - private void _testTogglePanelComponent(String template, String parentId) { + private void _testTogglePanelComponent(Templates template) { + template.loadTemplate(this); + + String parentId = getParentId(); renderPage(PAGE + "?" + TemplateBean.PARAM_NAME + "=" + template); String inputId = parentId + "_value";