Author: lfryc(a)redhat.com Date: 2011-02-18 11:11:22 -0500 (Fri, 18 Feb 2011) New Revision: 21770 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java Log: fixed tests for rich:panelMenuGroup modes Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-18 15:35:56 UTC (rev 21769) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-18 16:11:22 UTC (rev 21770) @@ -80,8 +80,14 @@ if (mode != PanelMenuMode.client) { if ("phases".equals(listener)) { phaseInfo.assertPhases(getExpectedPhases()); + } else if ("executeChecker".equals(listener)) { + if (immediate || bypassUpdates) { + phaseInfo.assertNoListener("executeChecker"); + } else { + phaseInfo.assertListener(UPDATE_MODEL_VALUES, "executeChecker"); + } } else { - phaseInfo.assertListener(getExecutionPhase(), listener); + phaseInfo.assertListener(getListenerProcessingPhase(), listener); } } } @@ -113,7 +119,7 @@ return list.toArray(new PhaseId[list.size()]); } - private PhaseId getExecutionPhase() { + private PhaseId getListenerProcessingPhase() { PhaseId[] phases = getExpectedPhases(); return phases[phases.length - 2]; }