Author: konstantin.mishin Date: 2009-01-29 10:36:39 -0500 (Thu, 29 Jan 2009) New Revision: 12486 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java Log: RF-5680 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml 2009-01-29 15:20:29 UTC (rev 12485) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml 2009-01-29 15:36:39 UTC (rev 12486) @@ -25,11 +25,14 @@ <h:form id="mainForm"> <rich:dataGrid id="dataGrid" value="#{dataGrid.model}" var="element" elements="#{dataGrid.elements}" ajaxKeys="#{dataGrid.ajaxKeys}" - stateVar="stateVar" rowKeyVar="rowKeyVar"> + stateVar="stateVar" rowKeyVar="rowKeyVar" + componentState="#{componentState}"> <h:panelGroup> <h:outputText id="rowKeyVar" value="#{rowKeyVar} "></h:outputText> <h:outputText id="first" value="#{stateVar.range.firstRow} "></h:outputText> <h:outputText id="rows" value="#{stateVar.range.rows} "></h:outputText> + <h:outputText id="firstState" value="#{componentState.range.firstRow} "></h:outputText> + <h:outputText id="rowsState" value="#{componentState.range.rows} "></h:outputText> <h:outputText value="#{element.cell1}"></h:outputText> <h:inputText id="inputText" value="#{element.cell2}" validator="#{dataGrid.validate}"></h:inputText> <h:outputText value="#{element.cell3}"></h:outputText> Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java 2009-01-29 15:20:29 UTC (rev 12485) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java 2009-01-29 15:36:39 UTC (rev 12486) @@ -99,6 +99,16 @@ } } + /** + * componentState attribute stores nested components state across requests + */ + @Test + public void testComponentState(Template template) { + init(template); + Assert.assertEquals(selenium.getText(dataGrid + ":2:firstState"), "0", "Attribute 'componentState' works wrong."); + Assert.assertEquals(selenium.getText(dataGrid + ":2:rowsState"), "0", "Attribute 'componentState' works wrong."); + } + private void chekStructure(int ... notEqualRows) { String dataTableRowLocator = "id('"+ dataTable + "')/tbody/tr"; int count = selenium.getXpathCount(dataTableRowLocator).intValue();