Author: dsvyatobatsko Date: 2008-10-10 11:51:16 -0400 (Fri, 10 Oct 2008) New Revision: 10722 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java Log: refactoring Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-10 15:31:09 UTC (rev 10721) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-10 15:51:16 UTC (rev 10722) @@ -174,29 +174,22 @@ * Renders page */ protected void renderPage(Template template) { - selenium.open(protocol + "://" + host + ":" + port + "/" + APPLICATION_NAME + filterPrefix + getTestUrl()); - selenium.waitForPageToLoad(String.valueOf(pageRenderTime)); - - setParentId(template.getPrefix()); - runScript("loadTemplate('" + template + "');", false); - waitForPageToLoad(); - - checkPageRendering(); // At the first we check if page has been - // rendered - checkJSError(); // At the second we check if JS errors occurred - - reRenderForm(); // ReRender component - - checkPageRendering(); // Check all again - checkJSError(); - + renderPage(template, null); } - + /** * Renders page */ protected void renderPage(Template template, String resetMethodName) { - selenium.open(protocol + "://" + host + ":" + port + "/" + APPLICATION_NAME + filterPrefix + getTestUrl()); + renderPage(null, template, resetMethodName); + } + + protected void renderPage(String url, Template template, String resetMethodName) { + String postfix = url; + if (null == url) { + postfix = getTestUrl(); + } + selenium.open(protocol + "://" + host + ":" + port + "/" + APPLICATION_NAME + filterPrefix + postfix); selenium.waitForPageToLoad(String.valueOf(pageRenderTime)); setParentId(template.getPrefix()); @@ -211,9 +204,8 @@ checkPageRendering(); // Check all again checkJSError(); - } - + /** * Writes status message on client side * @@ -244,16 +236,18 @@ * ReRenders the component */ public void reRenderForm() { - selenium.getEval("selenium.browserbot.getCurrentWindow().reRenderAll();"); - // clickById("_Selenium_Test_ReRender_Form:_reRender"); - waitForAjaxCompletion(3000); + reRenderForm(null); } - + /** * ReRenders the component */ private void reRenderForm(String resetMethodName) { - selenium.getEval("selenium.browserbot.getCurrentWindow().reRenderAll('"+resetMethodName+"');"); + if (null != resetMethodName) { + selenium.getEval("selenium.browserbot.getCurrentWindow().reRenderAll('" + resetMethodName + "');"); + } else { + selenium.getEval("selenium.browserbot.getCurrentWindow().reRenderAll();"); + } waitForAjaxCompletion(3000); }