Author: andrei_exadel Date: 2008-10-23 12:28:50 -0400 (Thu, 23 Oct 2008) New Revision: 10887 Modified: trunk/test-applications/seleniumTest/richfaces/ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/template/Template.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/template/TestConstants.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/dataTable.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java Log: Add second dataTable template Property changes on: trunk/test-applications/seleniumTest/richfaces ___________________________________________________________________ Name: svn:ignore + target test-output Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-10-23 15:54:04 UTC (rev 10886) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2008-10-23 16:28:50 UTC (rev 10887) @@ -38,6 +38,12 @@ private static final Log log = LogFactory.getLog(TemplateBean.class); + static final List<String> dataTableModel = new ArrayList<String>(); + static { + dataTableModel.add("1"); + dataTableModel.add("2"); + } + public static final String PARAM_NAME = "t"; private Template template = Template.SIMPLE; @@ -45,14 +51,21 @@ private Template templatePath = Template.SIMPLE; private String methodName; - - - public String getTemplateId() { + + private Integer dataTableRowIndex = 0; + + public String getTemplateId() { return template.toString(); } + + public void setTemplateId(String template) { + this.template = Template.valueOf(template); + if (this.template.equals(Template.DATA_TABLE)) { + dataTableRowIndex = 0; + }else if (this.template.equals(Template.DATA_TABLE2)) { + dataTableRowIndex = 1; + } - public void setTemplateId(String template) { - this.template = Template.valueOf(template); } public String getParentId() { @@ -143,4 +156,19 @@ this.methodName = methodName; } + /** + * @return the dataTableRowIndex + */ + public Integer getDataTableRowIndex() { + return dataTableRowIndex; + } + + /** + * @return the dataTableModel + */ + public List<String> getDataTableModel() { + return dataTableModel; + } + + } \ No newline at end of file Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/template/Template.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/template/Template.java 2008-10-23 15:54:04 UTC (rev 10886) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/template/Template.java 2008-10-23 16:28:50 UTC (rev 10887) @@ -7,7 +7,8 @@ */ public enum Template implements TestConstants { SIMPLE (SIMPLE_TEMPLATE_NAME, COMPONENT_PREFIX_SIMPLE, SIMPLE_TEMPLATE_DESC), - DATA_TABLE (DATA_TABLE_TEMPLATE_NAME, COMPONENT_PREFIX_INSIDE_TABLE, DATA_TABLE_TEMPLATE_DESC), + DATA_TABLE (DATA_TABLE_TEMPLATE_NAME, COMPONENT_PREFIX_INSIDE_TABLE1, DATA_TABLE_TEMPLATE_DESC1), + DATA_TABLE2 (DATA_TABLE_TEMPLATE_NAME, COMPONENT_PREFIX_INSIDE_TABLE2, DATA_TABLE_TEMPLATE_DESC2), MODAL_PANEL (MODAL_PANEL_TEMPLATE_NAME, COMPONENT_PREFIX_SIMPLE, MODAL_PANEL_TEMPLATE_DESC); private String name; Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/template/TestConstants.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/template/TestConstants.java 2008-10-23 15:54:04 UTC (rev 10886) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/template/TestConstants.java 2008-10-23 16:28:50 UTC (rev 10887) @@ -3,7 +3,8 @@ public interface TestConstants { /* Constants of component prefixes */ - public static final String COMPONENT_PREFIX_INSIDE_TABLE = "_Selenium_Test_DataTable:0:"; + public static final String COMPONENT_PREFIX_INSIDE_TABLE1 = "_Selenium_Test_DataTable:0:"; + public static final String COMPONENT_PREFIX_INSIDE_TABLE2 = "_Selenium_Test_DataTable:1:"; public static final String COMPONENT_PREFIX_SIMPLE = ""; /* Constants of template names */ @@ -13,7 +14,8 @@ /* Constants of template descriptions */ public static final String SIMPLE_TEMPLATE_DESC = "Simple"; - public static final String DATA_TABLE_TEMPLATE_DESC = "DataTable"; + public static final String DATA_TABLE_TEMPLATE_DESC1 = "DataTable Row 1"; + public static final String DATA_TABLE_TEMPLATE_DESC2 = "DataTable Row 2"; public static final String MODAL_PANEL_TEMPLATE_DESC = "Modal Panel"; /* Constants of test configuration */ Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml 2008-10-23 15:54:04 UTC (rev 10886) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/autotest/dataTable.xhtml 2008-10-23 16:28:50 UTC (rev 10887) @@ -7,16 +7,19 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition template="../dataTable.xhtml"> <ui:define name="template"> - <rich:dataTable value="1" id="_Selenium_Test_DataTable"> + <rich:dataTable value="#{templateBean.dataTableModel}" id="_Selenium_Test_DataTable" rowKeyVar="row"> <rich:column> <f:facet name="header"> <h:outputText value="Data Table" /> - </f:facet> + </f:facet> + <h:panelGroup columns="1" rendered="#{templateBean.dataTableRowIndex == row}"> <ui:include src="../../layout/autotest/autoTestControls.xhtml" /> <h:form id="autoTestForm"> <ui:include src="../../layout/autotest/autoTestHiddens.xhtml" /> <ui:insert name="component" /> </h:form> + </h:panelGroup> + <h:outputText value="#{row}" rendered="#{templateBean.dataTableRowIndex != row}" /> </rich:column> </rich:dataTable> </ui:define> Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/template/dataTable.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-23 15:54:04 UTC (rev 10886) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-23 16:28:50 UTC (rev 10887) @@ -121,7 +121,7 @@ @DataProvider(name = "templates") protected Object[][] templates() { - return new Object[][] { { Template.SIMPLE }, { Template.DATA_TABLE }, { Template.MODAL_PANEL } }; + return new Object[][] { { Template.SIMPLE }, { Template.DATA_TABLE }, { Template.DATA_TABLE2 }, { Template.MODAL_PANEL } }; //return this.data; }