Author: jjamrich
Date: 2011-08-18 09:14:25 -0400 (Thu, 18 Aug 2011)
New Revision: 22658
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/RichPickListComponentAttribute.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
Log:
Merge branch 'rfpl-1603'
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml 2011-08-18
12:23:51 UTC (rev 22657)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml 2011-08-18
13:14:25 UTC (rev 22658)
@@ -98,6 +98,7 @@
ontargetmouseout="#{richPickListBean.attributes['ontargetmouseout'].value}"
ontargetmouseover="#{richPickListBean.attributes['ontargetmouseover'].value}"
ontargetmouseup="#{richPickListBean.attributes['ontargetmouseup'].value}"
+ orderable="#{richPickListBean.attributes['orderable'].value}"
removeAllText="#{richPickListBean.attributes['removeAllText'].value}"
removeText="#{richPickListBean.attributes['removeText'].value}"
rendered="#{richPickListBean.attributes['rendered'].value}"
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/RichPickListComponentAttribute.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/RichPickListComponentAttribute.java 2011-08-18
12:23:51 UTC (rev 22657)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/RichPickListComponentAttribute.java 2011-08-18
13:14:25 UTC (rev 22658)
@@ -267,6 +267,10 @@
public void setOntargetmouseup(String ontargetmouseup) {
setProperty("ontargetmouseup", ontargetmouseup);
}
+
+ public void setOrderable(Boolean orderable) {
+ setProperty("orderable", orderable);
+ }
public void setRemoveAllText(String removeAllText) {
setProperty("removeAllText", removeAllText);
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-18
12:23:51 UTC (rev 22657)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-08-18
13:14:25 UTC (rev 22658)
@@ -60,6 +60,9 @@
private JQueryLocator sourceCaptionLocator = pjq("div[id$=pickListSource]
div.rf-pick-source-caption");
private JQueryLocator pickListCtrl = pjq("div.rf-pick-lst-scrl");
+ private JQueryLocator pickListOrderingControlsContainer =
pjq("table[id$=pickListTarget] td:eq(1)");
+ private JQueryLocator pickListOrderingCtrlFormat =
+ pickListOrderingControlsContainer.getDescendant(jq("tr td
button:contains({0})"));
private JQueryLocator pickListSrcItems =
pjq("div[id$=pickListSourceItems]");
private JQueryLocator pickListSrcItem =
pickListSrcItems.getChild(jq("div[id$=pickListItem{0}]"));
@@ -86,6 +89,7 @@
private String STYLE_CLASS_ITEM_DISABLED = "rf-pick-opt-dis";
private String STYLE_CLASS_BTN_DISABLED = "rf-pick-btn-dis";
private String STYLE_CLASS_ITEM_SELECTED = "rf-pick-sel";
+ private String STYLE_CLASS_ORD_BTN_DISABLED = "rf-ord-btn-dis";
private String phaseListenerLogFormat = "*3 value changed: {0} -> {1}";
@@ -124,6 +128,11 @@
selenium.click(removeAllBtn);
}
+ private String getOrderBtnClass(String label) {
+ return selenium.getAttribute(
+ pickListOrderingCtrlFormat.format(label).getAttribute(classAttr));
+ }
+
@Test
public void testAddAllText() {
String label = "xxx";
@@ -137,7 +146,7 @@
attributes.setAddText(label);
assertTrue(label.equals(selenium.getText(addBtn)));
}
-
+
// @Test
public void testColumnClasses() {
// TODO JJa 2011-08-05: ask Brian about this attr:
@@ -493,6 +502,74 @@
public void testOntargetmouseup() {
testFireEvent(new Event("targetmouseup"), pickListTop);
}
+
+ @Test
+ public void testOrderable() {
+
+ // firstly check ordering controls doesn't appear near pickList if not
"orderable"
+ attributes.setOrderable(Boolean.FALSE);
+ assertFalse(selenium.isElementPresent(pickListOrderingControlsContainer));
+
+ // then make sure that controls appear near pickList when allow ordering
behavior
+ attributes.setOrderable(Boolean.TRUE);
+ assertTrue(selenium.isElementPresent(pickListOrderingControlsContainer));
+
+ // then add some items to target list
+ addItem("Alaska");
+ addItem("California");
+ addItem("Delaware");
+
+ // all items should remain selected and in this case ordering controls should be
disabled
+ String classAttrVal = selenium.getAttribute(
+
pickListTrgtItemStageByText.format("Alaska").getAttribute(classAttr));
+
+ assertTrue(classAttrVal != null);
+ assertTrue(classAttrVal.contains(STYLE_CLASS_ITEM_SELECTED));
+
+ classAttrVal = selenium.getAttribute(
+
pickListTrgtItemStageByText.format("California").getAttribute(classAttr));
+
+ assertTrue(classAttrVal != null);
+ assertTrue(classAttrVal.contains(STYLE_CLASS_ITEM_SELECTED));
+
+ classAttrVal = selenium.getAttribute(
+
pickListTrgtItemStageByText.format("Delaware").getAttribute(classAttr));
+
+ assertTrue(classAttrVal != null);
+ assertTrue(classAttrVal.contains(STYLE_CLASS_ITEM_SELECTED));
+
+ // so check ordering controls if they are disabled
+
assertTrue(getOrderBtnClass("First").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
assertTrue(getOrderBtnClass("Up").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
assertTrue(getOrderBtnClass("Down").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
assertTrue(getOrderBtnClass("Last").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
+ // now is time to select one item. This should cause ordering controls enable
+ selenium.click(pickListTrgtItemStageByText.format("Alaska"));
+
+ // since it was first item, "Down" and "Last" buttons should
be enabled
+
assertTrue(getOrderBtnClass("First").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
assertTrue(getOrderBtnClass("Up").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
assertFalse(getOrderBtnClass("Down").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
assertFalse(getOrderBtnClass("Last").contains(STYLE_CLASS_ORD_BTN_DISABLED));
+
+ // move "Alaska" to last
+ selenium.click(pickListOrderingCtrlFormat.format("Last"));
+
+ // verify that "Alaska" is last item (select 3rd item, and verify
text)
+ assertTrue("Alaska".equals(
+
selenium.getText(pickListTrgtItemsStage.getChild(jq("div.rf-pick-opt:eq(2)")))));
+
+ // then move "Alaska" one step "up"
+ selenium.click(pickListOrderingCtrlFormat.format("Up"));
+ assertTrue("Alaska".equals(
+
selenium.getText(pickListTrgtItemsStage.getChild(jq("div.rf-pick-opt:eq(1)")))));
+
+ // and then verify if all items are submitted in user defined order as well
+ selenium.click(a4jSubmit);
+ waitModel.until(textEquals.locator(output).text("[California, Alaska,
Delaware]"));
+
+ }
@Test
public void testRemoveAllText() {
Show replies by date