Author: lfryc(a)redhat.com Date: 2011-02-10 04:59:40 -0500 (Thu, 10 Feb 2011) New Revision: 21586 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/PhaseInfo.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.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 Log: added PhaseInfo.noListener(message) + issue tracking for panelMenu 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 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -21,19 +21,24 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest; -import static org.jboss.test.selenium.dom.Event.*; +import static org.jboss.test.selenium.dom.Event.CLICK; +import static org.jboss.test.selenium.dom.Event.DBLCLICK; +import static org.jboss.test.selenium.dom.Event.MOUSEDOWN; +import static org.jboss.test.selenium.dom.Event.MOUSEMOVE; +import static org.jboss.test.selenium.dom.Event.MOUSEOUT; +import static org.jboss.test.selenium.dom.Event.MOUSEOVER; +import static org.jboss.test.selenium.dom.Event.MOUSEUP; import static org.jboss.test.selenium.encapsulated.JavaScript.js; -import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guard; 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.locator.reference.ReferencedLocator.ref; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref; import java.net.URL; import java.util.Arrays; Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/PhaseInfo.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -28,6 +28,7 @@ import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import javax.faces.event.PhaseId; @@ -86,6 +87,26 @@ throw new AssertionError("The '" + message + "' wasn't found across messages in phase " + phaseId); } + /** + * Asserts that there is no specified message in phases list. + * + * @param message + * the part of the message which it should be looked up + */ + public void assertNoListener(String message) { + initialize(); + for (Entry<PhaseId, Set<String>> entry : map.entrySet()) { + PhaseId phaseId = entry.getKey(); + Set<String> descriptions = entry.getValue(); + + for (String description : descriptions) { + if (description.contains(message)) { + throw new AssertionError("The '" + message + "' was found across messages in phase " + phaseId); + } + } + } + } + private void initialize() { if (retrieveRequestTime.isValueChanged()) { map.clear(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -38,6 +38,7 @@ import org.jboss.test.selenium.waiting.selenium.SeleniumWaiting; import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -95,6 +96,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10481") @Use(field = "mode", enumeration = true) public void testCollapseEvent() { attributes.setCollapseEvent(event.getEventName()); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2011-02-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -29,6 +29,7 @@ import java.net.URL; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.Test; @@ -36,6 +37,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ +@IssueTracking("https://issues.jboss.org/browse/RF-10317") public class TestPanelMenuGroupClientSideHandlers extends AbstractPanelMenuGroupTest { @Inject 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-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -34,6 +34,7 @@ import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.annotations.Uses; import org.testng.annotations.Test; @@ -42,6 +43,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ +@IssueTracking({ "https://issues.jboss.org/browse/RF-10314", "https://issues.jboss.org/browse/RF-10480" }) public class TestPanelMenuGroupMode extends AbstractPanelMenuGroupTest { @Inject 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-10 09:58:22 UTC (rev 21585) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java 2011-02-10 09:59:40 UTC (rev 21586) @@ -37,6 +37,7 @@ import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.model.PanelMenu; import org.testng.annotations.Test; @@ -45,6 +46,7 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ +@IssueTracking({ "https://issues.jboss.org/browse/RF-10436", "https://issues.jboss.org/browse/RF-10314" }) public class TestPanelMenuItemMode extends AbstractMetamerTest { PanelMenuItemAttributes attributes = new PanelMenuItemAttributes(); @@ -61,7 +63,7 @@ @Inject @Use(enumeration = true) - PanelMenuMode mode = PanelMenuMode.ajax; + PanelMenuMode mode; @Inject @Use("listeners") @@ -89,7 +91,12 @@ if ("phases".equals(listener)) { phaseInfo.assertPhases(getExpectedPhases()); } else { - phaseInfo.assertListener(getExecutionPhase(), listener); + PhaseId listenerInvocationPhase = getListenerInvocationPhase(); + if (listenerInvocationPhase == null) { + phaseInfo.assertNoListener(listener); + } else { + phaseInfo.assertListener(listenerInvocationPhase, listener); + } } } } @@ -109,8 +116,18 @@ return list.toArray(new PhaseId[list.size()]); } - private PhaseId getExecutionPhase() { + 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; + } + } + + return phase; } }