Author: lfryc(a)redhat.com Date: 2010-12-05 12:34:35 -0500 (Sun, 05 Dec 2010) New Revision: 20397 Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/ExtendedDataTable.java Removed: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataTable.java Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestScroller.java Log: DataTable model class renamed to ExtendedDataTable Deleted: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataTable.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataTable.java 2010-12-04 00:57:14 UTC (rev 20396) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataTable.java 2010-12-05 17:34:35 UTC (rev 20397) @@ -1,58 +0,0 @@ -/******************************************************************************* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.model; - -import org.jboss.test.selenium.framework.AjaxSelenium; -import org.jboss.test.selenium.framework.AjaxSeleniumProxy; -import org.jboss.test.selenium.locator.JQueryLocator; -import org.jboss.test.selenium.locator.reference.ReferencedLocator; - -import static org.jboss.test.selenium.locator.reference.ReferencedLocator.*; - -/** - * Provides methods to control DataTable - * - * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> - * @version $Revision$ - */ -public class DataTable extends AbstractModel<JQueryLocator> { - - AjaxSelenium selenium = AjaxSeleniumProxy.getInstance(); - - ReferencedLocator<JQueryLocator> tableRows = ref(root, "> div.rf-edt-b table table tr"); - - public DataTable(JQueryLocator root) { - super(root); - } - - public DataTable(String name, JQueryLocator root) { - super(name, root); - } - - public int getCountOfTableRows() { - return selenium.getCount(tableRows); - } - - public String getTableText() { - return selenium.getText(root.getLocator()); - } -} Copied: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/ExtendedDataTable.java (from rev 20308, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataTable.java) =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/ExtendedDataTable.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/ExtendedDataTable.java 2010-12-05 17:34:35 UTC (rev 20397) @@ -0,0 +1,58 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * 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.model; + +import org.jboss.test.selenium.framework.AjaxSelenium; +import org.jboss.test.selenium.framework.AjaxSeleniumProxy; +import org.jboss.test.selenium.locator.JQueryLocator; +import org.jboss.test.selenium.locator.reference.ReferencedLocator; + +import static org.jboss.test.selenium.locator.reference.ReferencedLocator.*; + +/** + * Provides methods to control DataTable + * + * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> + * @version $Revision$ + */ +public class ExtendedDataTable extends AbstractModel<JQueryLocator> { + + AjaxSelenium selenium = AjaxSeleniumProxy.getInstance(); + + ReferencedLocator<JQueryLocator> tableRows = ref(root, "> div.rf-edt-b table table tr"); + + public ExtendedDataTable(JQueryLocator root) { + super(root); + } + + public ExtendedDataTable(String name, JQueryLocator root) { + super(name, root); + } + + public int getCountOfTableRows() { + return selenium.getCount(tableRows); + } + + public String getTableText() { + return selenium.getText(root.getLocator()); + } +} Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java 2010-12-04 00:57:14 UTC (rev 20396) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java 2010-12-05 17:34:35 UTC (rev 20397) @@ -34,7 +34,7 @@ import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.model.DataScroller; -import org.richfaces.tests.metamer.ftest.model.DataTable; +import org.richfaces.tests.metamer.ftest.model.ExtendedDataTable; import org.testng.annotations.BeforeMethod; /** @@ -75,7 +75,7 @@ IdLocator attributeFastStep = id("form:attributes:fastStepInput"); IdLocator attributeMaxPages = id("form:attributes:maxPagesInput"); - DataTable dataTable = new DataTable(pjq("table.rf-dt[id$=richDataTable]")); + ExtendedDataTable dataTable = new ExtendedDataTable(pjq("table.rf-dt[id$=richDataTable]")); String tableText; Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestScroller.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestScroller.java 2010-12-04 00:57:14 UTC (rev 20396) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestScroller.java 2010-12-05 17:34:35 UTC (rev 20397) @@ -32,7 +32,7 @@ import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.richfaces.tests.metamer.ftest.model.AssertingDataScroller; import org.richfaces.tests.metamer.ftest.model.DataScroller; -import org.richfaces.tests.metamer.ftest.model.DataTable; +import org.richfaces.tests.metamer.ftest.model.ExtendedDataTable; import org.testng.annotations.Test; /** @@ -48,7 +48,7 @@ TOTAL_ROW_COUNT + 1, 2 * TOTAL_ROW_COUNT }; DataScroller dataScroller1 = new AssertingDataScroller("outside-table", pjq("span.rf-ds[id$=scroller1]")); DataScroller dataScroller2 = new AssertingDataScroller("inside-table-footer", pjq("span.rf-ds[id$=scroller2]")); - DataTable table = new DataTable(pjq("div.rf-edt[id$=richEDT]")); + ExtendedDataTable table = new ExtendedDataTable(pjq("div.rf-edt[id$=richEDT]")); IdLocator attributeRowsInput = id("form:attributes:rowsInput"); @Override