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); }