Author: jjamrich
Date: 2011-09-23 09:29:03 -0400 (Fri, 23 Sep 2011)
New Revision: 22749
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/attributes/AttributeList.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/AbstractPanelMenuTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/PanelMenuAttributes.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/richPanelMenu/TestPanelMenuMode.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSelection.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java
Log:
RFPL-1439: Update panelMenu tests to use unified way to setting attributes
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-09-23
13:28:32 UTC (rev 22748)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-09-23
13:29:03 UTC (rev 22749)
@@ -68,6 +68,8 @@
import org.richfaces.tests.metamer.TemplatesList;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Templates;
+import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum;
+import org.richfaces.tests.metamer.ftest.attributes.Attributes;
import org.testng.SkipException;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -264,7 +266,7 @@
* @param attribute
* name of the attribute that will be set (e.g. styleClass, headerClass,
itemContentClass)
*/
- protected void testStyleClass(ExtendedLocator<JQueryLocator> element,
BasicAttributes attribute) {
+ protected void testStyleClass(ExtendedLocator<JQueryLocator> element,
BasicAttributes attribute) {
final String styleClass = "metamer-ftest-class";
basicAttributes.set(attribute, styleClass);
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:28:32 UTC (rev 22748)
+++
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)
@@ -25,6 +25,7 @@
import org.richfaces.tests.metamer.ftest.richJQuery.RichJQueryAttributes;
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.richTooltip.TooltipAttributes;
public class AttributeList {
@@ -53,5 +54,6 @@
public static Attributes<RichJQueryAttributes> jQueryAttributes = new
Attributes<RichJQueryAttributes>();
public static Attributes<ListAttributes> listAttributes = new
Attributes<ListAttributes>();
public static Attributes<MessageAttributes> messageAttributes = new
Attributes<MessageAttributes>();
+ public static Attributes<PanelMenuAttributes> panelMenuAttributes = new
Attributes<PanelMenuAttributes>();
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/AbstractPanelMenuTest.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/AbstractPanelMenuTest.java 2011-09-23
13:28:32 UTC (rev 22748)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/AbstractPanelMenuTest.java 2011-09-23
13:29:03 UTC (rev 22749)
@@ -23,6 +23,9 @@
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.richfaces.PanelMenuMode.ajax;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuAttributes;
+import static
org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes.groupMode;
+import static
org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes.itemMode;
import java.net.URL;
@@ -36,7 +39,6 @@
*/
public class AbstractPanelMenuTest extends AbstractMetamerTest {
- PanelMenuAttributes attributes = new PanelMenuAttributes();
PanelMenu menu = new PanelMenu(pjq("div.rf-pm[id$=panelMenu]"));
PanelMenu.Item item3 = menu.getItemContains("Item 3");
PanelMenu.Item item4 = menu.getItemContains("Item 4");
@@ -56,8 +58,8 @@
@BeforeMethod
public void setupModes() {
- attributes.setItemMode(ajax);
- attributes.setGroupMode(ajax);
+ panelMenuAttributes.set(itemMode, ajax);
+ panelMenuAttributes.set(groupMode, ajax);
menu.setItemMode(ajax);
menu.setGroupMode(ajax);
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/PanelMenuAttributes.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/PanelMenuAttributes.java 2011-09-23
13:28:32 UTC (rev 22748)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/PanelMenuAttributes.java 2011-09-23
13:29:03 UTC (rev 22749)
@@ -21,167 +21,52 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.richPanelMenu;
-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 PanelMenuAttributes extends AbstractComponentAttributes {
- public void setBubbleSelection(Boolean bubbleSelection) {
- setProperty("bubbleSelection", bubbleSelection);
- }
+public enum PanelMenuAttributes implements AttributeEnum {
+
+ bubbleSelection,
+ collapseEvent,
+ disabled,
+ expandEvent,
+ expandSingle,
+ groupClass,
+ groupCollapsedLeftIcon,
+ groupCollapsedRightIcon,
+ groupDisabledClass,
+ groupDisabledLeftIcon,
+ groupDisabledRightIcon,
+ groupExpandedLeftIcon,
+ groupExpandedRightIcon,
+ groupMode,
+ itemClass,
+ itemDisabledClass,
+ itemDisabledLeftIcon,
+ itemDisabledRightIcon,
+ itemLeftIcon,
+ itemMode,
+ itemRightIcon,
+ rendered,
+ style,
+ styleClass,
+ topGroupClass,
+ topGroupCollapsedLeftIcon,
+ topGroupCollapsedRightIcon,
+ topGroupDisabledClass,
+ topGroupDisabledLeftIcon,
+ topGroupDisabledRightIcon,
+ topGroupExpandedLeftIcon,
+ topGroupExpandedRightIcon,
+ topItemClass,
+ topItemDisabledClass,
+ topItemDisabledLeftIcon,
+ topItemDisabledRightIcon,
+ topItemLeftIcon,
+ topItemRightIcon,
+ width,
- public void setCollapseEvent(String collapseEvent) {
- setProperty("collapseEvent", collapseEvent);
- }
-
- public void setDisabled(Boolean disabled) {
- setProperty("disabled", disabled);
- }
-
- public void setExpandEvent(String expandEvent) {
- setProperty("expandEvent", expandEvent);
- }
-
- public void setExpandSingle(Boolean expandSingle) {
- setProperty("expandSingle", expandSingle);
- }
-
- public void setGroupClass(String groupClass) {
- setProperty("groupClass", groupClass);
- }
-
- public void setGroupCollapsedLeftIcon(String groupCollapsedLeftIcon) {
- setProperty("groupCollapsedLeftIcon", groupCollapsedLeftIcon);
- }
-
- public void setGroupCollapsedRightIcon(String groupCollapsedRightIcon) {
- setProperty("groupCollapsedRightIcon", groupCollapsedRightIcon);
- }
-
- public void setGroupDisabledClass(String groupDisabledClass) {
- setProperty("groupDisabledClass", groupDisabledClass);
- }
-
- public void setGroupDisabledLeftIcon(String groupDisabledLeftIcon) {
- setProperty("groupDisabledLeftIcon", groupDisabledLeftIcon);
- }
-
- public void setGroupDisabledRightIcon(String groupDisabledRightIcon) {
- setProperty("groupDisabledRightIcon", groupDisabledRightIcon);
- }
-
- public void setGroupExpandedLeftIcon(String groupExpandedLeftIcon) {
- setProperty("groupExpandedLeftIcon", groupExpandedLeftIcon);
- }
-
- public void setGroupExpandedRightIcon(String groupExpandedRightIcon) {
- setProperty("groupExpandedRightIcon", groupExpandedRightIcon);
- }
-
- public void setGroupMode(PanelMenuMode groupMode) {
- setProperty("groupMode", groupMode);
- }
-
- public void setItemClass(String itemClass) {
- setProperty("itemClass", itemClass);
- }
-
- public void setItemDisabledClass(String itemDisabledClass) {
- setProperty("itemDisabledClass", itemDisabledClass);
- }
-
- public void setItemDisabledLeftIcon(String itemDisabledLeftIcon) {
- setProperty("itemDisabledLeftIcon", itemDisabledLeftIcon);
- }
-
- public void setItemDisabledRightIcon(String itemDisabledRightIcon) {
- setProperty("itemDisabledRightIcon", itemDisabledRightIcon);
- }
-
- public void setItemLeftIcon(String itemLeftIcon) {
- setProperty("itemLeftIcon", itemLeftIcon);
- }
-
- public void setItemMode(PanelMenuMode itemMode) {
- setProperty("itemMode", itemMode);
- }
-
- public void setItemRightIcon(String itemRightIcon) {
- setProperty("itemRightIcon", itemRightIcon);
- }
-
- public void setRendered(Boolean rendered) {
- setProperty("rendered", rendered);
- }
-
- public void setStyle(String style) {
- setProperty("style", style);
- }
-
- public void setStyleClass(String styleClass) {
- setProperty("styleClass", styleClass);
- }
-
- public void setTopGroupClass(String topGroupClass) {
- setProperty("topGroupClass", topGroupClass);
- }
-
- public void setTopGroupCollapsedLeftIcon(String topGroupCollapsedLeftIcon) {
- setProperty("topGroupCollapsedLeftIcon", topGroupCollapsedLeftIcon);
- }
-
- public void setTopGroupCollapsedRightIcon(String topGroupCollapsedRightIcon) {
- setProperty("topGroupCollapsedRightIcon", topGroupCollapsedRightIcon);
- }
-
- public void setTopGroupDisabledClass(String topGroupDisabledClass) {
- setProperty("topGroupDisabledClass", topGroupDisabledClass);
- }
-
- public void setTopGroupDisabledLeftIcon(String topGroupDisabledLeftIcon) {
- setProperty("topGroupDisabledLeftIcon", topGroupDisabledLeftIcon);
- }
-
- public void setTopGroupDisabledRightIcon(String topGroupDisabledRightIcon) {
- setProperty("topGroupDisabledRightIcon", topGroupDisabledRightIcon);
- }
-
- public void setTopGroupExpandedLeftIcon(String topGroupExpandedLeftIcon) {
- setProperty("topGroupExpandedLeftIcon", topGroupExpandedLeftIcon);
- }
-
- public void setTopGroupExpandedRightIcon(String topGroupExpandedRightIcon) {
- setProperty("topGroupExpandedRightIcon", topGroupExpandedRightIcon);
- }
-
- public void setTopItemClass(String topItemClass) {
- setProperty("topItemClass", topItemClass);
- }
-
- public void setTopItemDisabledClass(String topItemDisabledClass) {
- setProperty("topItemDisabledClass", topItemDisabledClass);
- }
-
- public void setTopItemDisabledLeftIcon(String topItemDisabledLeftIcon) {
- setProperty("topItemDisabledLeftIcon", topItemDisabledLeftIcon);
- }
-
- public void setTopItemDisabledRightIcon(String topItemDisabledRightIcon) {
- setProperty("topItemDisabledRightIcon", topItemDisabledRightIcon);
- }
-
- public void setTopItemLeftIcon(String topItemLeftIcon) {
- setProperty("topItemLeftIcon", topItemLeftIcon);
- }
-
- public void setTopItemRightIcon(String topItemRightIcon) {
- setProperty("topItemRightIcon", topItemRightIcon);
- }
-
- public void setWidth(String width) {
- setProperty("width", width);
- }
}
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-09-23
13:28:32 UTC (rev 22748)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuDOMEvents.java 2011-09-23
13:29:03 UTC (rev 22749)
@@ -29,6 +29,10 @@
import static org.jboss.test.selenium.dom.Event.MOUSEOVER;
import static org.jboss.test.selenium.dom.Event.MOUSEUP;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuAttributes;
+import static
org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes.collapseEvent;
+import static
org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes.expandEvent;
+import static
org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes.groupMode;
import static org.testng.Assert.assertTrue;
import java.net.URL;
@@ -79,7 +83,7 @@
public void setup() {
waitToggle = waitModel.timeout(5000).interval(500);
if (mode != null) {
- attributes.setGroupMode(mode);
+ panelMenuAttributes.set(groupMode, mode);
menu.setGroupMode(mode);
}
}
@@ -87,7 +91,7 @@
@Test
@Use(field = "mode", enumeration = true)
public void testExpandEvent() {
- attributes.setExpandEvent(event.getEventName());
+ panelMenuAttributes.set(expandEvent, event.getEventName());
assertTrue(group2.isCollapsed());
fireEventNatively(group2.getLabel(), event);
@@ -97,7 +101,7 @@
@Test
@Use(field = "mode", enumeration = true)
public void testCollapseEvent() {
- attributes.setCollapseEvent(event.getEventName());
+ panelMenuAttributes.set(collapseEvent, event.getEventName());
group2.toggle();
assertTrue(group2.isExpanded());
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuMode.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuMode.java 2011-09-23
13:28:32 UTC (rev 22748)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuMode.java 2011-09-23
13:29:03 UTC (rev 22749)
@@ -27,6 +27,9 @@
import static javax.faces.event.PhaseId.RENDER_RESPONSE;
import static javax.faces.event.PhaseId.RESTORE_VIEW;
import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuAttributes;
+import static
org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes.groupMode;
+import static
org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes.itemMode;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -52,7 +55,7 @@
@Test
public void testGroupMode() {
- attributes.setGroupMode(mode);
+ panelMenuAttributes.set(groupMode, mode);
menu.setGroupMode(mode);
assertTrue(group1.isCollapsed());
@@ -74,7 +77,7 @@
@Test
public void testItemMode() {
- attributes.setItemMode(mode);
+ panelMenuAttributes.set(itemMode, mode);
menu.setItemMode(mode);
assertFalse(item3.isSelected());
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSelection.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSelection.java 2011-09-23
13:28:32 UTC (rev 22748)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSelection.java 2011-09-23
13:29:03 UTC (rev 22749)
@@ -22,6 +22,7 @@
package org.richfaces.tests.metamer.ftest.richPanelMenu;
import static org.testng.Assert.assertEquals;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuAttributes;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Use;
@@ -39,7 +40,7 @@
@Test
public void testBubbleSelection() {
- attributes.setBubbleSelection(bubbleSelection);
+ panelMenuAttributes.set(PanelMenuAttributes.bubbleSelection, bubbleSelection);
assertEquals(getSelectedItems(), 0);
assertEquals(getSelectedGroups(), 0);
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-09-23
13:28:32 UTC (rev 22748)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-09-23
13:29:03 UTC (rev 22749)
@@ -25,9 +25,12 @@
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.richfaces.tests.metamer.ftest.BasicAttributes.*;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.panelMenuAttributes;
+import static org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes.*;
import org.jboss.test.selenium.css.CssProperty;
import org.richfaces.PanelMenuMode;
+import org.richfaces.tests.metamer.ftest.BasicAttributes;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
@@ -47,13 +50,13 @@
@Test
@RegressionTest("https://issues.jboss.org/browse/RF-10158")
public void testDisabled() {
- attributes.setGroupMode(PanelMenuMode.client);
- attributes.setDisabled(false);
+ panelMenuAttributes.set(groupMode, PanelMenuMode.client);
+ panelMenuAttributes.set(disabled, false);
assertEquals(selenium.getCount(menu.getAnyDisabledGroup()), 2);
assertEquals(selenium.getCount(menu.getAnyDisabledItem()), 3);
- attributes.setDisabled(true);
+ panelMenuAttributes.set(disabled, true);
assertEquals(selenium.getCount(menu.getAnyDisabledGroup()), 6);
assertEquals(selenium.getCount(menu.getAnyDisabledItem()), 24);
@@ -63,7 +66,7 @@
@Use(field = "expandSingle", booleans = { true, false })
@IssueTracking("https://issues.jboss.org/browse/RF-10626")
public void testExpandSingle() {
- attributes.setExpandSingle(expandSingle);
+ panelMenuAttributes.set(PanelMenuAttributes.expandSingle, expandSingle);
group2.toggle();
assertEquals(getExpandedGroupsCount(), expanded(1));
@@ -74,33 +77,33 @@
@Test
public void testGroupClass() {
- attributes.setGroupMode(PanelMenuMode.client);
- super.testStyleClass(group24, groupClass);
+ panelMenuAttributes.set(groupMode, PanelMenuMode.client);
+ super.testStyleClass(group24, BasicAttributes.groupClass);
}
@Test
public void testGroupDisabledClass() {
- attributes.setGroupMode(PanelMenuMode.client);
- super.testStyleClass(group26, groupDisabledClass);
+ panelMenuAttributes.set(groupMode, PanelMenuMode.client);
+ super.testStyleClass(group26, BasicAttributes.groupDisabledClass);
}
@Test
public void testItemClass() {
- attributes.setGroupMode(PanelMenuMode.client);
- super.testStyleClass(item22, itemClass);
+ panelMenuAttributes.set(groupMode, PanelMenuMode.client);
+ super.testStyleClass(item22, BasicAttributes.itemClass);
}
@Test
public void testItemDisabledClass() {
- attributes.setGroupMode(PanelMenuMode.client);
- super.testStyleClass(item25, itemDisabledClass);
+ panelMenuAttributes.set(groupMode, PanelMenuMode.client);
+ super.testStyleClass(item25, BasicAttributes.itemDisabledClass);
}
@Test
public void testRendered() {
- attributes.setRendered(false);
+ panelMenuAttributes.set(rendered, false);
assertFalse(selenium.isElementPresent(menu));
- attributes.setRendered(true);
+ panelMenuAttributes.set(rendered, true);
assertTrue(selenium.isElementPresent(menu));
}
@@ -116,19 +119,19 @@
@Test
public void testTopGroupClass() {
- super.testStyleClass(group1, topGroupClass);
+ super.testStyleClass(group1, BasicAttributes.topGroupClass);
}
@Test
public void testTopItemClass() {
- super.testStyleClass(item3, topItemClass);
+ super.testStyleClass(item3, BasicAttributes.topItemClass);
}
@Test
@RegressionTest("https://issues.jboss.org/browse/RF-10302")
public void testWidth() {
- attributes.setStyle("");
- attributes.setWidth("300px");
+ panelMenuAttributes.set(PanelMenuAttributes.style, "");
+ panelMenuAttributes.set(width, "300px");
assertEquals(selenium.getStyle(menu, CssProperty.WIDTH), "300px");
}