Author: lfryc(a)redhat.com Date: 2010-07-20 09:31:25 -0400 (Tue, 20 Jul 2010) New Revision: 18158 Added: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java Removed: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractTestappTestCase.java Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/A4JActionListenerTestCase.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/A4JCommandButtonTestCase.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/A4JCommandLinkTestCase.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/A4JLogTestCase.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/A4JOutputPanelTestCase.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/PollTestCase.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/AbstractPushTestCase.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/HCommandButtonTestCase.java root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/ScrollerTestCase.java Log: renamed AbstractTestappTestCase to AbstractMetamerTest Copied: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java (from rev 18155, root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractTestappTestCase.java) =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java (rev 0) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -0,0 +1,190 @@ +/******************************************************************************* + * 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; + +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.testng.Assert.assertEquals; + +import java.net.URL; + +import org.jboss.test.selenium.AbstractTestCase; +import org.jboss.test.selenium.dom.Event; +import org.jboss.test.selenium.encapsulated.JavaScript; +import org.jboss.test.selenium.locator.ElementLocator; +import org.jboss.test.selenium.locator.JQueryLocator; +import org.testng.SkipException; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Optional; +import org.testng.annotations.Parameters; + +/** + * Abstract test case used as a basis for majority of test cases. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +public abstract class AbstractMetamerTest extends AbstractTestCase { + + /** + * timeout in miliseconds + */ + public static final long TIMEOUT = 5000; + private String[][] templates; + + /** + * Returns the url to test page to be opened by Selenium + * + * @return absolute url to the test page to be opened by Selenium + */ + public abstract URL getTestUrl(); + + /** + * Data provider for templates. + * + * @return array containing templates that should be used (defined in testng.xml) or default array (containing only + * plain template) if nothing is defined + */ + @DataProvider(name = "templates") + protected Object[][] getTemplates() { + if (templates != null && templates.length > 0) { + return templates; + } + + return new Object[][]{{"plain"}}; + } + + /** + * Loads and parses attribute "templates" from testng.xml. + * + * @param urlParams + */ + @BeforeClass(alwaysRun = true) + @Parameters({"templates"}) + public void initTemplates(@Optional String urlParams) { + if (urlParams == null) { + return; + } + + String[] array = urlParams.split(" "); + templates = new String[array.length][]; + + for (int i = 0; i < array.length; i++) { + templates[i] = new String[1]; + templates[i][0] = array[i]; + } + } + + /** + * Opens the tested page. If templates is not empty nor null, it appends url parameter with templates. + * + * @param templates + * templates that will be used for test, e.g. "red_div" + */ + @BeforeMethod(alwaysRun = true) + public void loadPage(Object[] templates) { + if (selenium == null) { + new SkipException("selenium isn't initialized"); + } + String urlParams = ""; + if (templates != null && templates.length != 0) { + urlParams = "?templates=" + templates[0]; + } + selenium.open(buildUrl(getTestUrl() + urlParams)); + selenium.waitForPageToLoad(TIMEOUT); + } + + /** + * Invalidates session by clicking on a button on tested page. + */ + public void invalidateSession() { + selenium.deleteAllVisibleCookies(); + } + + /** + * Forces the current thread sleep for given time. + * + * @param millis + * number of miliseconds for which the thread will sleep + */ + @Deprecated + protected void waitFor(long millis) { + try { + Thread.sleep(millis); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + /** + * Factory method for creating instances of class JQueryLocator which locates the element using <a + * href="http://api.jquery.com/category/selectors/">JQuery Selector</a> syntax. It adds "div.content " in front of + * each selector. + * + * @param jquerySelector + * the jquery selector + * @return the j query locator + * @see JQueryLocator + */ + public static JQueryLocator pjq(String jquerySelector) { + return new JQueryLocator("div.content " + jquerySelector); + } + + /** + * A helper method for testing javascripts events. It sets alert('testedevent') to the input field for given event + * and fires the event. Then it checks the message in the alert dialog. + * + * @param event + * JavaScript event to be tested + * @param element + * locator of tested element + */ + protected void testFireEvent(Event event, ElementLocator element) { + ElementLocator eventInput = pjq("input[id$=on" + event.getEventName() + "Input]"); + final String value = "alert('" + event.getEventName() + "')"; + + selenium.type(eventInput, value); + selenium.waitForPageToLoad(TIMEOUT); + + selenium.fireEvent(element, event); + + assertEquals(selenium.getAlert(), event.getEventName(), event.getEventName() + + " attribute did not change correctly"); + } + + /** + * Hides header, footer and inputs for attributes. + */ + protected void hideControls() { + selenium.getEval(new JavaScript("window.hideControls()")); + } + + /** + * Shows header, footer and inputs for attributes. + */ + protected void showControls() { + selenium.getEval(new JavaScript("window.showControls()")); + } + +} Deleted: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractTestappTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractTestappTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractTestappTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -1,190 +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; - -import static org.jboss.test.selenium.utils.URLUtils.buildUrl; -import static org.testng.Assert.assertEquals; - -import java.net.URL; - -import org.jboss.test.selenium.AbstractTestCase; -import org.jboss.test.selenium.dom.Event; -import org.jboss.test.selenium.encapsulated.JavaScript; -import org.jboss.test.selenium.locator.ElementLocator; -import org.jboss.test.selenium.locator.JQueryLocator; -import org.testng.SkipException; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Optional; -import org.testng.annotations.Parameters; - -/** - * Abstract test case used as a basis for majority of test cases. - * - * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> - * @version $Revision$ - */ -public abstract class AbstractTestappTestCase extends AbstractTestCase { - - /** - * timeout in miliseconds - */ - public static final long TIMEOUT = 5000; - private String[][] templates; - - /** - * Returns the url to test page to be opened by Selenium - * - * @return absolute url to the test page to be opened by Selenium - */ - public abstract URL getTestUrl(); - - /** - * Data provider for templates. - * - * @return array containing templates that should be used (defined in testng.xml) or default array (containing only - * plain template) if nothing is defined - */ - @DataProvider(name = "templates") - protected Object[][] getTemplates() { - if (templates != null && templates.length > 0) { - return templates; - } - - return new Object[][]{{"plain"}}; - } - - /** - * Loads and parses attribute "templates" from testng.xml. - * - * @param urlParams - */ - @BeforeClass(alwaysRun = true) - @Parameters({"templates"}) - public void initTemplates(@Optional String urlParams) { - if (urlParams == null) { - return; - } - - String[] array = urlParams.split(" "); - templates = new String[array.length][]; - - for (int i = 0; i < array.length; i++) { - templates[i] = new String[1]; - templates[i][0] = array[i]; - } - } - - /** - * Opens the tested page. If templates is not empty nor null, it appends url parameter with templates. - * - * @param templates - * templates that will be used for test, e.g. "red_div" - */ - @BeforeMethod(alwaysRun = true) - public void loadPage(Object[] templates) { - if (selenium == null) { - new SkipException("selenium isn't initialized"); - } - String urlParams = ""; - if (templates != null && templates.length != 0) { - urlParams = "?templates=" + templates[0]; - } - selenium.open(buildUrl(getTestUrl() + urlParams)); - selenium.waitForPageToLoad(TIMEOUT); - } - - /** - * Invalidates session by clicking on a button on tested page. - */ - public void invalidateSession() { - selenium.deleteAllVisibleCookies(); - } - - /** - * Forces the current thread sleep for given time. - * - * @param millis - * number of miliseconds for which the thread will sleep - */ - @Deprecated - protected void waitFor(long millis) { - try { - Thread.sleep(millis); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - - /** - * Factory method for creating instances of class JQueryLocator which locates the element using <a - * href="http://api.jquery.com/category/selectors/">JQuery Selector</a> syntax. It adds "div.content " in front of - * each selector. - * - * @param jquerySelector - * the jquery selector - * @return the j query locator - * @see JQueryLocator - */ - public static JQueryLocator pjq(String jquerySelector) { - return new JQueryLocator("div.content " + jquerySelector); - } - - /** - * A helper method for testing javascripts events. It sets alert('testedevent') to the input field for given event - * and fires the event. Then it checks the message in the alert dialog. - * - * @param event - * JavaScript event to be tested - * @param element - * locator of tested element - */ - protected void testFireEvent(Event event, ElementLocator element) { - ElementLocator eventInput = pjq("input[id$=on" + event.getEventName() + "Input]"); - final String value = "alert('" + event.getEventName() + "')"; - - selenium.type(eventInput, value); - selenium.waitForPageToLoad(TIMEOUT); - - selenium.fireEvent(element, event); - - assertEquals(selenium.getAlert(), event.getEventName(), event.getEventName() - + " attribute did not change correctly"); - } - - /** - * Hides header, footer and inputs for attributes. - */ - protected void hideControls() { - selenium.getEval(new JavaScript("window.hideControls()")); - } - - /** - * Shows header, footer and inputs for attributes. - */ - protected void showControls() { - selenium.getEval(new JavaScript("window.showControls()")); - } - -} Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/A4JActionListenerTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/A4JActionListenerTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/A4JActionListenerTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -32,7 +32,7 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.waiting.ajax.JavaScriptCondition; import org.jboss.test.selenium.waiting.selenium.SeleniumCondition; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -42,7 +42,7 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class A4JActionListenerTestCase extends AbstractTestappTestCase { +public class A4JActionListenerTestCase extends AbstractMetamerTest { private ElementLocator invokeButtonType = pjq("input[id$=invokeByTypeButton]"); private ElementLocator invokeButtonBinding = pjq("input[id$=invokeByBindingButton]"); Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/A4JCommandButtonTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/A4JCommandButtonTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/A4JCommandButtonTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -33,7 +33,7 @@ import org.jboss.test.selenium.locator.Attribute; import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.ElementLocator; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -43,7 +43,7 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class A4JCommandButtonTestCase extends AbstractTestappTestCase { +public class A4JCommandButtonTestCase extends AbstractMetamerTest { private ElementLocator input = pjq("input[id$=input]"); private ElementLocator button = pjq("input[id$=a4jCommandButton]"); Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/A4JCommandLinkTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/A4JCommandLinkTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/A4JCommandLinkTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -33,7 +33,7 @@ import org.jboss.test.selenium.locator.Attribute; import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.ElementLocator; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -43,7 +43,7 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class A4JCommandLinkTestCase extends AbstractTestappTestCase { +public class A4JCommandLinkTestCase extends AbstractMetamerTest { private ElementLocator input = pjq("input[id$=input]"); private ElementLocator link = pjq("a[id$=a4jCommandLink]"); Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/A4JLogTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/A4JLogTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/A4JLogTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -32,7 +32,7 @@ import org.jboss.test.selenium.locator.ElementLocator; import org.jboss.test.selenium.locator.JQueryLocator; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -42,7 +42,7 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class A4JLogTestCase extends AbstractTestappTestCase { +public class A4JLogTestCase extends AbstractMetamerTest { /** * Enumeration representing all possible levels for a4j:log. Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/A4JOutputPanelTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/A4JOutputPanelTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/A4JOutputPanelTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -34,7 +34,7 @@ import org.jboss.test.selenium.locator.Attribute; import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.ElementLocator; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.AfterMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -45,7 +45,7 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class A4JOutputPanelTestCase extends AbstractTestappTestCase { +public class A4JOutputPanelTestCase extends AbstractMetamerTest { private ElementLocator increaseCounterButton = pjq("input[id$=button]"); private ElementLocator outputDiv = pjq("div[id$=outputPanel]"); Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/PollTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/PollTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/PollTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -28,7 +28,7 @@ import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.ElementLocator; import org.jboss.test.selenium.locator.JQueryLocator; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -45,7 +45,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public class PollTestCase extends AbstractTestappTestCase { +public class PollTestCase extends AbstractMetamerTest { private static final Attribute ATTRIBUTE_TITLE = new Attribute("title"); private static final int[] TEST_INTERVAL_VALUES = new int[]{1000, 5000, 500}; Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/AbstractPushTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/AbstractPushTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/AbstractPushTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -35,7 +35,7 @@ import org.jboss.test.selenium.SystemProperties; import org.jboss.test.selenium.locator.ElementLocator; import org.jboss.test.selenium.request.RequestType; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.BeforeClass; /** @@ -44,7 +44,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public abstract class AbstractPushTestCase extends AbstractTestappTestCase { +public abstract class AbstractPushTestCase extends AbstractMetamerTest { private static final int STATUS_CODE_OK = 200; Modified: root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/HCommandButtonTestCase.java =================================================================== --- root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/HCommandButtonTestCase.java 2010-07-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/HCommandButtonTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -33,7 +33,7 @@ import org.jboss.test.selenium.locator.Attribute; import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.JQueryLocator; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -43,7 +43,7 @@ * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ -public class HCommandButtonTestCase extends AbstractTestappTestCase { +public class HCommandButtonTestCase extends AbstractMetamerTest { private JQueryLocator input = pjq("input[id$=input]"); private JQueryLocator button = pjq("input[id$=commandButton]"); 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-20 13:17:34 UTC (rev 18157) +++ root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/ScrollerTestCase.java 2010-07-20 13:31:25 UTC (rev 18158) @@ -29,7 +29,7 @@ import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.ElementLocator; -import org.richfaces.tests.metamer.ftest.AbstractTestappTestCase; +import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.Test; /** @@ -38,7 +38,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public class ScrollerTestCase extends AbstractTestappTestCase { +public class ScrollerTestCase extends AbstractMetamerTest { private static final int TOTAL_ROW_COUNT = 50; private static final Integer[] ROW_COUNT_VALUES =