Author: jjamrich Date: 2011-09-23 09:29:35 -0400 (Fri, 23 Sep 2011) New Revision: 22750 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.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/PanelMenuGroupAttributes.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/TestPanelMenuGroupDOMEventHandlers.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 Log: RFPL-1439: Update PanelMenuGroup tests to using unified way to setting attributes Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-23 13:29:03 UTC (rev 22749) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-23 13:29:35 UTC (rev 22750) @@ -26,6 +26,7 @@ import org.richfaces.tests.metamer.ftest.richList.ListAttributes; import org.richfaces.tests.metamer.ftest.richMessage.MessageAttributes; import org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes; +import org.richfaces.tests.metamer.ftest.richPanelMenuGroup.PanelMenuGroupAttributes; import org.richfaces.tests.metamer.ftest.richTooltip.TooltipAttributes; public class AttributeList { @@ -55,5 +56,6 @@ public static Attributes<ListAttributes> listAttributes = new Attributes<ListAttributes>(); public static Attributes<MessageAttributes> messageAttributes = new Attributes<MessageAttributes>(); public static Attributes<PanelMenuAttributes> panelMenuAttributes = new Attributes<PanelMenuAttributes>(); + public static Attributes<PanelMenuGroupAttributes> panelMenuGroupAttributes = new Attributes<PanelMenuGroupAttributes>(); } 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-09-23 13:29:03 UTC (rev 22749) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/AbstractPanelMenuGroupTest.java 2011-09-23 13:29:35 UTC (rev 22750) @@ -23,6 +23,8 @@ import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.richfaces.PanelMenuMode.ajax; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuGroupAttributes; +import static org.richfaces.tests.metamer.ftest.richPanelMenuGroup.PanelMenuGroupAttributes.mode; import java.net.URL; @@ -36,7 +38,6 @@ */ public abstract class AbstractPanelMenuGroupTest extends AbstractMetamerTest { - PanelMenuGroupAttributes attributes = new PanelMenuGroupAttributes(); PanelMenu menu = new PanelMenu(pjq("div.rf-pm[id$=panelMenu]")); PanelMenu.Group topGroup = menu.getGroupContains("Group 2"); PanelMenu.Group subGroup = topGroup.getGroupContains("Group 2.3"); @@ -50,7 +51,7 @@ @BeforeMethod public void setupModes() { - attributes.setMode(ajax); + panelMenuGroupAttributes.set(mode, ajax); menu.setGroupMode(ajax); } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/PanelMenuGroupAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/PanelMenuGroupAttributes.java 2011-09-23 13:29:03 UTC (rev 22749) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/PanelMenuGroupAttributes.java 2011-09-23 13:29:35 UTC (rev 22750) @@ -21,107 +21,37 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.richPanelMenuGroup; -import org.richfaces.PanelMenuMode; -import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes; +import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum; /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public class PanelMenuGroupAttributes extends AbstractComponentAttributes { - public void setBypassUpdates(Boolean bypassUpdates) { - setProperty("bypassUpdates", bypassUpdates); - } - - public void setCollapseEvent(String collapseEvent) { - setProperty("collapseEvent", collapseEvent); - } - - public void setData(String data) { - setProperty("data", data); - } - - public void setDisabled(Boolean disabled) { - setProperty("disabled", disabled); - } - - public void setDisabledClass(String disabledClass) { - setProperty("disabledClass", disabledClass); - } - - public void setExecute(String execute) { - setProperty("execute", execute); - } - - public void setExpandEvent(String expandEvent) { - setProperty("expandEvent", expandEvent); - } - - public void setExpanded(Boolean expanded) { - setProperty("expanded", expanded); - } - - public void setImmediate(Boolean immediate) { - setProperty("immediate", immediate); - } - - public void setLeftCollapsedIcon(String leftCollapsedIcon) { - setProperty("leftCollapsedIcon", leftCollapsedIcon); - } - - public void setLeftDisabledIcon(String leftDisabledIcon) { - setProperty("leftDisabledIcon", leftDisabledIcon); - } - - public void setLeftExpandedIcon(String leftExpandedIcon) { - setProperty("leftExpandedIcon", leftExpandedIcon); - } - - public void setLimitRender(Boolean limitRender) { - setProperty("limitRender", limitRender); - } - - public void setMode(PanelMenuMode mode) { - setProperty("mode", mode); - } +public enum PanelMenuGroupAttributes implements AttributeEnum { - public PanelMenuMode getMode() { - return PanelMenuMode.valueOf(getProperty("mode")); - } + bypassUpdates, + collapseEvent, + data, + disabled, + disabledClass, + execute, + expandEvent, + expanded, + immediate, + leftCollapsedIcon, + leftDisabledIcon, + leftExpandedIcon, + limitRender, + mode, + oncomplete, + render, + rendered, + rightCollapsedIcon, + rightDisabledIcon, + rightExpandedIcon, + selectable, + status, + style, + styleClass - public void setRender(String render) { - setProperty("render", render); - } - - public void setRendered(Boolean rendered) { - setProperty("rendered", rendered); - } - - public void setRightCollapsedIcon(String rightCollapsedIcon) { - setProperty("rightCollapsedIcon", rightCollapsedIcon); - } - - public void setRightDisabledIcon(String rightDisabledIcon) { - setProperty("rightDisabledIcon", rightDisabledIcon); - } - - public void setRightExpandedIcon(String rightExpandedIcon) { - setProperty("rightExpandedIcon", rightExpandedIcon); - } - - public void setSelectable(Boolean selectable) { - setProperty("selectable", selectable); - } - - public void setStatus(String status) { - setProperty("status", status); - } - - public void setStyle (String style) { - setProperty("style", style); - } - - public void setStyleClass(String styleClass) { - setProperty("styleClass", styleClass); - } } 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-09-23 13:29:03 UTC (rev 22749) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2011-09-23 13:29:35 UTC (rev 22750) @@ -25,6 +25,8 @@ import static org.richfaces.PanelMenuMode.ajax; import static org.richfaces.PanelMenuMode.client; import static org.richfaces.PanelMenuMode.server; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuGroupAttributes; +import static org.richfaces.tests.metamer.ftest.richPanelMenuGroup.PanelMenuGroupAttributes.mode; import java.net.URL; @@ -65,7 +67,7 @@ @Test @Use(field = "event", value = "ajaxCollapsionEvents") public void testClientSideCollapsionEvent() { - attributes.setMode(ajax); + panelMenuGroupAttributes.set(mode, ajax); menu.setGroupMode(ajax); super.testRequestEventsBefore(event); topGroup.toggle(); @@ -75,7 +77,7 @@ @Test @Use(field = "event", value = "ajaxExpansionEvents") public void testClientSideExpansionEvent() { - attributes.setMode(ajax); + panelMenuGroupAttributes.set(mode, ajax); menu.setGroupMode(ajax); topGroup.toggle(); super.testRequestEventsBefore(event); @@ -85,7 +87,7 @@ @Test public void testClientSideExpansionEventsOrderClient() { - attributes.setMode(client); + panelMenuGroupAttributes.set(mode, client); menu.setGroupMode(client); super.testRequestEventsBefore(clientExpansionEvents); topGroup.toggle(); @@ -98,7 +100,7 @@ @Test @RegressionTest("https://issues.jboss.org/browse/RF-10564") public void testClientSideCollapsionEventsOrderClient() { - attributes.setMode(client); + panelMenuGroupAttributes.set(mode, client); menu.setGroupMode(client); topGroup.toggle(); super.testRequestEventsBefore(clientCollapsionEvents); @@ -108,7 +110,7 @@ @Test public void testClientSideExpansionEventsOrderAjax() { - attributes.setMode(ajax); + panelMenuGroupAttributes.set(mode, ajax); menu.setGroupMode(ajax); topGroup.toggle(); super.testRequestEventsBefore(ajaxExpansionEvents); @@ -119,7 +121,7 @@ @Test public void testClientSideCollapsionEventsOrderAjax() { - attributes.setMode(ajax); + panelMenuGroupAttributes.set(mode, ajax); menu.setGroupMode(ajax); super.testRequestEventsBefore(ajaxCollapsionEvents); topGroup.toggle(); @@ -129,7 +131,7 @@ @Test @Use(field = "event", value = "serverExpansionEvents") public void testClientSideExpansionEventsServer() { - attributes.setMode(server); + panelMenuGroupAttributes.set(mode, server); menu.setGroupMode(server); topGroup.toggle(); menu.setGroupMode(null); @@ -141,7 +143,7 @@ @Test @Use(field = "event", value = "serverCollapsionEvents") public void testClientSideCollapsionEventsServer() { - attributes.setMode(server); + panelMenuGroupAttributes.set(mode, server); menu.setGroupMode(null); testRequestEventsBeforeByAlert(event); topGroup.toggle(); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupDOMEventHandlers.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupDOMEventHandlers.java 2011-09-23 13:29:03 UTC (rev 22749) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupDOMEventHandlers.java 2011-09-23 13:29:35 UTC (rev 22750) @@ -28,9 +28,11 @@ 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.richfaces.PanelMenuMode.client; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuGroupAttributes; +import static org.richfaces.tests.metamer.ftest.richPanelMenuGroup.PanelMenuGroupAttributes.mode; import org.jboss.test.selenium.dom.Event; -import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.Test; @@ -48,7 +50,7 @@ @Test public void testDOMEventHandler() { - attributes.setMode(PanelMenuMode.client); + panelMenuGroupAttributes.set(mode, client); super.testFireEvent(event, topGroup); } } 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-09-23 13:29:03 UTC (rev 22749) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupMode.java 2011-09-23 13:29:35 UTC (rev 22750) @@ -28,6 +28,7 @@ import static javax.faces.event.PhaseId.RESTORE_VIEW; import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuGroupAttributes; import java.util.LinkedList; @@ -66,12 +67,12 @@ @Test public void testRequestMode() { - attributes.setImmediate(immediate); - attributes.setBypassUpdates(bypassUpdates); - attributes.setMode(mode); + panelMenuGroupAttributes.set(PanelMenuGroupAttributes.immediate, immediate); + panelMenuGroupAttributes.set(PanelMenuGroupAttributes.bypassUpdates, bypassUpdates); + panelMenuGroupAttributes.set(PanelMenuGroupAttributes.mode, mode); menu.setGroupMode(mode); - attributes.setExecute("@this executeChecker"); + panelMenuGroupAttributes.set(PanelMenuGroupAttributes.execute, "@this executeChecker"); assertTrue(topGroup.isExpanded()); topGroup.toggle(); @@ -95,7 +96,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() { - attributes.setMode(PanelMenuMode.client); + panelMenuGroupAttributes.set(PanelMenuGroupAttributes.mode, PanelMenuMode.client); menu.setGroupMode(PanelMenuMode.client); assertTrue(topGroup.isExpanded()); 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-09-23 13:29:03 UTC (rev 22749) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-09-23 13:29:35 UTC (rev 22750) @@ -5,6 +5,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuGroupAttributes; +import static org.richfaces.tests.metamer.ftest.richPanelMenuGroup.PanelMenuGroupAttributes.*; import org.jboss.test.selenium.GuardRequest; import org.jboss.test.selenium.locator.ElementLocator; @@ -27,8 +29,8 @@ @Test public void testData() { - attributes.setData("RichFaces 4"); - attributes.setOncomplete("data = event.data"); + panelMenuGroupAttributes.set(data, "RichFaces 4"); + panelMenuGroupAttributes.set(oncomplete, "data = event.data"); retrieveRequestTime.initializeValue(); topGroup.toggle(); @@ -42,7 +44,7 @@ menu.setGroupMode(null); assertFalse(topGroup.isDisabled()); - attributes.setDisabled(true); + panelMenuGroupAttributes.set(disabled, true); assertFalse(topGroup.isSelected()); assertTrue(topGroup.isDisabled()); @@ -59,13 +61,13 @@ @Test public void testDisabledClass() { - attributes.setDisabled(true); + panelMenuGroupAttributes.set(disabled, true); super.testStyleClass(topGroup, disabledClass); } @Test public void testLeftDisabledIcon() { - attributes.setDisabled(true); + panelMenuGroupAttributes.set(disabled, true); JQueryLocator input = pjq("select[id$=lefttDisabledIcon]"); ElementLocator<JQueryLocator> icon = leftIcon.getIcon(); ElementLocator<JQueryLocator> image = jq(leftIcon.getIcon().getRawLocator()).getChild(jq("img")); @@ -80,7 +82,7 @@ ElementLocator<JQueryLocator> image = jq(leftIcon.getIcon().getRawLocator()).getChild(jq("img")); verifyStandardIcons(input, icon, image, ""); - attributes.setDisabled(true); + panelMenuGroupAttributes.set(disabled, true); assertTrue(leftIcon.isTransparent()); } @@ -91,14 +93,14 @@ ElementLocator<JQueryLocator> image = jq(leftIcon.getIcon().getRawLocator()).getChild(jq("img")); verifyStandardIcons(input, icon, image, ""); - attributes.setDisabled(true); + panelMenuGroupAttributes.set(disabled, true); assertTrue(rightIcon.isTransparent()); } @Test public void testLimitRender() { - attributes.setRender("renderChecker"); - attributes.setLimitRender(true); + panelMenuGroupAttributes.set(render, "renderChecker"); + panelMenuGroupAttributes.set(limitRender, true); retrieveRequestTime.initializeValue(); retrieveRenderChecker.initializeValue(); @@ -111,14 +113,14 @@ public void testRendered() { assertTrue(topGroup.isVisible()); - attributes.setRendered(false); + panelMenuGroupAttributes.set(rendered, false); assertFalse(topGroup.isVisible()); } @Test public void testRightDisabledIcon() { - attributes.setDisabled(true); + panelMenuGroupAttributes.set(disabled, true); JQueryLocator input = pjq("select[id$=rightDisabledIcon]"); ElementLocator<JQueryLocator> icon = rightIcon.getIcon(); ElementLocator<JQueryLocator> image = jq(rightIcon.getIcon().getRawLocator()).getChild(jq("img")); @@ -132,7 +134,7 @@ ElementLocator<JQueryLocator> image = jq(rightIcon.getIcon().getRawLocator()).getChild(jq("img")); verifyStandardIcons(input, icon, image, ""); - attributes.setDisabled(true); + panelMenuGroupAttributes.set(disabled, true); assertTrue(rightIcon.isTransparent()); } @@ -144,7 +146,7 @@ ElementLocator<JQueryLocator> image = jq(rightIcon.getIcon().getRawLocator()).getChild(jq("img")); verifyStandardIcons(input, icon, image, ""); - attributes.setDisabled(true); + panelMenuGroupAttributes.set(disabled, true); assertTrue(rightIcon.isTransparent()); } @@ -152,18 +154,18 @@ public void testSelectable() { menu.setGroupMode(PanelMenuMode.ajax); - attributes.setSelectable(false); + panelMenuGroupAttributes.set(selectable, false); topGroup.toggle(); assertFalse(topGroup.isSelected()); - attributes.setSelectable(true); + panelMenuGroupAttributes.set(selectable, true); topGroup.toggle(); assertTrue(topGroup.isSelected()); } @Test public void testStatus() { - attributes.setStatus("statusChecker"); + panelMenuGroupAttributes.set(status, "statusChecker"); retrieveStatusChecker.initializeValue(); topGroup.toggle();