Author: ppitonak(a)redhat.com Date: 2011-01-31 12:19:56 -0500 (Mon, 31 Jan 2011) New Revision: 21336 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/richTabPanel/TestRichTabPanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java Log: * fixed testImmediate and testBypassUpdates in panels 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-01-31 16:55:43 UTC (rev 21335) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-01-31 17:19:56 UTC (rev 21336) @@ -143,6 +143,7 @@ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "item changed: item1 -> item3"); } @Test @@ -234,10 +235,8 @@ selenium.click(itemHeaders[2]); waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); - - String listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(2)")); - assertEquals(listenerOutput, "* item changed item1 -> item3", "Item change listener's output"); + phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "item changed: item1 -> item3"); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-01-31 16:55:43 UTC (rev 21335) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-01-31 17:19:56 UTC (rev 21336) @@ -149,6 +149,7 @@ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "item changed: tab1 -> tab3"); } @Test @@ -225,9 +226,7 @@ waitGui.failWith("Tab 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); - - String listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(2)")); - assertEquals(listenerOutput, "* item changed: tab1 -> tab3", "Item change listener's output"); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "item changed: tab1 -> tab3"); } @Test 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-01-31 16:55:43 UTC (rev 21335) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-01-31 17:19:56 UTC (rev 21336) @@ -194,9 +194,7 @@ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, PhaseId.RENDER_RESPONSE); - - String listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(3)")); - assertEquals(listenerOutput, "* item changed item1 -> item3", "Item change listener's output"); + phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "item changed: item1 -> item3"); } @Test @@ -259,9 +257,7 @@ waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(item3)); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.RENDER_RESPONSE); - - String listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(2)")); - assertEquals(listenerOutput, "* item changed: item1 -> item3", "Item change listener's output"); + phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "item changed: item1 -> item3"); } @Test