Author: dsvyatobatsko Date: 2008-06-05 10:47:35 -0400 (Thu, 05 Jun 2008) New Revision: 8916 Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SeleniumTestBase.java trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxRegionTest.java Log: Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SeleniumTestBase.java 2008-06-05 13:59:22 UTC (rev 8915) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/SeleniumTestBase.java 2008-06-05 14:47:35 UTC (rev 8916) @@ -499,6 +499,15 @@ } /** + * Clicks an ajax command and wait for ajax request completion. + * @param locator an element locator + */ + public void clickAjaxCommandAndWait(String locator) { + selenium.click(locator); + waitForAjaxCompletion(); + } + + /** * This method should be used for click on command controls instead of * 'clickById' method. * Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxRegionTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxRegionTest.java 2008-06-05 13:59:22 UTC (rev 8915) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/AjaxRegionTest.java 2008-06-05 14:47:35 UTC (rev 8916) @@ -51,27 +51,24 @@ String internalElemId = parentId + "internal"; String externalElemId = parentId + "external"; - selenium.type(internalElemId, "5"); - selenium.type(externalElemId, "5"); + type(internalElemId, "5"); + type(externalElemId, "5"); - clickById(internalLink); - waitForAjaxCompletion(); + clickAjaxCommandAndWait(internalLink); AssertValueEquals(internalElemId, "5"); AssertValueEquals(externalElemId, "0"); - selenium.type(internalElemId, "10"); - selenium.type(externalElemId, "10"); + type(internalElemId, "10"); + type(externalElemId, "10"); - clickById(externalLink); - waitForAjaxCompletion(); + clickAjaxCommandAndWait(externalLink); AssertValueEquals(internalElemId, "10"); AssertValueEquals(externalElemId, "10"); writeStatus("verify \"selfRendered\" component's attribute"); String selfRenderedLink = parentId + "selfRenderedLink"; - clickById(selfRenderedLink); - waitForAjaxCompletion(); + clickAjaxCommandAndWait(selfRenderedLink); AssertNotPresent("transientText"); writeStatus("verify \"renderRegionOnly\" component's attribute"); @@ -82,15 +79,14 @@ String renderOnlyElemId = parentId + "renderOnly"; String renderElemId = parentId + "render"; - selenium.type(renderOnlyElemId, "7"); + type(renderOnlyElemId, "7"); - clickById(renderOnlyLink); - + clickAjaxCommandAndWait(renderOnlyLink); AssertValueEquals(renderOnlyElemId, "7"); AssertValueEquals(renderElemId, "0"); - selenium.type(renderElemId, "11"); - clickById(renderLink); + type(renderElemId, "11"); + clickAjaxCommandAndWait(renderLink); AssertValueEquals(renderOnlyElemId, "11"); AssertValueEquals(renderElemId, "11");