Author: abelevich
Date: 2009-03-30 07:07:06 -0400 (Mon, 30 Mar 2009)
New Revision: 13286
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ColumnsTest.java
Log:
fix rendered and filtering tests
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ColumnsTest.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ColumnsTest.java 2009-03-30
09:59:44 UTC (rev 13285)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ColumnsTest.java 2009-03-30
11:07:06 UTC (rev 13286)
@@ -81,9 +81,9 @@
String tableId = getParentId() + "_form:table";
- int headerCount =
selenium.getXpathCount("//table[(a)id='"+tableId+"']/tbody/*").intValue();
+ int headerCount =
selenium.getXpathCount("//table[(a)id='"+tableId+"']/thead/*").intValue();
int footerCount =
selenium.getXpathCount("//table[(a)id='"+tableId+"']/tfoot/*").intValue();
- int dataCount =
selenium.getXpathCount("//table[(a)id='"+tableId+"']/tbody/*").intValue();
+ int dataCount =
selenium.getXpathCount("//table[(a)id='"+tableId+"']/tbody/tr/td/*").intValue();
if (headerCount != 0 || footerCount != 0 || dataCount != 0) {
Assert.fail("Rendered attribute does not work. No data and no facets should be
output to client.");
@@ -201,7 +201,7 @@
for (int i = 0; i < columnsCount; i++) {
checkColumnsData(tableId, i, new String [] {String.valueOf(i)}, FEATURE.FILTERING,
"Filterby does snot work.");
}
- AssertTextEquals("//table[@id='"+tableId+"']/thead/tr/th[1]",
"0", "Filter value attribute does not work. Binding value was not
changed.");
+ AssertTextEquals("//table[@id='"+tableId+"']/tbody/tr/td[1]",
"0", "Filter value attribute does not work. Binding value was not
changed.");
// Filter by the third column with '3' filter value
selenium.type(filterInputPath, "");
@@ -212,9 +212,9 @@
waitForAjaxCompletion();
for (int i = 0; i < columnsCount; i++) {
- checkColumnsData(tableId, i, new String [] {String.valueOf(i + 1)},
FEATURE.FILTERING, "Filterby does snot work.");
+ checkColumnsData(tableId, i, new String [] {String.valueOf(i + 1)},
FEATURE.FILTERING, "Filterby does not work.");
}
- AssertTextEquals("//table[@id='"+tableId+"']/thead/tr/th[3]",
"3", "Filter value attribute does not work. Binding value was not
changed.");
+ AssertTextEquals("//table[@id='"+tableId+"']/tbody/tr/td[3]",
"3", "Filter value attribute does not work. Binding value was not
changed.");
//<<<----------------
Show replies by date