[richfaces-svn-commits] JBoss Rich Faces SVN: r12475 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: konstantin.mishin
Date: 2009-01-28 15:25:42 -0500 (Wed, 28 Jan 2009)
New Revision: 12475

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-5679

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-28 18:42:52 UTC (rev 12474)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml	2009-01-28 20:25:42 UTC (rev 12475)
@@ -23,8 +23,13 @@
 			</h:selectBooleanCheckbox-->		
 		</h:form>
 		<h:form id="mainForm">
-			<rich:dataGrid id="dataGrid" value="#{dataGrid.model}" var="element" elements="#{dataGrid.elements}" ajaxKeys="#{dataGrid.ajaxKeys}">
+			<rich:dataGrid id="dataGrid" value="#{dataGrid.model}" var="element"
+				elements="#{dataGrid.elements}" ajaxKeys="#{dataGrid.ajaxKeys}"
+				stateVar="stateVar" rowKeyVar="rowKeyVar">
 				<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 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-28 18:42:52 UTC (rev 12474)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java	2009-01-28 20:25:42 UTC (rev 12475)
@@ -85,6 +85,20 @@
 		chekStructure(3, 7);        
 	}
 
+    /**
+     *  components using rowKeyVar and stateVar variables are correctly output to the client
+     */
+	@Test
+	public void testVars(Template template) {
+        init(template);
+		Assert.assertEquals(selenium.getText(dataGrid + ":2:first"), "0", "Attribute 'stateVar' works wrong.");
+		Assert.assertEquals(selenium.getText(dataGrid + ":2:rows"), "0", "Attribute 'stateVar' works wrong.");
+		int rows = selenium.getXpathCount("id('"+ dataGrid + "')/tbody/tr").intValue();		
+		for (int i = 0; i < rows; i++) {
+			Assert.assertEquals(selenium.getText(dataGrid + ":" + i + ":rowKeyVar"), Integer.toString(i));			
+		}
+	}
+
 	private void chekStructure(int ... notEqualRows) {
 		String dataTableRowLocator = "id('"+ dataTable + "')/tbody/tr";
 		int count = selenium.getXpathCount(dataTableRowLocator).intValue();