Author: andrei_exadel Date: 2008-10-27 08:49:01 -0400 (Mon, 27 Oct 2008) New Revision: 10908 Removed: trunk/test-applications/regressionArea/regressionArea-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java trunk/test-applications/regressionArea/regressionArea-web/src/main/java/org/ajax4jsf/template/ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/dataTable.xhtml trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/modalPanel.xhtml trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/simple.xhtml Modified: trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/components.properties trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/faces-config.xml trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/layout/controlLayout.xhtml trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/layout/layout.xhtml trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/examples/home.xhtml trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4507.xhtml trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4709.xhtml trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/SeleniumTestBase.java trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/SimpleTest.java trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/rf4507/Test.java trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/rf4709/Test.java Log: Remove templates Modified: trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF =================================================================== --- trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/META-INF/MANIFEST.MF 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Class-Path: bsh-1.3.0.jar commons-beanutils-1.7.0.jar commons-collecti ons-3.2.jar commons-digester-1.8.jar commons-lang-2.3.jar commons-log - ging-1.0.4.jar dom4j-1.6.1-jboss.jar el-api-1.0.jar javassist-3.3.ga. - jar jboss-el-2.0.1.GA.jar jboss-seam-2.0.1.GA.jar jboss-seam-debug-2. - 0.1.GA.jar jboss-seam-remoting-2.0.1.GA.jar jboss-seam-ui-2.0.1.GA.ja - r jsf-api-1.2_09.jar jsf-facelets-1.1.14.jar jsf-impl-1.2_09.jar log4 - j-1.2.14.jar richfaces-api-3.2.2.GA.jar richfaces-impl-3.2.2.GA.jar r - ichfaces-ui-3.2.2.GA.jar + ging-1.0.4.jar dom4j-1.6.1-jboss.jar el-api-1.0.jar javassist-3.3.GA. + jar jboss-el-2.0.1.GA.jar jboss-seam-2.0.2.SP1.jar jboss-seam-debug-2 + .0.2.SP1.jar jboss-seam-remoting-2.0.2.SP1.jar jboss-seam-ui-2.0.2.SP + 1.jar jsf-api-1.2_09.jar jsf-facelets-1.1.14.jar jsf-impl-1.2_09.jar + log4j-1.2.14.jar richfaces-api-3.3.0-SNAPSHOT.jar richfaces-impl-3.3. + 0-SNAPSHOT.jar richfaces-ui-3.3.0-SNAPSHOT.jar Modified: trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/components.properties =================================================================== --- trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/components.properties 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-ejb/src/main/resources/components.properties 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,4 +1,4 @@ # #Wed Feb 27 12:58:12 EET 2008 -jndiPattern=regressionArea-ear-3.3.0-SNAPSHOT/#{ejbName}/local +jndiPattern=regressionArea-ear/#{ejbName}/local embeddedEjb=true Deleted: trunk/test-applications/regressionArea/regressionArea-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,81 +0,0 @@ -/** - * 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.ajax4jsf.bean; - -import java.util.ArrayList; -import java.util.List; - -import javax.faces.model.SelectItem; - -import org.ajax4jsf.template.Template; - - -public class TemplateBean { - public static final String PARAM_NAME = "t"; - - private Template template = Template.SIMPLE; - - /* - * public void initTemplate (ActionEvent event) { Map<String, String> - * reqMap = - * FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); - * String template = reqMap.get(PARAM_NAME); this.template = template != - * null ? template : "simple"; } - */ - - public String getTemplateId() { - return template.toString(); - } - - public void setTemplateId(String template) { - this.template = Template.valueOf(template); - } - - public String getParentId() { - return template.getPrefix(); - } - - /** - * @return the template - */ - public String getTemplate() { - return "/template/" + template.getName() + ".xhtml"; - } - - /** - * @param template - * the template to set - */ - public void setTemplate(Template template) { - this.template = template; - } - - public List<SelectItem> getAvailableTemplates() { - List<SelectItem> retVal = new ArrayList<SelectItem>(); - for (Template template : Template.values()) { - retVal.add(new SelectItem(template.toString(), template.getDesc())); - } - - return retVal; - } - -} \ No newline at end of file Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/resources/META-INF/MANIFEST.MF 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,5 +1,6 @@ Manifest-Version: 1.0 Class-Path: commons-beanutils-1.7.0.jar commons-collections-3.2.jar co - mmons-digester-1.8.jar richfaces-api-3.2.2.GA.jar richfaces-impl-3.2. - 2.GA.jar richfaces-ui-3.2.2.GA.jar + mmons-digester-1.8.jar jsf-facelets-1.1.14.jar richfaces-api-3.3.0-SN + APSHOT.jar richfaces-impl-3.3.0-SNAPSHOT.jar richfaces-ui-3.3.0-SNAPS + HOT.jar Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/faces-config.xml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/faces-config.xml 2008-10-27 12:49:01 UTC (rev 10908) @@ -13,11 +13,7 @@ <managed-bean-scope>session</managed-bean-scope> </managed-bean> - <managed-bean> - <managed-bean-name>templateBean</managed-bean-name> - <managed-bean-class>org.ajax4jsf.bean.TemplateBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> + <lifecycle> <phase-listener id="phaseTracker">org.ajax4jsf.logging.PhaseTracker</phase-listener> Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/layout/controlLayout.xhtml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/layout/controlLayout.xhtml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/layout/controlLayout.xhtml 2008-10-27 12:49:01 UTC (rev 10908) @@ -4,23 +4,6 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"> <hr /> -<h:form id="_Selenium_Test_Template_Form"> -<table style="background-color: #F2F2F2"> -<tr> -<td> -Current Template: -</td> -<td> - <h:selectOneMenu value="#{templateBean.templateId}" id="_Selenium_Test_Template_id"> - <f:selectItems value="#{templateBean.availableTemplates}" /> - </h:selectOneMenu> -</td> -<td> - <h:commandLink id="_Selenium_Test_loadTemplate" value="Load"></h:commandLink> -</td> -</tr> -</table> -</h:form> <h:form id="_Selenium_Test_ReRender_Form"> <div> <a href="#{facesContext.externalContext.requestContextPath}/faces/TIDY/index.xhtml">Home</a> Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/layout/layout.xhtml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/layout/layout.xhtml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/layout/layout.xhtml 2008-10-27 12:49:01 UTC (rev 10908) @@ -7,8 +7,6 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <f:view contentType="text/html"> <head> - <a4j:loadScript src="resource:///org/ajax4jsf/javascript/scripts/AJAX.js"></a4j:loadScript> - <a4j:loadScript src="resource:///org/ajax4jsf/javascript/scripts/form.js"></a4j:loadScript> <script> var errorMessage = null; var pauseHolder = {}; @@ -72,7 +70,7 @@ } function fireMouseEvent(id,eventName, x, y, ctrl) { - var e = $(id); + var e = document.getElementById(id); var evt; if (document.createEvent) { evt = document.createEvent("MouseEvents"); @@ -107,10 +105,13 @@ <div id="_Selenium_Test_ControlPoint2" style="display: none;">Control2</div> -<ui:insert name="control" /> +<ui:include src="controlLayout.xhtml" /> <script type="text/javascript"> - window.done=false; A4J.AJAX.AddListener(new A4J.AJAX.Listener(function(){window.done=true;})); + window.done=false; + if (A4J) { + A4J.AJAX.AddListener(new A4J.AJAX.Listener(function(){window.done=true;})); + } </script> </body> </f:view> Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/examples/home.xhtml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/examples/home.xhtml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/examples/home.xhtml 2008-10-27 12:49:01 UTC (rev 10908) @@ -7,11 +7,8 @@ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> -<ui:composition template="#{templateBean.template}"> - <ui:define name="style"> - - </ui:define> - <ui:define name="component"> +<ui:composition template="/layout/layout.xhtml"> + <ui:define name="template"> <rich:panel header="Rich Users"> <rich:dataTable id="tb" value="#{usersBean.users}" var="us"> <rich:column> Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4507.xhtml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4507.xhtml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4507.xhtml 2008-10-27 12:49:01 UTC (rev 10908) @@ -6,11 +6,8 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> -<ui:composition template="#{templateBean.template}"> - <ui:define name="style"> - - </ui:define> - <ui:define name="component"> +<ui:composition template="/layout/layout.xhtml"> + <ui:define name="template"> <h:form id="form"> <a4j:commandLink value="First Link" id="link1" data="#{'firstLink'}" oncomplete="window.receivedData = data" /> Modified: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4709.xhtml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4709.xhtml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4709.xhtml 2008-10-27 12:49:01 UTC (rev 10908) @@ -6,11 +6,11 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> -<ui:composition template="#{templateBean.template}"> +<ui:composition template="/layout/layout.xhtml"> <ui:define name="style"> </ui:define> - <ui:define name="component"> + <ui:define name="template"> <rich:messages id="messages"/> <h:form id="form"> Deleted: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/dataTable.xhtml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/dataTable.xhtml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/dataTable.xhtml 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,23 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:composition template="../layout/layout.xhtml"> - <ui:define name="template"> - <rich:dataTable value="1" id="_Selenium_Test_DataTable"> - <rich:column> - <f:facet name="header"> - <h:outputText value="Data Table" /> - </f:facet> - <ui:insert name="component" /> - </rich:column> - </rich:dataTable> - </ui:define> - <ui:define name="control"> - <ui:include src="../layout/controlLayout.xhtml" /> - </ui:define> -</ui:composition> -</html> \ No newline at end of file Deleted: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/modalPanel.xhtml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/modalPanel.xhtml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/modalPanel.xhtml 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,23 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:composition template="../layout/layout.xhtml"> - <ui:define name="template"> - <rich:modalPanel id="_Selenium_Test_ModalPanel" showWhenRendered="true" width="600" height="600"> - <f:facet name="header" > - <h:outputText value="Modal Panel" /> - </f:facet> - <f:facet name="controls" > - <a onclick="Richfaces.hideModalPanel('_Selenium_Test_ModalPanel'); return false;" - href="#" >Hide the panel</a> - </f:facet> - <ui:insert name="component" /> - <ui:include src="../layout/controlLayout.xhtml" /> - </rich:modalPanel> - </ui:define> -</ui:composition> -</html> \ No newline at end of file Deleted: trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/simple.xhtml =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/simple.xhtml 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/main/webapp/template/simple.xhtml 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,16 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:composition template="../layout/layout.xhtml"> - <ui:define name="template"> - <ui:insert name="component" /> - </ui:define> - <ui:define name="control"> - <ui:include src="../layout/controlLayout.xhtml" /> - </ui:define> -</ui:composition> -</html> \ No newline at end of file Modified: trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-27 12:49:01 UTC (rev 10908) @@ -2,12 +2,8 @@ -import java.util.ArrayList; -import java.util.List; - import org.ajax4jsf.bean.Configurator; import org.ajax4jsf.javascript.ScriptUtils; -import org.ajax4jsf.template.Template; import org.openqa.selenium.server.RemoteControlConfiguration; import org.openqa.selenium.server.SeleniumServer; import org.testng.Assert; @@ -16,9 +12,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeSuite; import org.testng.annotations.BeforeTest; -import org.testng.annotations.DataProvider; import org.testng.annotations.Parameters; -import org.richfaces.RichSeleniumTest; import com.thoughtworks.selenium.DefaultSelenium; @@ -64,7 +58,7 @@ private int seleniumServerPort = 5556; /** Defines the name of current j2ee application name */ - public static final String APPLICATION_NAME = "Seam"; + public static final String APPLICATION_NAME = "regressionArea"; public SeleniumTestBase() { this("http", "localhost", serverPort); @@ -85,11 +79,11 @@ seleniumServer.start(); } - @DataProvider(name = "templates") - protected Object[][] templates() { - return new Object[][] { { Template.SIMPLE }, { Template.DATA_TABLE }, { Template.MODAL_PANEL } }; - //return this.data; - } + //@DataProvider(name = "templates") +// protected Object[][] templates() { +// return new Object[][] { { Template.SIMPLE }, { Template.DATA_TABLE }, { Template.MODAL_PANEL } }; +// //return this.data; +// } /** * This method are invoked before selenium tests started @@ -123,21 +117,21 @@ } } - protected void loadTemplates(String templateExpr) { - String[] array = new String[]{}; - if(null != templateExpr) { - array = templateExpr.split(","); - } +// protected void loadTemplates(String templateExpr) { +// String[] array = new String[]{}; +// if(null != templateExpr) { +// array = templateExpr.split(","); +// } +// +// List<Object[]> list = new ArrayList<Object[]>(); +// for (String string : array) { +// Object[] elem = new Object[] {Template.valueOf(string)}; +// list.add(elem); +// } +// +// this.data = (Object[][]) list.toArray(new Object[0][0]); +// } - List<Object[]> list = new ArrayList<Object[]>(); - for (String string : array) { - Object[] elem = new Object[] {Template.valueOf(string)}; - list.add(elem); - } - - this.data = (Object[][]) list.toArray(new Object[0][0]); - } - @AfterSuite public void stopSeleniumServer() throws Exception { seleniumServer.stop(); @@ -157,13 +151,13 @@ /** * Renders page */ - protected void renderPage(Template template) { + protected void renderPage() { selenium.open(protocol + "://" + host + ":" + port + "/" + APPLICATION_NAME + filterPrefix + getTestUrl()); selenium.waitForPageToLoad(String.valueOf(pageRenderTime)); - setParentId(template.getPrefix()); - runScript("loadTemplate('" + template + "');", false); - waitForPageToLoad(); + //setParentId(template.getPrefix()); + //runScript("loadTemplate('" + template + "');", false); + //waitForPageToLoad(); checkPageRendering(); // At the first we check if page has been // rendered Modified: trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/SimpleTest.java =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/SimpleTest.java 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/SimpleTest.java 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,19 +1,18 @@ package org.richfaces.testng; -import org.ajax4jsf.template.Template; import org.richfaces.SeleniumTestBase; import org.testng.annotations.Test; public class SimpleTest extends SeleniumTestBase { @Test - public void testXHTML(Template template) { - renderPage(template); + public void testXHTML() { + renderPage(); } @Test - public void testJSP(Template template) { + public void testJSP() { selenium.open("http://localhost:" + serverPort + "/" + APPLICATION_NAME + "/faces/NEKO/pages/examples/home.jsp"); waitForPageToLoad(); Modified: trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/rf4507/Test.java =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/rf4507/Test.java 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/rf4507/Test.java 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,55 +1,54 @@ package org.richfaces.testng.rf4507; -import org.ajax4jsf.template.Template; import org.richfaces.SeleniumTestBase; import org.testng.Assert; public class Test extends SeleniumTestBase { - private String getIdSelector(Template template, String id) { - return "//*[@id='" + template.getPrefix() + id + "']"; + private String getIdSelector(String id) { + return "//*[@id='" + id + "']"; } - private void testCalendarSwitch(Template template, int buttonPosition, String cellText) { - renderPage(template); + private void testCalendarSwitch(int buttonPosition, String cellText) { + renderPage(); - AssertTextEquals(getIdSelector(template, "form:calendarDayCell6") + "/div", "5-10"); + AssertTextEquals(getIdSelector("form:calendarDayCell6") + "/div", "5-10"); - selenium.assignId(getIdSelector(template, "form:calendarHeader") + "//td[*[@class='rich-calendar-tool-btn']][" + buttonPosition + "]/div", "testButton"); + selenium.assignId(getIdSelector("form:calendarHeader") + "//td[*[@class='rich-calendar-tool-btn']][" + buttonPosition + "]/div", "testButton"); fireMouseEvent("testButton", "click", 0, 0, false); waitForAjaxCompletion(); - AssertTextEquals(getIdSelector(template, "form:calendarDayCell6") + "/div", cellText); + AssertTextEquals(getIdSelector( "form:calendarDayCell6") + "/div", cellText); } - private void testLink(Template template, String linkId, String data) throws Exception { - renderPage(template); + private void testLink(String linkId, String data) throws Exception { + renderPage(); Assert.assertEquals("null", selenium.getEval("window.receivedData")); - clickAjaxCommandAndWait(getIdSelector(template, linkId)); + clickAjaxCommandAndWait(getIdSelector(linkId)); Assert.assertEquals(data, selenium.getEval("window.receivedData")); } @org.testng.annotations.Test - public void testNextMonth(Template template) throws Exception { - testCalendarSwitch(template, 4, "2-11"); + public void testNextMonth() throws Exception { + testCalendarSwitch(4, "2-11"); } @org.testng.annotations.Test - public void testPreviousMonth(Template template) throws Exception { - testCalendarSwitch(template, 2, "7-9"); + public void testPreviousMonth() throws Exception { + testCalendarSwitch(2, "7-9"); } @org.testng.annotations.Test - public void testFirstLink(Template template) throws Exception { - testLink(template, "form:link1", "firstLink"); + public void testFirstLink() throws Exception { + testLink("form:link1", "firstLink"); } @org.testng.annotations.Test - public void testSecondLink(Template template) throws Exception { - testLink(template, "form:link2", "secondLink"); + public void testSecondLink() throws Exception { + testLink("form:link2", "secondLink"); } public String getTestUrl() { Modified: trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/rf4709/Test.java =================================================================== --- trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/rf4709/Test.java 2008-10-27 12:10:41 UTC (rev 10907) +++ trunk/test-applications/regressionArea/regressionArea-web/src/test/java/org/richfaces/testng/rf4709/Test.java 2008-10-27 12:49:01 UTC (rev 10908) @@ -1,49 +1,48 @@ package org.richfaces.testng.rf4709; -import org.ajax4jsf.template.Template; import org.richfaces.SeleniumTestBase; public class Test extends SeleniumTestBase { - private String getMessagesLocator(Template template) { - return "//*[@id='" + template.getPrefix() + "messages']"; + private String getMessagesLocator() { + return "//*[@id='" + "messages']"; } @org.testng.annotations.Test - public void testTabPanel(Template template) throws Exception { - renderPage(template); + public void testTabPanel() throws Exception { + renderPage(); - AssertTextEquals(getMessagesLocator(template), ""); + AssertTextEquals(getMessagesLocator(), ""); - selenium.assignId("//*[@id='" + (template.getPrefix() + "form:secondTab_lbl") + "']", "testElement"); + selenium.assignId("//*[@id='form:secondTab_lbl']", "testElement"); fireMouseEvent("testElement", "click", 0, 0, false); waitForAjaxCompletion(); - AssertTextEquals(getMessagesLocator(template), "tabPanel"); + AssertTextEquals(getMessagesLocator(), "tabPanel"); } @org.testng.annotations.Test - public void testTogglePanel(Template template) throws Exception { - renderPage(template); + public void testTogglePanel() throws Exception { + renderPage(); - AssertTextEquals(getMessagesLocator(template), ""); + AssertTextEquals(getMessagesLocator(), ""); - selenium.click("//*[@id='" + template.getPrefix() + "form:firstControl']"); + selenium.click("//*[@id='form:firstControl']"); waitForAjaxCompletion(); - AssertTextEquals(getMessagesLocator(template), "togglePanel"); + AssertTextEquals(getMessagesLocator(), "togglePanel"); } @org.testng.annotations.Test - public void testPanelBar(Template template) throws Exception { - renderPage(template); + public void testPanelBar() throws Exception { + renderPage(); - AssertTextEquals(getMessagesLocator(template), ""); - selenium.assignId("//*[@id='" + (template.getPrefix() + "form:secondPanelBarItem") + "']/div[1]", "testElement"); + AssertTextEquals(getMessagesLocator(), ""); + selenium.assignId("//*[@id='form:secondPanelBarItem']/div[1]", "testElement"); fireMouseEvent("testElement", "click", 0, 0, false); waitForAjaxCompletion(); - AssertTextEquals(getMessagesLocator(template), "panelBar"); + AssertTextEquals(getMessagesLocator(), "panelBar"); } @Override