Author: ppitonak(a)redhat.com Date: 2011-02-04 09:51:15 -0500 (Fri, 04 Feb 2011) New Revision: 21453 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java Log: * tests for immediate and bypassUpdates extended and fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java 2011-02-04 14:19:23 UTC (rev 21452) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java 2011-02-04 14:51:15 UTC (rev 21453) @@ -23,6 +23,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.locator.LocatorFactory.jq; +import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -57,6 +58,8 @@ public void testBypassUpdates(JQueryLocator command) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -67,6 +70,7 @@ assertEquals(selenium.getText(output1), "", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "listener invoked"); } public void testData(JQueryLocator command) { @@ -120,6 +124,8 @@ public void testImmediate(JQueryLocator command) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); @@ -130,11 +136,14 @@ assertEquals(selenium.getText(output1), "RichFaces 4", "Output should change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } public void testImmediateBypassUpdates(JQueryLocator command) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -145,7 +154,9 @@ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); assertEquals(selenium.getText(output1), "", "Output should not change"); - phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, + PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } public void testLimitRender(JQueryLocator command) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java 2011-02-04 14:19:23 UTC (rev 21452) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java 2011-02-04 14:51:15 UTC (rev 21453) @@ -23,6 +23,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.locator.LocatorFactory.jq; +import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionValue; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -57,6 +58,8 @@ public void testBypassUpdates(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -66,6 +69,7 @@ assertEquals(selenium.getText(output1), "[Ferrari, Lexus]", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "listener invoked"); } public void testData(JQueryLocator input) { @@ -116,6 +120,8 @@ public void testImmediate(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); @@ -125,11 +131,14 @@ assertEquals(selenium.getText(output1), "[Audi, Ferrari, Lexus]", "Output should change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } public void testImmediateBypassUpdates(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -139,7 +148,9 @@ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); assertEquals(selenium.getText(output1), "[Ferrari, Lexus]", "Output should not change"); - phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, + PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } public void testLimitRender(JQueryLocator input) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java 2011-02-04 14:19:23 UTC (rev 21452) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java 2011-02-04 14:51:15 UTC (rev 21453) @@ -23,6 +23,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.locator.LocatorFactory.jq; +import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionValue; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -57,6 +58,8 @@ public void testBypassUpdates(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -66,6 +69,7 @@ assertEquals(selenium.getText(output1), "Ferrari", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "listener invoked"); } public void testData(JQueryLocator input) { @@ -116,6 +120,8 @@ public void testImmediate(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); @@ -125,11 +131,14 @@ assertEquals(selenium.getText(output1), "Audi", "Output should change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } public void testImmediateBypassUpdates(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -139,7 +148,9 @@ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); assertEquals(selenium.getText(output1), "Ferrari", "Output should not change"); - phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, + PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } public void testLimitRender(JQueryLocator input) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java 2011-02-04 14:19:23 UTC (rev 21452) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java 2011-02-04 14:51:15 UTC (rev 21453) @@ -23,6 +23,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.locator.LocatorFactory.jq; +import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -63,6 +64,8 @@ public void testBypassUpdates(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -72,6 +75,7 @@ assertEquals(selenium.getText(output1), "", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "listener invoked"); } public void testData(JQueryLocator input) { @@ -123,6 +127,8 @@ public void testImmediate(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); @@ -132,11 +138,14 @@ assertEquals(selenium.getText(output1), "RichFaces 4", "Output should change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } public void testImmediateBypassUpdates(JQueryLocator input) { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -146,7 +155,9 @@ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); assertEquals(selenium.getText(output1), "", "Output should not change"); - phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, + PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } public void testLimitRender(JQueryLocator input) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java 2011-02-04 14:19:23 UTC (rev 21452) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java 2011-02-04 14:51:15 UTC (rev 21453) @@ -21,9 +21,10 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; -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.locator.LocatorFactory.jq; +import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -68,6 +69,8 @@ public void testBypassUpdates() { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -77,6 +80,7 @@ assertEquals(selenium.getText(output1), "false", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "listener invoked"); } @Test @@ -132,6 +136,8 @@ public void testImmediate() { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); @@ -141,12 +147,15 @@ assertEquals(selenium.getText(output1), "true", "Output should change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } @Test public void testImmediateBypassUpdates() { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -156,7 +165,9 @@ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); assertEquals(selenium.getText(output1), "false", "Output should not change"); - phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, + PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java 2011-02-04 14:19:23 UTC (rev 21452) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java 2011-02-04 14:51:15 UTC (rev 21453) @@ -21,9 +21,10 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; -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.locator.LocatorFactory.jq; +import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; +import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -68,6 +69,8 @@ public void testBypassUpdates() { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -77,6 +80,7 @@ assertEquals(selenium.getText(output1), "[Ferrari, Lexus]", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "listener invoked"); } @Test @@ -131,6 +135,8 @@ public void testImmediate() { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); @@ -140,12 +146,15 @@ assertEquals(selenium.getText(output1), "[Audi, Ferrari, Lexus]", "Output should change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } @Test public void testImmediateBypassUpdates() { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -155,7 +164,9 @@ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); assertEquals(selenium.getText(output1), "[Ferrari, Lexus]", "Output should not change"); - phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, + PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java 2011-02-04 14:19:23 UTC (rev 21452) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java 2011-02-04 14:51:15 UTC (rev 21453) @@ -23,6 +23,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.locator.LocatorFactory.jq; +import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -68,6 +69,8 @@ public void testBypassUpdates() { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -77,6 +80,7 @@ assertEquals(selenium.getText(output1), "Ferrari", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "listener invoked"); } @Test @@ -109,21 +113,6 @@ } @Test - public void testImmediate() { - String reqTime = selenium.getText(time); - - selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(input); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output1), "Audi", "Output should change"); - phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, - PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); - } - - @Test public void testExecute() { String reqTime = selenium.getText(time); @@ -144,9 +133,29 @@ } @Test + public void testImmediate() { + String reqTime = selenium.getText(time); + + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); + selenium.waitForPageToLoad(); + + guardXhr(selenium).click(input); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); + + assertEquals(selenium.getText(output1), "Audi", "Output should change"); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, + PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); + } + + @Test public void testImmediateBypassUpdates() { String reqTime = selenium.getText(time); + selenium.select(pjq("select[name$=listenerInput]"), optionLabel("doubleStringListener")); + selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -156,7 +165,9 @@ waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); assertEquals(selenium.getText(output1), "Ferrari", "Output should not change"); - phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, + PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } @Test