Author: ppitonak(a)redhat.com Date: 2010-07-12 09:15:29 -0400 (Mon, 12 Jul 2010) New Revision: 17952 Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/DataTable.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/ScrollerTestCase.java Log: * fixed tests for EDT with data scroller Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/DataTable.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/DataTable.java 2010-07-12 10:08:08 UTC (rev 17951) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/DataTable.java 2010-07-12 13:15:29 UTC (rev 17952) @@ -19,7 +19,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *******************************************************************************/ - package org.richfaces.tests.metamer.ftest.richExtendedDataTable; import org.jboss.test.selenium.framework.AjaxSelenium; @@ -35,9 +34,8 @@ public class DataTable { AjaxSelenium selenium = AjaxSeleniumProxy.getInstance(); - JQueryLocator tableRoot; - JQueryLocator tableRows = jq(".rf-dt-c:nth-child(1)"); + JQueryLocator tableRows = jq("div.rf-edt-b table table tr"); public DataTable(JQueryLocator tableRoot) { super(); Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/ScrollerTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/ScrollerTestCase.java 2010-07-12 10:08:08 UTC (rev 17951) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/ScrollerTestCase.java 2010-07-12 13:15:29 UTC (rev 17952) @@ -19,7 +19,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *******************************************************************************/ - package org.richfaces.tests.metamer.ftest.richExtendedDataTable; import static org.jboss.test.selenium.locator.LocatorFactory.*; @@ -43,11 +42,10 @@ private static final int TOTAL_ROW_COUNT = 50; private static final Integer[] ROW_COUNT_VALUES = - new Integer[]{null, 10, 1, TOTAL_ROW_COUNT, 13, 9, 17, TOTAL_ROW_COUNT + 1, 2 * TOTAL_ROW_COUNT}; - + new Integer[]{null, 10, 1, TOTAL_ROW_COUNT, 13, 9, 17, TOTAL_ROW_COUNT + 1, 2 * TOTAL_ROW_COUNT}; DataScroller dataScroller1 = new DataScroller(pjq("span.rf-ds[id$=scroller1]")); DataScroller dataScroller2 = new DataScroller(pjq("span.rf-ds[id$=scroller2]")); - DataTable table = new DataTable(pjq("table.rf-dt[id$=richEDT]")); + DataTable table = new DataTable(pjq("div.rf-edt[id$=richEDT]")); ElementLocator attributeRowsInput = id("form:attributes:rowsInput"); @Override @@ -103,7 +101,6 @@ for (Integer rowsPerPage : ROW_COUNT_VALUES) { if (rowsPerPage != null) { selenium.type(attributeRowsInput, String.valueOf(rowsPerPage)); - selenium.fireEvent(attributeRowsInput, Event.BLUR); selenium.waitForPageToLoad(); } @@ -141,5 +138,4 @@ int result = TOTAL_ROW_COUNT % rowCountPreset; return (result == 0) ? rowCountPreset : result; } - }