Author: lfryc(a)redhat.com Date: 2011-03-08 04:19:58 -0500 (Tue, 08 Mar 2011) New Revision: 22082 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/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java Log: fixed PanelMenuGroupClientSideEventHandlers (removed issue tracking: RF-10563, RFPL-1223) 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-03-08 05:52:00 UTC (rev 22081) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-03-08 09:19:58 UTC (rev 22082) @@ -42,6 +42,8 @@ import java.net.URL; import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; import java.util.Locale; import javax.faces.event.PhaseId; @@ -264,6 +266,15 @@ selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); } + + public void testRequestEventsBeforeByAlert(String... events) { + for (String event : events) { + ReferencedLocator<JQueryLocator> input = ref(attributesRoot, "input[type=text][id$=on{0}Input]"); + input = input.format(event); + selenium.type(input, format("alert('{0}')", event)); + selenium.waitForPageToLoad(); + } + } public void testRequestEventsAfter(String... events) { String[] actualEvents = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); @@ -273,6 +284,24 @@ format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents), Arrays.deepToString(events))); } + + public void testRequestEventsAfterByAlert(String... events) { + List<String> list = new LinkedList<String>(); + + for (int i = 0; i < events.length; i++) { + waitGui.dontFail().until(alertPresent); + if (selenium.isAlertPresent()) { + list.add(selenium.getAlert()); + } + } + + String[] actualEvents = list.toArray(new String[list.size()]); + assertEquals( + actualEvents, + events, + format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents), + Arrays.deepToString(events))); + } /** * A helper method for testing attribute "dir". It tries null, ltr and rtl. 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-03-08 05:52:00 UTC (rev 22081) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2011-03-08 09:19:58 UTC (rev 22082) @@ -28,28 +28,29 @@ import java.net.URL; +import org.jboss.test.selenium.encapsulated.JavaScript; 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; /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -@IssueTracking({ "https://issues.jboss.org/browse/RF-10564", "https://issues.jboss.org/browse/RF-10563" }) public class TestPanelMenuGroupClientSideHandlers extends AbstractPanelMenuGroupTest { @Inject @Use(empty = true) String event; - String[] ajaxExpansionEvents = new String[] { "beforeswitch", "beforeexpand", "beforeselect", "begin", + String[] ajaxExpansionEvents = new String[] { "beforeselect", "beforeswitch", "beforeexpand", "begin", "beforedomupdate", "select", "expand", "switch", "complete" }; - String[] ajaxCollapsionEvents = new String[] { "beforeswitch", "beforecollapse", "beforeselect", "begin", + String[] ajaxCollapsionEvents = new String[] { "beforeselect", "beforeswitch", "beforecollapse", "begin", "beforedomupdate", "select", "collapse", "switch", "complete" }; - String[] clientExpansionEvents = new String[] { "beforeswitch", "beforeexpand", "beforeselect", "select", "expand", + String[] clientExpansionEvents = new String[] { "beforeselect", "beforeswitch", "beforeexpand", "select", "expand", "switch" }; - String[] clientCollapsionEvents = new String[] { "beforeswitch", "beforecollapse", "beforeselect", "select", + String[] clientCollapsionEvents = new String[] { "beforeselect", "beforeswitch", "beforecollapse", "select", "collapse", "switch" }; String[] serverExpansionEvents = new String[] { "beforeswitch", "beforeexpand" }; String[] serverCollapsionEvents = new String[] { "beforeswitch", "beforecollapse" }; @@ -59,6 +60,8 @@ return buildUrl(contextPath, "faces/components/richPanelMenuGroup/simple.xhtml"); } + PanelMenu.Group group1 = menu.getGroupContains("Group 1"); + @Test @Use(field = "event", value = "ajaxCollapsionEvents") public void testClientSideCollapsionEvent() { @@ -84,12 +87,16 @@ public void testClientSideExpansionEventsOrderClient() { attributes.setMode(client); menu.setGroupMode(client); - super.testRequestEventsBefore(serverExpansionEvents); + super.testRequestEventsBefore(clientExpansionEvents); topGroup.toggle(); - super.testRequestEventsAfter(serverExpansionEvents); + group1.toggle(); + selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); + topGroup.toggle(); + super.testRequestEventsAfter(clientExpansionEvents); } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10564") public void testClientSideCollapsionEventsOrderClient() { attributes.setMode(client); menu.setGroupMode(client); @@ -103,7 +110,9 @@ public void testClientSideExpansionEventsOrderAjax() { attributes.setMode(ajax); menu.setGroupMode(ajax); + topGroup.toggle(); super.testRequestEventsBefore(ajaxExpansionEvents); + selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); topGroup.toggle(); super.testRequestEventsAfter(ajaxExpansionEvents); } @@ -112,31 +121,30 @@ public void testClientSideCollapsionEventsOrderAjax() { attributes.setMode(ajax); menu.setGroupMode(ajax); - topGroup.toggle(); super.testRequestEventsBefore(ajaxCollapsionEvents); topGroup.toggle(); super.testRequestEventsAfter(ajaxCollapsionEvents); } - @Test(groups = "4.0.0.Final") - @IssueTracking("https://issues.jboss.org/browse/RFPL-1223") - public void testClientSideExpansionEventsOrderServer() { + @Test + @Use(field = "event", value = "serverExpansionEvents") + public void testClientSideExpansionEventsServer() { attributes.setMode(server); menu.setGroupMode(server); topGroup.toggle(); - super.testRequestEventsBefore(serverExpansionEvents); + menu.setGroupMode(null); + testRequestEventsBeforeByAlert(event); topGroup.toggle(); - super.testRequestEventsAfter(serverExpansionEvents); + testRequestEventsAfterByAlert(event); } - @Test(groups = "4.0.0.Final") - @IssueTracking("https://issues.jboss.org/browse/RFPL-1223") - public void testClientSideCollapsionEventsOrderServer() { + @Test + @Use(field = "event", value = "serverCollapsionEvents") + public void testClientSideCollapsionEventsServer() { attributes.setMode(server); - menu.setGroupMode(server); + menu.setGroupMode(null); + testRequestEventsBeforeByAlert(event); topGroup.toggle(); - super.testRequestEventsBefore(serverCollapsionEvents); - topGroup.toggle(); - super.testRequestEventsAfter(serverCollapsionEvents); + testRequestEventsAfterByAlert(event); } }