January 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r16283 - in branches/sandbox/rf-demo-ftest-iexplore/src/test: resources/user-extensions and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-01-14 06:21:12 -0500 (Thu, 14 Jan 2010) New Revision: 16283 Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/user-extensions/rfqa-extensions.js Log: - moved getJQueryCount to selenium-testing-lib (now richfaces-selenium) Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2010-01-14 10:51:23 UTC (rev 16282) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2010-01-14 11:21:12 UTC (rev 16283) @@ -408,11 +408,4 @@ private int getRunnedTestCount(ITestContext context) { return context.getPassedTests().size() + context.getSkippedTests().size() + context.getFailedTests().size(); } - - @Override - public int getJQueryCount(String locator) { - String evaluate = format("selenium.getJQueryCount(\"{0}\")", locator.replaceFirst("^jquery=", "")); - String result = selenium.getEval(evaluate); - return Integer.parseInt(result); - } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/user-extensions/rfqa-extensions.js =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/user-extensions/rfqa-extensions.js 2010-01-14 10:51:23 UTC (rev 16282) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/user-extensions/rfqa-extensions.js 2010-01-14 11:21:12 UTC (rev 16283) @@ -88,12 +88,6 @@ match[3]); } -Selenium.prototype.getJQueryCount = function(jquery) { - var inDocument = this.browserbot.getDocument(); - var found = $(inDocument).find(jquery); - return found.length; -} - var jqFind = function(selector) { return $(selenium.browserbot.getCurrentWindow().document).find(selector); }

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16282 - branches/community/3.3.X/samples/richfaces-demo/functional-test.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-01-14 05:51:23 -0500 (Thu, 14 Jan 2010) New Revision: 16282 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml Log: - following changes in selenium-testing-lib (changed artifactId - org.jboss.test:richfaces-selenium) Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2010-01-14 10:02:55 UTC (rev 16281) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/pom.xml 2010-01-14 10:51:23 UTC (rev 16282) @@ -157,7 +157,7 @@ </goals> <configuration> <includeGroupIds>org.jboss.test</includeGroupIds> - <includeArtifactIds>selenium</includeArtifactIds> + <includeArtifactIds>richfaces-selenium</includeArtifactIds> <includes>jbossqa-extensions.js</includes> <outputDirectory>${extensions.dir}</outputDirectory> <overWriteReleases>true</overWriteReleases> @@ -525,7 +525,7 @@ </dependency> <dependency> <groupId>org.jboss.test</groupId> - <artifactId>selenium</artifactId> + <artifactId>richfaces-selenium</artifactId> <version>1.0-SNAPSHOT</version> <scope>test</scope> </dependency>

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16281 - branches/community/3.3.X/test-applications/selenium-testing-lib.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-01-14 05:02:55 -0500 (Thu, 14 Jan 2010) New Revision: 16281 Modified: branches/community/3.3.X/test-applications/selenium-testing-lib/pom.xml Log: - preparing selenium-testing-lib for release (changed artifactId - org.jboss.test:richfaces-selenium) Modified: branches/community/3.3.X/test-applications/selenium-testing-lib/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/selenium-testing-lib/pom.xml 2010-01-13 18:34:23 UTC (rev 16280) +++ branches/community/3.3.X/test-applications/selenium-testing-lib/pom.xml 2010-01-14 10:02:55 UTC (rev 16281) @@ -2,27 +2,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.test</groupId> - <artifactId>selenium</artifactId> + <artifactId>richfaces-selenium</artifactId> <packaging>jar</packaging> <version>1.0-SNAPSHOT</version> - <name>selenium-testing-lib</name> + <name>richfaces-selenium</name> <url>http://maven.apache.org</url> <scm> - <developerConnection> + <developerConnection> scm:svn:https://svn.jboss.org/repos/richfaces/branches/community/3.3.X/te... </developerConnection> - </scm> + </scm> -<distributionManagement> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> + <distributionManagement> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + </snapshotRepository> + </distributionManagement> - <repositories> <repository> <id>openqa</id> @@ -37,9 +36,11 @@ </releases> </repository> </repositories> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <build> <plugins> <plugin> @@ -51,6 +52,26 @@ </plugin> </plugins> </build> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.9</version> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + </dependencies> + <profiles> <profile> <id>generate-all-jars</id> @@ -121,33 +142,4 @@ </build> </profile> </profiles> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.client-drivers</groupId> - <artifactId>selenium-java-client-driver</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium.server</groupId> - <artifactId>selenium-server-coreless</artifactId> - <version>1.0.1</version> - <exclusions> - <exclusion> - <groupId>jetty</groupId> - <artifactId>org.mortbay.jetty</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - </dependencies> </project>

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16280 - branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-01-13 13:34:23 -0500 (Wed, 13 Jan 2010) New Revision: 16280 Modified: branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java Log: RFPL-230 porting RF-7203 to enterprise branch Modified: branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2010-01-13 18:28:37 UTC (rev 16279) +++ branches/enterprise/3.3.X/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2010-01-13 18:34:23 UTC (rev 16280) @@ -40,6 +40,7 @@ import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.renderkit.ComponentVariables; import org.ajax4jsf.renderkit.ComponentsVariableResolver; +import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.MenuComponent; import org.richfaces.component.UIMenuItem; import org.richfaces.component.util.ViewUtil; @@ -222,8 +223,18 @@ scriptValue.append("RichFaces.Menu.updateItem(event,this"); scriptValue.append(attrStr); scriptValue.append(");"); - scriptValue.append(AjaxRendererUtils.buildOnClick( - menuItem, context).toString()); + String event = null; + Object onclick = menuItem.getAttributes().get(HTML.onclick_ATTRIBUTE); + if (onclick != null && onclick.toString().length()>0) { + event = HTML.onclick_ATTRIBUTE; + } else { + Object onselect = menuItem.getAttributes().get(HTML.onselect_ATTRIBUTE); + if (onselect != null && onselect.toString().length()>0) { + event = HTML.onselect_ATTRIBUTE; + } + } + scriptValue.append(AjaxRendererUtils.buildOnEvent(menuItem, context, event).toString()); + menuItem.getAttributes().put(HTML.onselect_ATTRIBUTE, null); } else if (MenuComponent.MODE_SERVER.equalsIgnoreCase(mode)) { /*

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16279 - in branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript: ClientUI/common/utils and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-01-13 13:28:37 -0500 (Wed, 13 Jan 2010) New Revision: 16279 Modified: branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUILib.js Log: RFPL-258 porting RF-7929 to enterprise branch Modified: branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js =================================================================== --- branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js 2010-01-13 17:23:33 UTC (rev 16278) +++ branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js 2010-01-13 18:28:37 UTC (rev 16279) @@ -221,7 +221,7 @@ } ); } - if (ClientUILib.isIE7) { + if (ClientUILib.isIE7 || ClientUILib.isIE8) { setTimeout(function() { var scrollElement = grid.getBody().scrollBox.getElement(); var scrollTop = scrollElement.scrollTop; Modified: branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUILib.js =================================================================== --- branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUILib.js 2010-01-13 17:23:33 UTC (rev 16278) +++ branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/javascript/ClientUILib.js 2010-01-13 18:28:37 UTC (rev 16279) @@ -106,6 +106,8 @@ /** @type Boolean */ this.isIE7 = (ua.indexOf('msie 7') > -1); /** @type Boolean */ + this.isIE8 = (ua.indexOf('msie 8') > -1); + /** @type Boolean */ this.isGecko = !this.isSafari && (ua.indexOf('gecko') > -1); if(ua.indexOf("windows") != -1 || ua.indexOf("win32") != -1){

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16278 - branches/enterprise/3.3.X/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-01-13 12:23:33 -0500 (Wed, 13 Jan 2010) New Revision: 16278 Modified: branches/enterprise/3.3.X/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js Log: RFPL-243 porting RF-7420 to enterprise branch Modified: branches/enterprise/3.3.X/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js =================================================================== --- branches/enterprise/3.3.X/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2010-01-13 17:17:52 UTC (rev 16277) +++ branches/enterprise/3.3.X/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/editor.js 2010-01-13 17:23:33 UTC (rev 16278) @@ -40,7 +40,7 @@ destruct: function(isAjax) { A4J.AJAX.removeListener(this.onBeforeAjaxListener); - if(isAjax){ + if(isAjax && this.tinyMCE_editor){ this.tinyMCE_editor.remove(); } this.onInitInstanceCallbackFunction = null; @@ -77,7 +77,9 @@ }, onBeforeAjax: function() { - this.tinyMCE_editor.save(); + if (this.tinyMCE_editor) { + this.tinyMCE_editor.save(); + } }, onInitInstanceCallback: function(inst) {

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16277 - branches/enterprise/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-01-13 12:17:52 -0500 (Wed, 13 Jan 2010) New Revision: 16277 Modified: branches/enterprise/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java Log: RFPL-241 porting RF-7381 to enterprise branch Modified: branches/enterprise/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java =================================================================== --- branches/enterprise/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2010-01-13 15:55:46 UTC (rev 16276) +++ branches/enterprise/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2010-01-13 17:17:52 UTC (rev 16277) @@ -286,9 +286,9 @@ Object value = getLocalValue(); if (value != null) { ValueExpression ve = getValueExpression("value"); - if (ve != null) { - FacesContext context = getFacesContext(); - try { + FacesContext context = getFacesContext(); + if (ve != null && !ve.isReadOnly(context.getELContext())) { + try { ve.setValue(context.getELContext(), value); setValue(null); } catch (ELException e) {

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16276 - in branches/community/3.3.X/test-applications/selenium-testing-lib/src/main: resources and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-01-13 10:55:46 -0500 (Wed, 13 Jan 2010) New Revision: 16276 Modified: branches/community/3.3.X/test-applications/selenium-testing-lib/src/main/java/org/jboss/test/selenium/AbstractSeleniumTestCase.java branches/community/3.3.X/test-applications/selenium-testing-lib/src/main/resources/jbossqa-extensions.js Log: - reimplement getJQueryCount(String selector) to use proper counting way: $(inDocument).find(selector).length Modified: branches/community/3.3.X/test-applications/selenium-testing-lib/src/main/java/org/jboss/test/selenium/AbstractSeleniumTestCase.java =================================================================== --- branches/community/3.3.X/test-applications/selenium-testing-lib/src/main/java/org/jboss/test/selenium/AbstractSeleniumTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) +++ branches/community/3.3.X/test-applications/selenium-testing-lib/src/main/java/org/jboss/test/selenium/AbstractSeleniumTestCase.java 2010-01-13 15:55:46 UTC (rev 16276) @@ -722,22 +722,18 @@ selenium.getEval(evaluate); } - /** - * Returns the count of elements for given jQuery locator. - * @param locator a jQuery locator that doesn't end with :eq(), :last, :first, :odd, etc. - * @return count of elements matching given locator - */ - public int getJQueryCount(String locator) { - int count = 0; - for (int i = 0;; i++) { - if (selenium.isElementPresent(format(locator + ":eq({0})", i))) { - count++; - } else { - break; - } - } - return count; - } + /** + * Returns the count of elements for given jQuery selector + * + * @param selector + * jQuery selector + * @return count of elements matching given selector + */ + public int getJQueryCount(String selector) { + String evaluate = format("selenium.getJQueryCount(\"{0}\")", selector.replaceFirst("^jquery=", "")); + String result = selenium.getEval(evaluate); + return Integer.parseInt(result); + } /** * Checks if element given by locator is member of CSS class given by Modified: branches/community/3.3.X/test-applications/selenium-testing-lib/src/main/resources/jbossqa-extensions.js =================================================================== --- branches/community/3.3.X/test-applications/selenium-testing-lib/src/main/resources/jbossqa-extensions.js 2010-01-13 15:24:41 UTC (rev 16275) +++ branches/community/3.3.X/test-applications/selenium-testing-lib/src/main/resources/jbossqa-extensions.js 2010-01-13 15:55:46 UTC (rev 16276) @@ -166,6 +166,19 @@ } /** + * Returns the count of elements for given jQuery selector + * + * @param selector + * jQuery selector + * @return count of elements matching given selector + */ +Selenium.prototype.getJQueryCount = function(selector) { + var inDocument = this.browserbot.getDocument(); + var found = $(inDocument).find(selector); + return found.length; +} + +/** * Gets the text of an element. This works for any element that contains * text. This command uses either the textContent (Mozilla-like browsers) or * the innerText (IE-like browsers) of the element, which is the rendered

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16275 - in branches/sandbox/rf-demo-ftest-iexplore: src/test/java/org/jboss/richfaces/integrationTest and 63 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-01-13 10:24:41 -0500 (Wed, 13 Jan 2010) New Revision: 16275 Modified: branches/sandbox/rf-demo-ftest-iexplore/pom.xml branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractDataIterationTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/actionParameter/ActionParameterTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxForm/AjaxFormTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxRegion/AjaxRegionTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxSupport/AjaxSupportTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxValidator/AbstractAjaxValidatorTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/beanValidator/BeanValidatorTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarStylingTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/OrganizerTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/colorPicker/ColorPickerTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/columns/ColumnsTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/comboBox/ComboBoxTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/commandButton/CommandButtonTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/commandLink/CommandLinkTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/contextMenu/ContextMenuImageTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/contextMenu/ContextMenuTableTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataFilterSlider/DataFilterSliderTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataGrid/DataGridTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataList/DataListTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataScroller/DataScrollerTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/DataTableTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/EditTableWithModalPanelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/ExtendedDataModelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/ModifiableDataModelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dragSupport/DragSupportTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dropDownMenu/HorizontalMenuTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/editor/AdvancedEditorTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/editor/SimpleEditorTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/extendedDataTable/AbstractExtendedDataTableTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/fileUpload/FileUploadTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/graphValidator/GraphValidatorAfterModelUpdateTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/graphValidator/GraphValidatorTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/include/IncludeTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inplaceInput/InplaceInputTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inplaceSelect/InplaceSelectTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inputNumberSlider/InputNumberSliderTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/jsFunction/JSFunctionTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/keepAlive/KeepAliveTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/listShuttle/ListShuttleTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/log/LogTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/mediaOutput/MediaOutputTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/modalPanel/ModalPanelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/orderingList/OrderingListTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/outputPanel/OutputPanelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/paint2d/Paint2DTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelCustomizationTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panelBar/PanelBarTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panelMenu/PanelMenuTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/pickList/PickListTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/poll/PollTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/progressBar/ProgressBarTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/push/PushTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueSettingsTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/repeat/RepeatTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/script/ScriptTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/simpleTogglePanel/SimpleTogglePanelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/spacer/SpacerTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/spinner/SpinnerTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/stateManager/StateManagerTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/status/StatusTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style/StyleTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/suggestionBox/SuggestionBoxTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tabPanel/TabPanelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tableFiltering/TableFilteringTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tableSorting/TableSortingTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/togglePanel/TogglePanelTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/toolBar/ToolBarTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tooltip/TooltipDataTableTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tooltip/TooltipTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tree/TreeNodesAdaptorTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tree/TreeTestCase.java branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/testng.xml Log: - decide if should skip method based on testng parameters Modified: branches/sandbox/rf-demo-ftest-iexplore/pom.xml =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/pom.xml 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/pom.xml 2010-01-13 15:24:41 UTC (rev 16275) @@ -501,7 +501,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.8</version> + <version>5.9</version> <scope>test</scope> <classifier>jdk15</classifier> </dependency> Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractDataIterationTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractDataIterationTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractDataIterationTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -30,7 +30,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public class AbstractDataIterationTestCase extends AbstractSeleniumRichfacesTestCase { +public abstract class AbstractDataIterationTestCase extends AbstractSeleniumRichfacesTestCase { protected final String LOC_TABLE_COMMON = getLoc("data-table-common--table"); protected final String LOC_BUTTON_FIRST_PAGE = getLoc("data-scroller--button--first-page"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -29,17 +29,20 @@ import java.util.Properties; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.jboss.test.selenium.AbstractSeleniumTestCase; import org.jboss.test.selenium.waiting.Condition; import org.jboss.test.selenium.waiting.Wait; import org.jboss.test.selenium.waiting.Wait.Waiting; import org.testng.ITestContext; +import org.testng.SkipException; import org.testng.TestRunner; import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Optional; import org.testng.annotations.Parameters; /** @@ -50,7 +53,7 @@ * */ -public class AbstractSeleniumRichfacesTestCase extends AbstractSeleniumTestCase { +public abstract class AbstractSeleniumRichfacesTestCase extends AbstractSeleniumTestCase { /** * context root can be used to obtaining full URL paths, is set to actual @@ -70,6 +73,7 @@ protected String mavenProjectBuildDirectory; // usually ${project}/target protected String mavenResourcesDir; // usually ${project}/target/test-classes protected boolean seleniumDebug; // if used specified debug mode of selenium testing + protected String browser; /** * predefined waitings to use in inheritors @@ -94,6 +98,19 @@ runner.addTestListener(loggingTestListener); } + @BeforeClass + @Parameters( { "context.root", "context.path", "browser", "selenium.host", "selenium.port", "selenium.debug", + "selenium.maximize", "maven.resources.dir", "maven.project.build.directory" }) + public void initializeParameters(String contextRoot, String contextPath, String browser, String seleniumDebug, + String mavenResourcesDir, String mavenProjectBuildDirectory) { + this.contextRoot = contextRoot; + this.contextPath = contextPath; + this.mavenResourcesDir = mavenResourcesDir; + this.mavenProjectBuildDirectory = mavenProjectBuildDirectory; + this.seleniumDebug = Boolean.valueOf(seleniumDebug); + this.browser = browser; + } + /** * Initializes context before each class run. * @@ -109,33 +126,22 @@ * @param seleniumPort * specifies on which port should selenium server run */ - @BeforeClass - @Parameters( { "context.root", "context.path", "browser", "selenium.host", "selenium.port", "selenium.debug", - "selenium.maximize", "maven.resources.dir", "maven.project.build.directory" }) - public void initializeContext(String contextRoot, String contextPath, String browser, String seleniumHost, - String seleniumPort, String seleniumDebug, String seleniumMaximize, String mavenResourcesDir, - String mavenProjectBuildDirectory) { - this.contextRoot = contextRoot; - this.contextPath = contextPath; - this.mavenResourcesDir = mavenResourcesDir; - this.mavenProjectBuildDirectory = mavenProjectBuildDirectory; - this.seleniumDebug = Boolean.valueOf(seleniumDebug); - - - selenium = RichfacesSelenium.getInstance(seleniumHost, Integer.valueOf(seleniumPort), browser, - contextRoot); + @BeforeClass(dependsOnMethods = { "initializeParameters", "isTestBrowserEnabled" }) + @Parameters( { "selenium.host", "selenium.port", "selenium.maximize" }) + public void initializeBrowser(String seleniumHost, String seleniumPort, String seleniumMaximize) { + selenium = RichfacesSelenium.getInstance(seleniumHost, Integer.valueOf(seleniumPort), browser, contextRoot); selenium.start(); allowInitialXpath(); loadCustomLocationStrategies(); loggingTestListener.setSelenium(selenium); - + if (Boolean.valueOf(seleniumMaximize)) { // focus and maximaze tested window selenium.windowFocus(); selenium.windowMaximize(); } } - + /** * Uses selenium.addLocationStrategy to implement own strategies to locate * items in the tested page @@ -164,14 +170,58 @@ * Finalize context after each class run. */ @AfterClass - public void finalizeContext() { + public void finalizeBrowser() { loggingTestListener.setSelenium(null); selenium.close(); selenium.stop(); selenium = null; - contextPath = null; } + @Parameters( { "internet-explorer-enabled", "firefox-enabled" }) + @BeforeClass(dependsOnMethods="initializeParameters") + public void isTestBrowserEnabled(@Optional("true") String internetExplorerEnabled, @Optional("true") String firefoxEnabled) { + boolean isTestBrowserEnabled = false; + + if (Boolean.valueOf(internetExplorerEnabled) && browserIsInternetExplorer()) { + isTestBrowserEnabled = true; + } + + if (Boolean.valueOf(firefoxEnabled) && browserIsFirefox()) { + isTestBrowserEnabled = true; + } + + if (!isTestBrowserEnabled) { + throw new SkipException("The test isn't enabled for current browser"); + } + } + + @BeforeMethod(alwaysRun = true) + public void callLoadPage() { + loadPage(); + } + + protected abstract void loadPage(); + + private final String[] INTERNET_EXPLORER_PREFIXES = new String[] { "*iexplore", "*piiexplore", "*iehta" }; + private final String[] FIREFOX_PREFIXES = new String[] { "*firefox", "*pifirefox", "*chrome" }; + + public boolean browserIsInternetExplorer() { + return containsBrowserOneOfPrefixes(browser, INTERNET_EXPLORER_PREFIXES); + } + + public boolean browserIsFirefox() { + return containsBrowserOneOfPrefixes(browser, FIREFOX_PREFIXES); + } + + private boolean containsBrowserOneOfPrefixes(String browser, String[] prefixes) { + for (String prefix : prefixes) { + if (StringUtils.defaultString(browser).startsWith(prefix)) { + return true; + } + } + return false; + } + /** * Default implementation of obtaining properties for each class. * @@ -181,7 +231,7 @@ protected Properties getLocatorsProperties() { return getNamedPropertiesForClass(this.getClass(), "locators"); } - + /** * Default implementation of obtaining properties for each class. * Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/actionParameter/ActionParameterTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/actionParameter/ActionParameterTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/actionParameter/ActionParameterTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -137,9 +137,7 @@ /** * Loads a specific component's page */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Action Parameter"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxForm/AjaxFormTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxForm/AjaxFormTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxForm/AjaxFormTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -100,9 +100,7 @@ /** * Opens specific component's page */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Ajax Form"); scrollIntoView(LOC_LEGEND_HEADER, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxRegion/AjaxRegionTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxRegion/AjaxRegionTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxRegion/AjaxRegionTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -223,9 +223,7 @@ /** * Opens specific component's page */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Ajax Region"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxSupport/AjaxSupportTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxSupport/AjaxSupportTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxSupport/AjaxSupportTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -81,9 +81,7 @@ waitForTextEquals(LOC_INPUT_TEXT, ""); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Ajax Support"); scrollIntoView(LOC_INPUT_TEXT, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxValidator/AbstractAjaxValidatorTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxValidator/AbstractAjaxValidatorTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/ajaxValidator/AbstractAjaxValidatorTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -36,7 +36,6 @@ /** * Opens specified component's page before each test method */ - @BeforeMethod protected void loadPage() { openComponent("Ajax Validator"); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/beanValidator/BeanValidatorTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/beanValidator/BeanValidatorTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/beanValidator/BeanValidatorTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -227,9 +227,7 @@ return format(LOC_VALIDATION_MESSAGE_RELATIVE, locator); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Bean Validator"); scrollIntoView(LOC_FIELDSET_HEADER, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarStylingTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarStylingTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarStylingTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -87,9 +87,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Calendar"); openTab("Client Side Disable/Styling"); scrollIntoView(LOC_STYLING_FIELDSET, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/CalendarTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -360,9 +360,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Calendar"); scrollIntoView(LOC_CALENDAR_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/OrganizerTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/OrganizerTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/calendar/OrganizerTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -270,9 +270,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Calendar"); openTab("Organizer Creation"); scrollIntoView(LOC_FIELDSET, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/colorPicker/ColorPickerTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/colorPicker/ColorPickerTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/colorPicker/ColorPickerTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -550,9 +550,7 @@ /** * Loads the page containing the color picker component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Color Picker"); scrollIntoView(LOC_COMPONENT_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/columns/ColumnsTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/columns/ColumnsTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/columns/ColumnsTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -149,9 +149,7 @@ }); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Columns"); scrollIntoView(LOC_TABLE, true); selenium.allowNativeXpath("true"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/comboBox/ComboBoxTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/comboBox/ComboBoxTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/comboBox/ComboBoxTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -276,9 +276,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Combo Box"); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/commandButton/CommandButtonTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/commandButton/CommandButtonTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/commandButton/CommandButtonTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -87,9 +87,7 @@ waitForTextEquals(LOC_OUTPUT_TEXT, expectedOutputText); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Command Button"); scrollIntoView(LOC_BUTTON_SAY_HELLO, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/commandLink/CommandLinkTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/commandLink/CommandLinkTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/commandLink/CommandLinkTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -87,9 +87,7 @@ waitForTextEquals(LOC_OUTPUT_TEXT, expectedOutputText); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Command Link"); scrollIntoView(LOC_LINK_SAY_HELLO, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/contextMenu/ContextMenuImageTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/contextMenu/ContextMenuImageTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/contextMenu/ContextMenuImageTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -171,9 +171,7 @@ /** * Loads the needed page. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Context Menu"); // XXX: context menu opens in top left corner so it isn't visible if it Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/contextMenu/ContextMenuTableTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/contextMenu/ContextMenuTableTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/contextMenu/ContextMenuTableTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -205,9 +205,7 @@ /** * Loads the needed page. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Context Menu"); scrollIntoView(LOC_SECOND_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataFilterSlider/DataFilterSliderTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataFilterSlider/DataFilterSliderTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataFilterSlider/DataFilterSliderTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -209,9 +209,7 @@ } }; - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Data Filter Slider"); scrollIntoView(LOC_FIELDSET_HEADER, true); selenium.allowNativeXpath("true"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataGrid/DataGridTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataGrid/DataGridTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataGrid/DataGridTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -84,9 +84,7 @@ } } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Data Grid"); scrollIntoView(LOC_TABLE_COMMON, true); selenium.allowNativeXpath("true"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataList/DataListTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataList/DataListTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataList/DataListTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -48,9 +48,7 @@ MSG_OUTPUT_PRESENT_TEXT_2)); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Data List"); scrollIntoView(LOC_FIELDSET_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataScroller/DataScrollerTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataScroller/DataScrollerTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataScroller/DataScrollerTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -207,9 +207,7 @@ return tableText; } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Data Scroller"); scrollIntoView(LOC_FIELDSET_HEADER, true); selenium.allowNativeXpath("true"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/DataTableTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/DataTableTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/DataTableTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -53,9 +53,7 @@ assertEquals(tableText, MSG_TABLE_TEXT_CONTENT, "Table doesn't contain expected text"); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Data Table"); openTab("Usage"); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/EditTableWithModalPanelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/EditTableWithModalPanelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/EditTableWithModalPanelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -188,9 +188,7 @@ }); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Data Table"); openTab(MSG_TAB_TO_OPEN); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/ExtendedDataModelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/ExtendedDataModelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/ExtendedDataModelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -116,9 +116,7 @@ assertEquals(yourBid, highestBidString); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Data Table"); openTab(MSG_TAB_TO_OPEN); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/ModifiableDataModelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/ModifiableDataModelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dataTable/ModifiableDataModelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -125,9 +125,7 @@ assertTrue(assigneeName.contains(MSG_INPUT_ASSIGNEE)); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Data Table"); openTab(MSG_TAB_TO_OPEN); scrollIntoView(LOC_TABLE_COMMON, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dragSupport/DragSupportTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dragSupport/DragSupportTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dragSupport/DragSupportTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -227,9 +227,7 @@ } } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Drag Support"); scrollIntoView(LOC_FIELDSET_HEADER, true); selenium.allowNativeXpath("true"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dropDownMenu/HorizontalMenuTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dropDownMenu/HorizontalMenuTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/dropDownMenu/HorizontalMenuTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -158,9 +158,7 @@ /** * Loads the page containing needed component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Drop Down Menu"); scrollIntoView(LOC_FIRST_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/editor/AdvancedEditorTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/editor/AdvancedEditorTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/editor/AdvancedEditorTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -840,9 +840,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Editor"); // wait for iframe to load Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/editor/SimpleEditorTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/editor/SimpleEditorTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/editor/SimpleEditorTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -348,9 +348,7 @@ /** * Loads the page containing needed component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Editor"); // wait for iframe to load waitFor(1000); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/extendedDataTable/AbstractExtendedDataTableTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/extendedDataTable/AbstractExtendedDataTableTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/extendedDataTable/AbstractExtendedDataTableTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -50,9 +50,6 @@ private final String MSG_OPTION_SELECTION_MODE_PREFORMATTED = getMsg("OPTION_SELECTION_MODE_PREFORMATTED"); - private String browser; - - @BeforeMethod protected void loadPage() { openComponent("Extended Data Table"); openTab("Usage"); @@ -60,22 +57,6 @@ selenium.allowNativeXpath("true"); } - @BeforeClass - @Parameters( { "browser" }) - public void detectBrowser(String browser) { - this.browser = browser; - } - - protected boolean browserIsInternetExplorer() { - String[] ies = new String[] { "*iexplore", "*piiexplore", "*iehta" }; - for (String ie : ies) { - if (StringUtils.defaultString(browser).startsWith(ie)) { - return true; - } - } - return false; - } - /** * Wait for splash screen indicating request of table rerendering disappears */ Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/fileUpload/FileUploadTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/fileUpload/FileUploadTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/fileUpload/FileUploadTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -547,9 +547,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("File Upload"); openTab("Usage"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/graphValidator/GraphValidatorAfterModelUpdateTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/graphValidator/GraphValidatorAfterModelUpdateTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/graphValidator/GraphValidatorAfterModelUpdateTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -117,9 +117,7 @@ assertEquals(selenium.getText(LOC_OUTPUT_VALIDATION_MESSAGE), text, "Given validation message isn't expected"); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Graph Validator"); scrollIntoView(LOC_FIELDSET_HEADER_ACTIVITIES, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/graphValidator/GraphValidatorTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/graphValidator/GraphValidatorTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/graphValidator/GraphValidatorTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -227,9 +227,7 @@ return format(LOC_VALIDATION_MESSAGE_RELATIVE, locator); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Graph Validator"); scrollIntoView(LOC_FIELDSET_HEADER_USEF_INFO, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/include/IncludeTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/include/IncludeTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/include/IncludeTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -207,9 +207,7 @@ && (nextPresent == selenium.isElementPresent(LOC_BUTTON_NEXT)); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Include"); scrollIntoView(LOC_FIELDSET_HEADER, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inplaceInput/InplaceInputTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inplaceInput/InplaceInputTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inplaceInput/InplaceInputTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -289,9 +289,7 @@ /** * Loads the page containing needed component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Inplace Input"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inplaceSelect/InplaceSelectTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inplaceSelect/InplaceSelectTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inplaceSelect/InplaceSelectTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -260,9 +260,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Inplace Select"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inputNumberSlider/InputNumberSliderTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inputNumberSlider/InputNumberSliderTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/inputNumberSlider/InputNumberSliderTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -287,9 +287,7 @@ /** * Loads the page containing needed component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Input Number Slider"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/jsFunction/JSFunctionTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/jsFunction/JSFunctionTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/jsFunction/JSFunctionTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -70,9 +70,7 @@ } } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("JS Function"); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/keepAlive/KeepAliveTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/keepAlive/KeepAliveTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/keepAlive/KeepAliveTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -130,9 +130,7 @@ } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Keep Alive"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/listShuttle/ListShuttleTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/listShuttle/ListShuttleTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/listShuttle/ListShuttleTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -458,9 +458,7 @@ /** * Loads the needed page. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("List Shuttle"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/log/LogTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/log/LogTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/log/LogTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -125,9 +125,7 @@ }); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Log"); scrollIntoView(LOC_FIELDSET_HEADER, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/mediaOutput/MediaOutputTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/mediaOutput/MediaOutputTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/mediaOutput/MediaOutputTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -85,9 +85,7 @@ } } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Media Output"); scrollIntoView(LOC_FIELDSET_HEADER, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/modalPanel/ModalPanelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/modalPanel/ModalPanelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/modalPanel/ModalPanelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -219,9 +219,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Modal Panel"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/orderingList/OrderingListTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/orderingList/OrderingListTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/orderingList/OrderingListTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -549,9 +549,7 @@ /** * Loads the page containing needed component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Ordering List"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/outputPanel/OutputPanelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/outputPanel/OutputPanelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/outputPanel/OutputPanelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -104,9 +104,7 @@ errorMessageShouldAppear ? "Error message should appear" : "No error message should appear"); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Output Panel"); scrollIntoView(LOC_FIELDSET_HEADER, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/paint2d/Paint2DTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/paint2d/Paint2DTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/paint2d/Paint2DTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -331,9 +331,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Paint2D"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelCustomizationTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelCustomizationTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelCustomizationTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -116,9 +116,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Panel"); openTab("Look Customization"); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panel/PanelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -150,9 +150,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Panel"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panelBar/PanelBarTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panelBar/PanelBarTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panelBar/PanelBarTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -111,9 +111,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Panel Bar"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panelMenu/PanelMenuTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panelMenu/PanelMenuTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/panelMenu/PanelMenuTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -264,9 +264,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Panel Menu"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/pickList/PickListTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/pickList/PickListTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/pickList/PickListTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -368,9 +368,7 @@ /** * Loads the needed page. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Pick List"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/poll/PollTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/poll/PollTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/poll/PollTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -125,9 +125,7 @@ } } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Poll"); scrollIntoView(LOC_OUTPUT_POLL_STATUS, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/progressBar/ProgressBarTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/progressBar/ProgressBarTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/progressBar/ProgressBarTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -187,9 +187,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Progress Bar"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/push/PushTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/push/PushTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/push/PushTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -145,9 +145,7 @@ return !MSG_OUTPUT_PUSH_INACTIVE.equals(selenium.getText(LOC_OUTPUT_TEXT)); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Push"); scrollIntoView(LOC_BUTTON_POLL_CONTROL, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueSettingsTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueSettingsTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueSettingsTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -201,9 +201,7 @@ } }; - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Queue"); openTab("Queue Settings"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/queue/QueueTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -60,9 +60,7 @@ } } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Queue"); openTab("Usage"); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/repeat/RepeatTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/repeat/RepeatTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/repeat/RepeatTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -118,9 +118,7 @@ return Double.parseDouble(string); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Repeat"); scrollIntoView(LOC_FIELDSET_HEADER, true); selenium.allowNativeXpath("true"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/script/ScriptTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/script/ScriptTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/script/ScriptTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -148,9 +148,7 @@ }); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Script"); scrollIntoView(LOC_FIELDSET_HEADER, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/separator/SeparatorTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -191,9 +191,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Separator"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/simpleTogglePanel/SimpleTogglePanelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/simpleTogglePanel/SimpleTogglePanelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/simpleTogglePanel/SimpleTogglePanelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -184,9 +184,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Simple Toggle Panel"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/spacer/SpacerTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/spacer/SpacerTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/spacer/SpacerTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -92,9 +92,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Spacer"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/spinner/SpinnerTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/spinner/SpinnerTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/spinner/SpinnerTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -301,9 +301,7 @@ /** * Loads the page containing needed component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Input Number Spinner"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/stateManager/StateManagerTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/stateManager/StateManagerTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/stateManager/StateManagerTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -123,9 +123,7 @@ /** * Loads the needed page. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("State Manager API"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/status/StatusTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/status/StatusTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/status/StatusTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -224,9 +224,7 @@ }); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Status"); openTab("Usage"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style/StyleTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style/StyleTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/style/StyleTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -78,9 +78,7 @@ } } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Style"); scrollIntoView(LOC_FIELDSET_HEADER, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/suggestionBox/SuggestionBoxTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/suggestionBox/SuggestionBoxTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/suggestionBox/SuggestionBoxTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -568,9 +568,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Suggestion Box"); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tabPanel/TabPanelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tabPanel/TabPanelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tabPanel/TabPanelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -192,9 +192,7 @@ /** * Loads the page containing the calendar component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Tab Panel"); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tableFiltering/TableFilteringTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tableFiltering/TableFilteringTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tableFiltering/TableFilteringTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -177,9 +177,7 @@ } } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Table Filtering"); selenium.allowNativeXpath("true"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tableSorting/TableSortingTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tableSorting/TableSortingTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tableSorting/TableSortingTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -144,9 +144,7 @@ checkSortingForColumnOrder(LOC_LIST_OF_TD_PREFORMATTED); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Table Sorting"); selenium.allowNativeXpath("true"); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/togglePanel/TogglePanelTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/togglePanel/TogglePanelTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/togglePanel/TogglePanelTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -158,9 +158,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Toggle Panel"); scrollIntoView(LOC_EXAMPLE_HEADER, true); } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/toolBar/ToolBarTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/toolBar/ToolBarTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/toolBar/ToolBarTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -287,9 +287,7 @@ /** * Loads the page containing the component. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Tool Bar"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tooltip/TooltipDataTableTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tooltip/TooltipDataTableTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tooltip/TooltipDataTableTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -96,9 +96,7 @@ return !"0".equals(selenium.getEval(format("jqFind('{0}:visible').size()", locator.replaceFirst("^jquery=", "").trim()))); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("ToolTip"); openTab("Use ToolTip with DataTable"); scrollIntoView(LOC_FIELDSET_HEADER_2, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tooltip/TooltipTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tooltip/TooltipTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tooltip/TooltipTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -196,9 +196,7 @@ }); } - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("ToolTip"); openTab("Usage"); scrollIntoView(LOC_FIELDSET_HEADER_1, true); Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tree/TreeNodesAdaptorTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tree/TreeNodesAdaptorTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tree/TreeNodesAdaptorTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -178,9 +178,7 @@ /** * Loads the needed page. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Tree Adaptor"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tree/TreeTestCase.java =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tree/TreeTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/java/org/jboss/richfaces/integrationTest/tree/TreeTestCase.java 2010-01-13 15:24:41 UTC (rev 16275) @@ -206,9 +206,7 @@ /** * Loads the needed page. */ - @SuppressWarnings("unused") - @BeforeMethod - private void loadPage() { + protected void loadPage() { openComponent("Tree"); } } Modified: branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/testng.xml =================================================================== --- branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/testng.xml 2010-01-13 10:19:00 UTC (rev 16274) +++ branches/sandbox/rf-demo-ftest-iexplore/src/test/resources/testng.xml 2010-01-13 15:24:41 UTC (rev 16275) @@ -80,6 +80,7 @@ <test name="org.jboss.richfaces.integrationTest.colorPicker.ColorPickerTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.colorPicker.ColorPickerTestCase" /> @@ -194,6 +195,7 @@ <test name="org.jboss.richfaces.integrationTest.dragSupport.DragSupportTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.dragSupport.DragSupportTestCase" /> @@ -210,6 +212,7 @@ <test name="org.jboss.richfaces.integrationTest.editor.AdvancedEditorTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.editor.AdvancedEditorTestCase" /> @@ -217,6 +220,7 @@ </test> <test name="org.jboss.richfaces.integrationTest.editor.SimpleEditorTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.editor.SimpleEditorTestCase" /> @@ -225,6 +229,7 @@ <test name="org.jboss.richfaces.integrationTest.extendedDataTable.DraggingTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.extendedDataTable.DraggingTestCase" /> @@ -249,6 +254,7 @@ <test name="org.jboss.richfaces.integrationTest.extendedDataTable.SelectingTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.extendedDataTable.SelectingTestCase" /> @@ -265,6 +271,7 @@ <test name="org.jboss.richfaces.integrationTest.fileUpload.FileUploadTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.fileUpload.FileUploadTestCase" /> @@ -303,6 +310,7 @@ <test name="org.jboss.richfaces.integrationTest.inplaceSelect.InplaceSelectTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.inplaceSelect.InplaceSelectTestCase" /> @@ -372,6 +380,7 @@ <test name="org.jboss.richfaces.integrationTest.orderingList.OrderingListTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.orderingList.OrderingListTestCase" /> @@ -560,6 +569,7 @@ <test name="org.jboss.richfaces.integrationTest.tooltip.TooltipDataTableTestCase"> + <parameter name="internet-explorer-enabled" value="false"></parameter> <classes> <class name="org.jboss.richfaces.integrationTest.tooltip.TooltipDataTableTestCase" />

14 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r16274 - branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-01-13 05:19:00 -0500 (Wed, 13 Jan 2010) New Revision: 16274 Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java Log: - removed additional call of seleniumLoggingListener.setSelenium(DefaultSelenium) Modified: branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java =================================================================== --- branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2010-01-13 10:18:04 UTC (rev 16273) +++ branches/community/3.3.X/samples/richfaces-demo/functional-test/src/test/java/org/jboss/richfaces/integrationTest/AbstractSeleniumRichfacesTestCase.java 2010-01-13 10:19:00 UTC (rev 16274) @@ -129,9 +129,6 @@ loadCustomLocationStrategies(); loggingTestListener.setSelenium(selenium); - // adding selenium-side logging facility - loggingTestListener.setSelenium(selenium); - if (Boolean.valueOf(seleniumMaximize)) { // focus and maximaze tested window selenium.windowFocus();

14 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits January 2010