Author: lfryc(a)redhat.com Date: 2010-01-15 09:49:46 -0500 (Fri, 15 Jan 2010) New Revision: 16306 Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java Log: - photoalbum ftest - exact method waiting for login (RFPL-321) Modified: branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java =================================================================== --- branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2010-01-15 12:23:35 UTC (rev 16305) +++ branches/community/3.3.X/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/RealWorldHelper.java 2010-01-15 14:49:46 UTC (rev 16306) @@ -230,14 +230,9 @@ selenium.type(HtmlConstants.LoginPanel.passwordId, password); selenium.click(HtmlConstants.LoginPanel.loginButtonPath); - waitForLogin(selenium); + selenium.waitForCondition("selenium.isElementPresent('//a[@class=\"logged-user\" and normalize-space(text()=\"" + name + "\")]')", "5000"); } - private static void waitForLogin(final Selenium selenium) { - delay(); - selenium.waitForPageToLoad(String.valueOf(TIMEOUT)); - } - private static void delay() { delay(5000); } @@ -526,7 +521,7 @@ waitForAjaxCompletion(selenium, TIMEOUT); } public static void waitForAjaxCompletion(Selenium selenium, int miliseconds) { - selenium.waitForCondition(WINDOW_JS_RESOLVER + "document.getElementById('" + STATUS_START_ID + "').style.display == 'none'", String.valueOf(miliseconds)); + selenium.waitForCondition(WINDOW_JS_RESOLVER + "document.getElementById('" + STATUS_START_ID + "') != null && " + WINDOW_JS_RESOLVER + "document.getElementById('" + STATUS_START_ID + "').style.display == 'none'", String.valueOf(miliseconds)); } public static void confirm(Selenium selenium) {