Author: lfryc(a)redhat.com
Date: 2011-02-28 09:43:19 -0500 (Mon, 28 Feb 2011)
New Revision: 21979
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuMode.java
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/richPanelMenuItem/TestPanelMenuItemMode.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java
Log:
panels' item change listener invoked in UPDATE_MODEL_VALUES phase (RF-10586)
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-28
14:23:50 UTC (rev 21978)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-28
14:43:19 UTC (rev 21979)
@@ -198,7 +198,7 @@
selenium.click(itemHeaders[2]);
waitGui.failWith("Item 3 is not
displayed.").until(isDisplayed.locator(itemContents[2]));
- phaseInfo.assertListener(PhaseId.INVOKE_APPLICATION, "item changed: item1
-> item3");
+ phaseInfo.assertListener(PhaseId.UPDATE_MODEL_VALUES, "item changed: item1
-> item3");
}
@Test
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuMode.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuMode.java 2011-02-28
14:23:50 UTC (rev 21978)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuMode.java 2011-02-28
14:43:19 UTC (rev 21979)
@@ -83,7 +83,7 @@
if (mode != PanelMenuMode.client) {
phaseInfo.assertPhases(expectedPhases);
- phaseInfo.assertListener(INVOKE_APPLICATION, "item changed");
+ phaseInfo.assertListener(UPDATE_MODEL_VALUES, "item changed");
}
}
}
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-28
14:23:50 UTC (rev 21978)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-28
14:43:19 UTC (rev 21979)
@@ -80,14 +80,13 @@
if (mode != PanelMenuMode.client) {
if ("phases".equals(listener)) {
phaseInfo.assertPhases(getExpectedPhases());
- } else if ("executeChecker".equals(listener)) {
- if (immediate || bypassUpdates || mode == PanelMenuMode.server) {
- phaseInfo.assertNoListener("executeChecker");
+ } else {
+ PhaseId listenerInvocationPhase = getListenerInvocationPhase();
+ if (listenerInvocationPhase == null) {
+ phaseInfo.assertNoListener(listener);
} else {
- phaseInfo.assertListener(UPDATE_MODEL_VALUES,
"executeChecker");
+ phaseInfo.assertListener(listenerInvocationPhase, listener);
}
- } else {
- phaseInfo.assertListener(getListenerProcessingPhase(), listener);
}
}
}
@@ -119,8 +118,24 @@
return list.toArray(new PhaseId[list.size()]);
}
- private PhaseId getListenerProcessingPhase() {
+ private PhaseId getListenerInvocationPhase() {
PhaseId[] phases = getExpectedPhases();
- return phases[phases.length - 2];
+ PhaseId phase = phases[phases.length - 2];
+
+ if ("executeChecker".equals(listener)) {
+ if (phase.compareTo(UPDATE_MODEL_VALUES) < 0 || mode ==
PanelMenuMode.server) {
+ return null;
+ } else {
+ return UPDATE_MODEL_VALUES;
+ }
+ }
+
+ if ("item changed".equals(listener)) {
+ if (phases.length == 6) {
+ return UPDATE_MODEL_VALUES;
+ }
+ }
+
+ return phase;
}
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java 2011-02-28
14:23:50 UTC (rev 21978)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java 2011-02-28
14:43:19 UTC (rev 21979)
@@ -125,6 +125,12 @@
return UPDATE_MODEL_VALUES;
}
}
+
+ if ("item changed".equals(listener)) {
+ if (phases.length == 6) {
+ return UPDATE_MODEL_VALUES;
+ }
+ }
return phase;
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-28
14:23:50 UTC (rev 21978)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-28
14:43:19 UTC (rev 21979)
@@ -215,7 +215,7 @@
selenium.click(tc3);
waitGui.failWith("Item 3 is not
displayed.").until(isDisplayed.locator(item3));
- phaseInfo.assertListener(PhaseId.INVOKE_APPLICATION, "item changed: item1
-> item3");
+ phaseInfo.assertListener(PhaseId.UPDATE_MODEL_VALUES, "item changed: item1
-> item3");
}
@Test
Show replies by thread