Author: lfryc(a)redhat.com Date: 2010-08-11 17:21:57 -0400 (Wed, 11 Aug 2010) New Revision: 18578 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestPagination.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/PaginationTester.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestPagination.java Log: refactored PaginationTester to make possible set DataScroller directly Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestPagination.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestPagination.java 2010-08-11 21:21:10 UTC (rev 18577) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestPagination.java 2010-08-11 21:21:57 UTC (rev 18578) @@ -27,7 +27,6 @@ import javax.xml.bind.JAXBException; -import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.model.DataScroller; @@ -43,10 +42,10 @@ public class TestPagination extends AbstractDataGridTest { @Inject - @Use("dataScrollerLocator*") - JQueryLocator dataScrollerLocator; - JQueryLocator dataScrollerLocator1 = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE; - JQueryLocator dataScrollerLocator2 = PaginationTester.DATA_SCROLLER_IN_TABLE_FOOTER; + @Use("dataScroller*") + DataScroller dataScroller; + DataScroller dataScroller1 = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE; + DataScroller dataScroller2 = PaginationTester.DATA_SCROLLER_IN_TABLE_FOOTER; PaginationTester paginationTester = new PaginationTester() { @@ -56,21 +55,19 @@ @Override protected void verifyAfterScrolling() { - page = getDataScroller().getCurrentPage(); - lastPage = getDataScroller().getLastPage(); + page = dataScroller.getCurrentPage(); + lastPage = dataScroller.getLastPage(); verifyGrid(); } }; - DataScroller dataScroller = paginationTester.getDataScroller(); - public TestPagination() throws JAXBException { super(); } @BeforeMethod public void setupDataScroller() { - dataScroller.setRoot(dataScrollerLocator); + paginationTester.setDataScroller(dataScroller); int lastPage = dataScroller.obtainLastPage(); dataScroller.setLastPage(lastPage); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/PaginationTester.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/PaginationTester.java 2010-08-11 21:21:10 UTC (rev 18577) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/PaginationTester.java 2010-08-11 21:21:57 UTC (rev 18578) @@ -21,7 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.richDataScroller; -import org.jboss.test.selenium.locator.JQueryLocator; +import org.richfaces.tests.metamer.ftest.model.AssertingDataScroller; import org.richfaces.tests.metamer.ftest.model.DataScroller; import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq; @@ -33,8 +33,10 @@ */ public abstract class PaginationTester { - public static final JQueryLocator DATA_SCROLLER_OUTSIDE_TABLE = pjq("span.rf-ds[id$=scroller1]"); - public static final JQueryLocator DATA_SCROLLER_IN_TABLE_FOOTER = pjq("span.rf-ds[id$=scroller2]"); + public static final AssertingDataScroller DATA_SCROLLER_OUTSIDE_TABLE = new AssertingDataScroller( + "ds-outside-table", pjq("span.rf-ds[id$=scroller1]")); + public static final AssertingDataScroller DATA_SCROLLER_IN_TABLE_FOOTER = new AssertingDataScroller( + "ds-in-table-footer", pjq("span.rf-ds[id$=scroller2]")); protected DataScroller dataScroller; private int[] testPages; @@ -47,10 +49,6 @@ } } - public DataScroller getDataScroller() { - return dataScroller; - } - public void setDataScroller(DataScroller dataScroller) { this.dataScroller = dataScroller; } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestPagination.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestPagination.java 2010-08-11 21:21:10 UTC (rev 18577) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestPagination.java 2010-08-11 21:21:57 UTC (rev 18578) @@ -30,7 +30,6 @@ import java.net.URL; import org.jboss.test.selenium.locator.IdLocator; -import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.Use; @@ -56,10 +55,10 @@ int maxPages; @Inject - @Use("dataScrollerLocator*") - JQueryLocator dataScrollerLocator; - JQueryLocator dataScrollerLocator1 = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE; - JQueryLocator dataScrollerLocator2 = PaginationTester.DATA_SCROLLER_IN_TABLE_FOOTER; + @Use("dataScroller*") + DataScroller dataScroller; + DataScroller dataScroller1 = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE; + DataScroller dataScroller2 = PaginationTester.DATA_SCROLLER_IN_TABLE_FOOTER; PaginationTester paginationTester = new PaginationTester() { @@ -77,8 +76,7 @@ IdLocator attributeFastStep = id("form:attributes:fastStepInput"); IdLocator attributeMaxPages = id("form:attributes:maxPagesInput"); - - DataScroller dataScroller = paginationTester.getDataScroller(); + DataTable dataTable = new DataTable(pjq("table.rf-dt[id$=richDataTable]")); String tableText; @@ -93,7 +91,7 @@ guardHttp(selenium).type(attributeFastStep, String.valueOf(fastStep)); guardHttp(selenium).type(attributeMaxPages, String.valueOf(maxPages)); - dataScroller.setRoot(dataScrollerLocator); + paginationTester.setDataScroller(dataScroller); dataScroller.setFastStep(fastStep); int lastPage = dataScroller.obtainLastPage();