Author: lfryc(a)redhat.com
Date: 2009-10-13 04:59:30 -0400 (Tue, 13 Oct 2009)
New Revision: 15713
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractDataIterationTestCase.java
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/extendedDataTable/AbstractExtendedDataTableTestCase.java
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/extendedDataTable/locators-SelectingTestCase.properties
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/extendedDataTable/locators.properties
Log:
* RF-7976 RF demo - ftest - ExtendedDataTable - 'rich-table' class was removed
- waitForSplash was modified to wait-timeout 5s (instead of default 60s)
- added assertion in case of checkSortingForColumnOrder got zero rows (something gets
stucked)
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractDataIterationTestCase.java
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractDataIterationTestCase.java 2009-10-13
05:47:20 UTC (rev 15712)
+++
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractDataIterationTestCase.java 2009-10-13
08:59:30 UTC (rev 15713)
@@ -179,6 +179,8 @@
}
final int rows = selenium.getXpathCount(format(columnsPreformatted[0],
0)).intValue();
+
+ assertTrue(rows > 0, "There must be at least one row in the table");
for (int row = 1; row <= rows; row++) {
for (int column = 0; column < columns; column++) {
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/extendedDataTable/AbstractExtendedDataTableTestCase.java
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/extendedDataTable/AbstractExtendedDataTableTestCase.java 2009-10-13
05:47:20 UTC (rev 15712)
+++
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/extendedDataTable/AbstractExtendedDataTableTestCase.java 2009-10-13
08:59:30 UTC (rev 15713)
@@ -56,7 +56,7 @@
* Wait for splash screen indicating request of table rerendering disappears
*/
protected void waitForSplash() {
- waitModelUpdate.dontFail().interval(5).until(new Condition() {
+ waitModelUpdate.dontFail().interval(5).timeout(5000).until(new Condition() {
public boolean isTrue() {
return selenium.isElementPresent(LOC_DIV_SPLASH_SCREEN);
}
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/extendedDataTable/locators-SelectingTestCase.properties
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/extendedDataTable/locators-SelectingTestCase.properties 2009-10-13
05:47:20 UTC (rev 15712)
+++
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/extendedDataTable/locators-SelectingTestCase.properties 2009-10-13
08:59:30 UTC (rev 15713)
@@ -1,2 +1,2 @@
-TR_SELECTED=//*[contains(@class,'rich-table')]//*[contains(@class,'rich-extdt-firstrow')
and contains(@class,'rich-sdt-row-selected') {0}]
+TR_SELECTED=//*[contains(@class,'extdt-maindiv')]//*[contains(@class,'rich-extdt-firstrow')
and contains(@class,'rich-sdt-row-selected') {0}]
SELECT_SELECTION_MODE=//*[text()\='Selection Mode\:']/../td[2]/select
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/extendedDataTable/locators.properties
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/extendedDataTable/locators.properties 2009-10-13
05:47:20 UTC (rev 15712)
+++
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/resources/org/jboss/richfaces/integrationTest/extendedDataTable/locators.properties 2009-10-13
08:59:30 UTC (rev 15713)
@@ -2,8 +2,8 @@
TH_CAPITAL=//*[contains(@class,'extdt-sortable-header') and text()\='State
Capital']
TH_TIME_ZONE=//*[contains(@class,'extdt-sortable-header') and text()\='Time
Zone']
TH_FLAG=//*[contains(@class,'extdt-sortable-header') and text()\='Flag']
-TD_PREFORMATTED=//*[contains(@class,'rich-table')]//*[contains(@class,'rich-extdt-firstrow')]{0,choice,0\#|1\#[{0}]}/*[contains(@class,'rich-extdt-cell')]{1,choice,0\#|1\#[{1}]}
-TABLE_EXTENDED=//*[contains(@class,'rich-table')]
+TD_PREFORMATTED=//*[contains(@class,'extdt-maindiv')]//*[contains(@class,'rich-extdt-firstrow')]{0,choice,0\#|1\#[{0}]}/*[contains(@class,'rich-extdt-cell')]{1,choice,0\#|1\#[{1}]}
+TABLE_EXTENDED=//*[contains(@class,'extdt-maindiv')]
TH_RELATIVE={0}/../../..
-INPUT_COLUMN_FILTER=//*[contains(@class,'rich-table')]//*[contains(@class,'extdt-table-filterrow')]//*[contains(@class,'rich-extdt-subheadercell')][{0}]//*[@type\='text']
+INPUT_COLUMN_FILTER=//*[contains(@class,'extdt-maindiv')]//*[contains(@class,'extdt-table-filterrow')]//*[contains(@class,'rich-extdt-subheadercell')][{0}]//*[@type\='text']
DIV_SPLASH_SCREEN=//*[@class\='extdt-ss-vsbl']
\ No newline at end of file