[richfaces-svn-commits] JBoss Rich Faces SVN: r18297 - root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest.
Author: lfryc(a)redhat.com
Date: 2010-07-30 09:25:33 -0400 (Fri, 30 Jul 2010)
New Revision: 18297
Modified:
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
added waiting for isAlertPresent for testFireEvent methods
Modified:
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
---
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-07-30
13:24:55 UTC (rev 18296)
+++
root/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-07-30
13:25:33 UTC (rev 18297)
@@ -32,6 +32,7 @@
import org.jboss.test.selenium.encapsulated.JavaScript;
import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.waiting.ajax.JavaScriptCondition;
import org.richfaces.tests.metamer.TemplatesList;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Templates;
@@ -78,7 +79,7 @@
selenium.open(buildUrl(getTestUrl() + "?templates=" +
template.toString()));
selenium.waitForPageToLoad(TIMEOUT);
}
-
+
/**
* Invalidates session by clicking on a button on tested page.
*/
@@ -133,7 +134,13 @@
selenium.waitForPageToLoad(TIMEOUT);
selenium.fireEvent(element, event);
-
+
+ waitGui.until(new JavaScriptCondition() {
+ public JavaScript getJavaScriptCondition() {
+ return new JavaScript("selenium.isAlertPresent()");
+ }
+ });
+
assertEquals(selenium.getAlert(), event.getEventName(), event.getEventName()
+ " attribute did not change correctly");
}