Author: lfryc(a)redhat.com
Date: 2010-10-06 07:55:41 -0400 (Wed, 06 Oct 2010)
New Revision: 19474
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
Log:
fixed the a4j:status tests to use condition alertPresent instead of guardXhr interceptor
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java 2010-10-06
11:54:59 UTC (rev 19473)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java 2010-10-06
11:55:41 UTC (rev 19474)
@@ -75,7 +75,8 @@
for (int i = 0; i < 2; i++) {
attributes.setOnError(alert.parametrize("error" + i));
- guardXhr(selenium).click(buttonError);
+ selenium.click(buttonError);
+ waitAjax.until(alertPresent);
assertEquals(selenium.getAlert(), "error" + i);
}
}
@@ -85,7 +86,8 @@
for (int i = 0; i < 2; i++) {
attributes.setOnSuccess(alert.parametrize("success" + 1));
- guardXhr(selenium).click(button1);
+ selenium.click(button1);
+ waitAjax.until(alertPresent);
assertEquals(selenium.getAlert(), "success" + 1);
}
}
@@ -95,12 +97,13 @@
for (int i = 0; i < 2; i++) {
attributes.setOnStop(alert.parametrize("stop" + i));
- guardXhr(selenium).click(button1);
+ selenium.click(button1);
+ waitAjax.until(alertPresent);
assertEquals(selenium.getAlert(), "stop" + i);
- guardXhr(selenium).click(buttonError);
+ selenium.click(buttonError);
+ waitAjax.until(alertPresent);
assertEquals(selenium.getAlert(), "stop" + i);
}
}
-
}
\ No newline at end of file