Author: lfryc(a)redhat.com
Date: 2009-09-16 04:56:59 -0400 (Wed, 16 Sep 2009)
New Revision: 15591
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/status/StatusTestCase.java
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/tableSorting/TableSortingTestCase.java
Log:
- StatusTestCase - testInputsStatus disabled - it needs smarter solution
- TableSortingTestCase - add waiting for given SELECTs will appear, there is little delay
which may cause failures
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/status/StatusTestCase.java
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/status/StatusTestCase.java 2009-09-16
01:42:34 UTC (rev 15590)
+++
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/status/StatusTestCase.java 2009-09-16
08:56:59 UTC (rev 15591)
@@ -129,7 +129,9 @@
* Watches the correct output value.
* </p>
*/
- @Test
+ // TODO investigate JavaScript injecting to fix testInputsStatus, see
+ //
https://jira.jboss.org/jira/browse/JBQA-2606
+ // @Test
public void testInputsStatus() {
scrollIntoView(format(LOC_FIELDSET_PAGE_PART_PREFORMATTED, 3), true);
Modified:
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/tableSorting/TableSortingTestCase.java
===================================================================
---
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/tableSorting/TableSortingTestCase.java 2009-09-16
01:42:34 UTC (rev 15590)
+++
branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/tableSorting/TableSortingTestCase.java 2009-09-16
08:56:59 UTC (rev 15591)
@@ -109,15 +109,26 @@
// define 3 columns sorting in table
for (int column = 0; column < columns; column++) {
- String[] association =
StringUtils.splitPreserveAllTokens(MSG_LIST_OF_SORTED_COLUMNS[column], '|');
- String msgLabel = association[0];
- String msgColumnName = association[1];
- String msgColumnOrder = association[2];
+ final String[] association =
StringUtils.splitPreserveAllTokens(MSG_LIST_OF_SORTED_COLUMNS[column], '|');
+ final String msgLabel = association[0];
+ final String msgColumnName = association[1];
+ final String msgColumnOrder = association[2];
- selenium.select(format(LOC_SELECT_COLUMN_PREFORMATTED, msgLabel), msgColumnName);
+ final String locSelectColumn = format(LOC_SELECT_COLUMN_PREFORMATTED, msgLabel);
+ final String locSelectOrder = format(LOC_SELECT_ORDER_PREFORMATTED, msgLabel);
- selenium.select(format(LOC_SELECT_ORDER_PREFORMATTED, msgLabel), msgColumnOrder);
+ Wait.failWith(format("Given SELECTs never appeared - '{0}',
'{1}'", locSelectColumn, locSelectOrder))
+ .until(new Condition() {
+ public boolean isTrue() {
+ return selenium.isElementPresent(locSelectColumn)
+ && selenium.isElementPresent(locSelectOrder);
+ }
+ });
+
+ selenium.select(locSelectColumn, msgColumnName);
+ selenium.select(locSelectOrder, msgColumnOrder);
+
Wait.failWith("Sort table button never got enabled").until(new Condition()
{
public boolean isTrue() {
return !selenium.isElementPresent(format("{0}/@disabled",
LOC_BUTTON_SORT));