Author: lfryc(a)redhat.com Date: 2010-12-06 12:51:19 -0500 (Mon, 06 Dec 2010) New Revision: 20411 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestMatrix.java Log: added methods rerenderAll() and fullPageRefresh() to AbstractMetamerTest Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-12-06 15:52:12 UTC (rev 20410) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-12-06 17:51:19 UTC (rev 20411) @@ -21,6 +21,9 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; +import static org.jboss.test.selenium.locator.LocatorFactory.id; import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; @@ -108,6 +111,20 @@ e.printStackTrace(); } } + + /** + * Do a full page refresh (regular HTTP request) by triggering a command with no action bound. + */ + public void fullPageRefresh() { + guardHttp(selenium).click(id("controlsForm:fullPageRefreshImage")); + } + + /** + * Rerender all content of the page (AJAX request) by trigerring a command with no action but render bound. + */ + public void rerenderAll() { + guardXhr(selenium).click(id("controlsForm:reRenderAllImage")); + } /** * Factory method for creating instances of class JQueryLocator which locates the element using <a Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestMatrix.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestMatrix.java 2010-12-06 15:52:12 UTC (rev 20410) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestMatrix.java 2010-12-06 17:51:19 UTC (rev 20411) @@ -171,10 +171,6 @@ } } - private void rerenderAll() { - waitXhr(selenium).click(jq("img#controlsForm\\:reRenderAllImage")); - } - private void checkMatrix() { new MatrixCommand() { public void processCell(int x, int y) {