Author: lfryc(a)redhat.com Date: 2011-02-07 11:23:53 -0500 (Mon, 07 Feb 2011) New Revision: 21519 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/PanelMenu.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/AbstractPanelMenuGroupTest.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/richPanelMenuGroup/TestPanelMenuGroupSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.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/richPanelMenuItem/TestPanelMenuItemSimple.java Log: fixed panelMenu tests after changes in PanelMenu model (RFPL-950) Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/PanelMenu.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/PanelMenu.java 2011-02-07 16:23:01 UTC (rev 21518) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/PanelMenu.java 2011-02-07 16:23:53 UTC (rev 21519) @@ -29,8 +29,8 @@ private ReferencedLocator<JQueryLocator> anyDisabledItem = ref(root, "div[class*=rf-pm-][class*=-itm-dis]"); private ReferencedLocator<JQueryLocator> anyDisabledGroup = ref(root, "div[class*=rf-pm-][class*=-gr-dis]"); - PanelMenuMode groupMode = PanelMenuMode.client; - PanelMenuMode itemMode = PanelMenuMode.ajax; + PanelMenuMode groupMode; + PanelMenuMode itemMode; public PanelMenu(JQueryLocator root) { super(root); @@ -83,23 +83,23 @@ public Group getAnyTopGroup() { return new Group(topGroups.getReferenced()); } - + public Group getAnySelectedItem() { return new Group(anySelectedItem.getReferenced()); } - + public Group getAnySelectedGroup() { return new Group(anySelectedGroup.getReferenced()); } - + public Group getAnyDisabledItem() { return new Group(anyDisabledItem.getReferenced()); } - + public Group getAnyDisabledGroup() { return new Group(anyDisabledGroup.getReferenced()); } - + public Group getAnyExpandedGroup() { return new Group(JQuerySelectors.append(topGroups, ":has(.rf-pm-hdr-exp)")); } @@ -163,11 +163,11 @@ public boolean isSelected() { return selenium.getAttribute(header.getAttribute(CLASS)).contains("-sel"); } - + public boolean isExpanded() { return selenium.getAttribute(header.getAttribute(CLASS)).contains("-exp"); } - + public boolean isCollapsed() { return selenium.getAttribute(header.getAttribute(CLASS)).contains("-colps"); } @@ -197,11 +197,15 @@ } public void toggle() { - new GuardRequest(getRequestTypeForMode(groupMode)) { - public void command() { - selenium.click(label); - } - }.waitRequest(); + if (groupMode == null) { + selenium.click(label); + } else { + new GuardRequest(getRequestTypeForMode(groupMode)) { + public void command() { + selenium.click(label); + } + }.waitRequest(); + } } public class Icon extends PanelMenu.Icon { @@ -256,11 +260,15 @@ } public void select() { - new GuardRequest(getRequestTypeForMode(itemMode)) { - public void command() { - selenium.click(label); - } - }.waitRequest(); + if (itemMode == null) { + selenium.click(label); + } else { + new GuardRequest(getRequestTypeForMode(itemMode)) { + public void command() { + selenium.click(label); + } + }.waitRequest(); + } } public void hover() { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/AbstractPanelMenuGroupTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/AbstractPanelMenuGroupTest.java 2011-02-07 16:23:01 UTC (rev 21518) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/AbstractPanelMenuGroupTest.java 2011-02-07 16:23:53 UTC (rev 21519) @@ -1,14 +1,39 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ package org.richfaces.tests.metamer.ftest.richPanelMenuGroup; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.richfaces.PanelMenuMode.ajax; import java.net.URL; -import org.jboss.test.selenium.GuardRequest; -import org.jboss.test.selenium.request.RequestType; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.model.PanelMenu; +import org.testng.annotations.BeforeMethod; +/** + * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> + * @version $Revision$ + */ public abstract class AbstractPanelMenuGroupTest extends AbstractMetamerTest { PanelMenuGroupAttributes attributes = new PanelMenuGroupAttributes(); @@ -23,23 +48,9 @@ return buildUrl(contextPath, "faces/components/richPanelMenuGroup/simple.xhtml"); } - void toggleGroup() { - new GuardRequest(getRequestTypeForMode()) { - @Override - public void command() { - topGroup.toggle(); - } - }.waitRequest(); + @BeforeMethod + public void setupModes() { + attributes.setMode(ajax); + menu.setGroupMode(ajax); } - - RequestType getRequestTypeForMode() { - switch (attributes.getMode()) { - case ajax: - return RequestType.XHR; - case server: - return RequestType.HTTP; - default: - return RequestType.NONE; - } - } } 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-07 16:23:01 UTC (rev 21518) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2011-02-07 16:23:53 UTC (rev 21519) @@ -59,9 +59,10 @@ @Use(field = "event", value = "ajaxCollapsionEvents") public void testClientSideCollapsionEvent() { attributes.setMode(ajax); - toggleGroup(); + menu.setGroupMode(ajax); + super.testRequestEventsBefore(event); - toggleGroup(); + topGroup.toggle(); super.testRequestEventsAfter(event); } @@ -69,60 +70,67 @@ @Use(field = "event", value = "ajaxExpansionEvents") public void testClientSideExpansionEvent() { attributes.setMode(ajax); + menu.setGroupMode(ajax); super.testRequestEventsBefore(event); - toggleGroup(); + topGroup.toggle(); super.testRequestEventsAfter(event); } @Test public void testClientSideExpansionEventsOrderClient() { attributes.setMode(client); + menu.setGroupMode(client); super.testRequestEventsBefore(serverExpansionEvents); - toggleGroup(); + topGroup.toggle(); super.testRequestEventsAfter(serverExpansionEvents); } @Test public void testClientSideCollapsionEventsOrderClient() { attributes.setMode(client); - toggleGroup(); + menu.setGroupMode(client); + topGroup.toggle(); super.testRequestEventsBefore(clientCollapsionEvents); - toggleGroup(); + topGroup.toggle(); super.testRequestEventsAfter(clientCollapsionEvents); } @Test public void testClientSideExpansionEventsOrderAjax() { attributes.setMode(ajax); + menu.setGroupMode(ajax); super.testRequestEventsBefore(ajaxExpansionEvents); - toggleGroup(); + topGroup.toggle(); super.testRequestEventsAfter(ajaxExpansionEvents); } @Test public void testClientSideCollapsionEventsOrderAjax() { attributes.setMode(ajax); - toggleGroup(); + menu.setGroupMode(ajax); + topGroup.toggle(); super.testRequestEventsBefore(ajaxCollapsionEvents); - toggleGroup(); + topGroup.toggle(); super.testRequestEventsAfter(ajaxCollapsionEvents); } @Test public void testClientSideExpansionEventsOrderServer() { attributes.setMode(server); - toggleGroup(); + menu.setGroupMode(server); + topGroup.toggle(); super.testRequestEventsBefore(serverExpansionEvents); - toggleGroup(); + topGroup.toggle(); super.testRequestEventsAfter(serverExpansionEvents); } @Test public void testClientSideCollapsionEventsOrderServer() { attributes.setMode(server); - toggleGroup(); + menu.setGroupMode(server); + topGroup.toggle(); super.testRequestEventsBefore(serverCollapsionEvents); - toggleGroup(); + topGroup.toggle(); super.testRequestEventsAfter(serverCollapsionEvents); } } 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-07 16:23:01 UTC (rev 21518) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-02-07 16:23:53 UTC (rev 21519) @@ -68,10 +68,11 @@ attributes.setImmediate(immediate); attributes.setBypassUpdates(bypassUpdates); attributes.setMode(mode); + menu.setGroupMode(mode); attributes.setExecute("@this executeChecker"); - toggleGroup(); + topGroup.toggle(); if (mode != PanelMenuMode.client) { if ("phases".equals(listener)) { @@ -86,7 +87,7 @@ @Uses({ @Use(field = "immediate", empty = true), @Use(field = "bypassUpdates", empty = true), @Use(field = "mode", empty = true), @Use(field = "listener", empty = true) }) public void testClientMode() { - toggleGroup(); + topGroup.toggle(); } private PhaseId[] getExpectedPhases() { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-02-07 16:23:01 UTC (rev 21518) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-02-07 16:23:53 UTC (rev 21519) @@ -72,7 +72,7 @@ public void testLeftCollapsedIcon() { attributes.setLeftCollapsedIcon(CHEVRON_DOWN); - toggleGroup(); + topGroup.toggle(); assertTrue(leftIcon.containsClass(CHEVRON_DOWN_CLASS)); @@ -141,7 +141,7 @@ public void testRightCollapsedIcon() { attributes.setRightCollapsedIcon(CHEVRON_DOWN); - toggleGroup(); + topGroup.toggle(); assertTrue(rightIcon.containsClass(CHEVRON_DOWN_CLASS)); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-02-07 16:23:01 UTC (rev 21518) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-02-07 16:23:53 UTC (rev 21519) @@ -62,52 +62,36 @@ @Use(field = "event", value = "ajaxEvents") public void testClientSideEvent() { attributes.setMode(ajax); + menu.setItemMode(ajax); super.testRequestEventsBefore(event); - selectItem(); + item.select(); super.testRequestEventsAfter(event); } @Test public void testClientSideEventsOrderClient() { attributes.setMode(client); + menu.setItemMode(client); super.testRequestEventsBefore(clientEvents); - selectItem(); + item.select(); super.testRequestEventsAfter(clientEvents); } @Test public void testClientSideEventsOrderAjax() { attributes.setMode(ajax); + menu.setItemMode(ajax); super.testRequestEventsBefore(ajaxEvents); - selectItem(); + item.select(); super.testRequestEventsAfter(ajaxEvents); } @Test public void testClientSideEventsOrderServer() { attributes.setMode(server); + menu.setItemMode(server); super.testRequestEventsBefore(serverEvents); - selectItem(); + item.select(); super.testRequestEventsAfter(serverEvents); } - - private void selectItem() { - new GuardRequest(getRequestTypeForMode()) { - @Override - public void command() { - item.select(); - } - }.waitRequest(); - } - - private RequestType getRequestTypeForMode() { - switch (attributes.getMode()) { - case ajax: - return RequestType.XHR; - case server: - return RequestType.HTTP; - default: - return RequestType.NONE; - } - } } 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-07 16:23:01 UTC (rev 21518) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemMode.java 2011-02-07 16:23:53 UTC (rev 21519) @@ -34,8 +34,6 @@ import javax.faces.event.PhaseId; -import org.jboss.test.selenium.GuardRequest; -import org.jboss.test.selenium.request.RequestType; import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; @@ -81,15 +79,11 @@ attributes.setImmediate(immediate); attributes.setBypassUpdates(bypassUpdates); attributes.setMode(mode); + menu.setItemMode(mode); attributes.setExecute("@this executeChecker"); - new GuardRequest(getRequestTypeForMode()) { - @Override - public void command() { - item.select(); - } - }.waitRequest(); + item.select(); if (mode != PanelMenuMode.client) { if ("phases".equals(listener)) { @@ -119,15 +113,4 @@ PhaseId[] phases = getExpectedPhases(); return phases[phases.length - 2]; } - - private RequestType getRequestTypeForMode() { - switch (mode) { - case ajax: - return RequestType.XHR; - case server: - return RequestType.HTTP; - default: - return RequestType.NONE; - } - } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemSimple.java 2011-02-07 16:23:01 UTC (rev 21518) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemSimple.java 2011-02-07 16:23:53 UTC (rev 21519) @@ -9,8 +9,10 @@ import org.jboss.test.selenium.GuardRequest; import org.jboss.test.selenium.request.RequestType; +import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.model.PanelMenu; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; /** @@ -33,6 +35,12 @@ public URL getTestUrl() { return buildUrl(contextPath, "faces/components/richPanelMenuItem/simple.xhtml"); } + + @BeforeMethod + public void setupMode() { + attributes.setMode(PanelMenuMode.ajax); + menu.setItemMode(PanelMenuMode.ajax); + } @Test public void testData() { @@ -48,6 +56,7 @@ @Test public void testDisabled() { + menu.setItemMode(null); assertFalse(item.isDisabled()); attributes.setDisabled(true); @@ -152,6 +161,7 @@ @Test public void testSelectable() { + menu.setItemMode(null); attributes.setSelectable(false); new GuardRequest(RequestType.NONE) {