[richfaces-svn-commits] JBoss Rich Faces SVN: r21905 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus.
Author: lfryc(a)redhat.com
Date: 2011-02-23 20:33:56 -0500 (Wed, 23 Feb 2011)
New Revision: 21905
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
Log:
refactored a4j:status - instant attributes test
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java 2011-02-24
01:33:20 UTC (rev 21904)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java 2011-02-24
01:33:56 UTC (rev 21905)
@@ -63,6 +63,7 @@
void testRequestButton(ElementLocator<?> button, String startStatusText, String
stopStatusText) {
XHRHalter.enable();
selenium.click(button);
+
XHRHalter halt = getCurrentXHRHalter();
assertEquals(retrieveStatus.retrieve(), startStatusText);
retrieveStatus.initializeValue();
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 2011-02-24
01:33:20 UTC (rev 21904)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java 2011-02-24
01:33:56 UTC (rev 21905)
@@ -21,17 +21,17 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.a4jStatus;
+import static org.jboss.test.selenium.encapsulated.JavaScript.js;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
-import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
-import static org.jboss.test.selenium.encapsulated.JavaScript.js;
import static org.testng.Assert.assertEquals;
import java.net.URL;
import org.jboss.cheiron.halt.XHRHalter;
import org.jboss.test.selenium.encapsulated.JavaScript;
-import org.jboss.test.selenium.locator.ElementLocator;
+import org.jboss.test.selenium.request.RequestType;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/**
@@ -41,13 +41,8 @@
@IssueTracking("https://issues.jboss.org/browse/RFPL-1186")
public class TestInstantAttributes extends AbstracStatusTest {
- StatusAttributes attributes = new StatusAttributes() {
- protected void applyText(ElementLocator<?> locator, String value) {
- guardXhr(selenium).type(locator, value);
+ StatusAttributes attributes = new StatusAttributes();
- };
- };
-
JavaScript alert = js("alert('{0}')");
@Override
@@ -55,18 +50,28 @@
return buildUrl(contextPath,
"faces/components/a4jStatus/instantAttributes.xhtml");
}
+ @BeforeMethod
+ public void setupAttributes() {
+ attributes.setRequestType(RequestType.XHR);
+ }
+
@Test
public void testOnStart() {
+ attributes.setRequestType(null);
+
+ XHRHalter.enable();
for (int i = 0; i < 2; i++) {
- attributes.setOnStart(alert.parametrize("start" + 1));
+ final int ii = i;
+ retrieveRequestTime.initializeValue();
+ attributes.setOnStart(js("window.metamer = " + ii));
+ getCurrentXHRHalter().complete();
+ waitGui.waitForChange(retrieveRequestTime);
- XHRHalter.enable();
selenium.click(button1);
- selenium.waitForCondition(js("selenium.isAlertPresent()"));
- assertEquals(selenium.getAlert(), "start" + 1);
+ selenium.waitForCondition(js("window.metamer == " + i));
getCurrentXHRHalter().complete();
- XHRHalter.disable();
}
+ XHRHalter.disable();
}
@Test