Author: jjamrich
Date: 2011-09-12 14:37:29 -0400 (Mon, 12 Sep 2011)
New Revision: 22709
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
Log:
RFPL-1612: fix tests for pickList according to last fixes on this component
Fixed event handlers, removed columnsVar (renamed to var) and some changes in internal
structure which caused some locators was no longer valid.
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-09-12
18:37:07 UTC (rev 22708)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-09-12
18:37:29 UTC (rev 22709)
@@ -22,6 +22,7 @@
package org.richfaces.tests.metamer.ftest.richPickList;
import static java.text.MessageFormat.format;
+import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp;
import static org.jboss.test.selenium.locator.LocatorFactory.jq;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -31,6 +32,7 @@
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.locator.Attribute;
+import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.utils.URLUtils;
import org.jboss.test.selenium.waiting.EventFiredCondition;
@@ -58,7 +60,7 @@
private JQueryLocator pickListSource = pjq("div.rf-pick-source
div.rf-pick-lst-dcrtn"); // this locator works for sourcemouseover event
private JQueryLocator pickListTarget = pjq("div.rf-pick-target
div.rf-pick-lst-dcrtn");
private JQueryLocator output = pjq("span[id$=output]");
- private JQueryLocator pickListMsgBox = pjq("span.rf-msg >
span[id$=msg:form:pickList] > span.rf-msg-det");
+ private JQueryLocator pickListMsgBox = pjq("span.rf-ntf-msg >
span[id$=msg:form:pickList] > span.rf-msg-det");
private JQueryLocator targetCaptionLocator = pjq("div[id$=pickListTargetList]
> div.rf-pick-target-caption");
private JQueryLocator sourceCaptionLocator = pjq("div[id$=pickListSourceList]
> div.rf-pick-source-caption");
@@ -77,9 +79,9 @@
// after click on 'add' button, item is moved to 'staging' container
(not child of #pickListTargetItems)
private JQueryLocator pickListTrgtItemsStage = pjq("div[id$=pickListTargetList]
div.rf-pick-lst-scrl");
- private JQueryLocator pickListTrgtItemStage =
pickListTrgtItemsStage.getChild(jq("div[id$=pickListItem{0}]"));
+ private JQueryLocator pickListTrgtItemStage =
pickListTrgtItemsStage.getDescendant(jq("div[id$=pickListItem{0}]"));
private JQueryLocator pickListTrgtItemStageByText = pickListTrgtItemsStage
- .getChild(jq("div.rf-pick-opt:contains({0})"));
+ .getDescendant(jq("div.rf-pick-opt:contains({0})"));
private JQueryLocator addBtn = pjq("button.rf-pick-add");
private JQueryLocator addAllBtn = pjq("button.rf-pick-add-all");
@@ -157,14 +159,12 @@
// @Test
public void testColumnClasses() {
- // TODO JJa 2011-08-05: ask Brian about this attr:
- // attributes.setColumnClasses(columnClasses);
+ // move to columns layout test
}
// @Test
- public void testColumnVar() {
- // TODO JJa 2011-08-05: ask Brian about this attr:
- // attributes.setColumnVar(columnVar);
+ public void testVar() {
+ // move to columns layout test
}
@Test
@@ -172,6 +172,7 @@
// add first item [idx=0], then submit and disable
addItem(0);
+ waitGui.until(elementPresent.locator(pickListTargetItem.format(0)));
selenium.click(hSubmit);
attributes.setDisabled(Boolean.TRUE);
@@ -227,15 +228,20 @@
"Button's text did not change.");
}
+ /**
+ * This attribute is supposed to be used with column layout
+ */
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11335")
public void testHeaderClass() {
+ // move to columns layout test
+ /*
String headerClass = "my-cool-header-class";
attributes.setHeaderClass(headerClass);
String found = selenium.getAttribute(pickListTop.getAttribute(classAttr));
assertTrue(found != null);
assertTrue(found.contains(headerClass));
+ */
}
@Test
@@ -324,7 +330,7 @@
attributes.setOnchange("metamerEvents += \"change \"");
addItem("North Carolina");
waitGui.failWith("Attribute onchange does not work correctly").until(
- new EventFiredCondition(new Event("change")));
+ new EventFiredCondition(Event.CHANGE));
}
@Test
@@ -365,66 +371,6 @@
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistclick() {
- testFireEvent(Event.CLICK, pickListTop, "listclick");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistdblclick() {
- testFireEvent(Event.DBLCLICK, pickListTop, "listdblclick");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistkeydown() {
- testFireEvent(Event.KEYDOWN, pickListTop, "listkeydown");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistkeypress() {
- testFireEvent(Event.KEYPRESS, pickListTop, "listkeypress");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistkeyup() {
- testFireEvent(Event.KEYUP, pickListTop, "listkeyup");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistmousedown() {
- testFireEvent(Event.MOUSEDOWN, pickListTop, "listmousedown");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistmousemove() {
- testFireEvent(Event.MOUSEMOVE, pickListTop, "listmousemove");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistmouseout() {
- testFireEvent(Event.MOUSEOUT, pickListTop, "listmouseout");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistmouseover() {
- testFireEvent(Event.MOUSEOVER, pickListTop, "listmouseover");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
- public void testOnlistmouseup() {
- testFireEvent(Event.MOUSEUP, pickListTop, "listmouseup");
- }
-
- @Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnmousedown() {
testFireEvent(Event.MOUSEDOWN, pickListTop);
}
@@ -467,49 +413,49 @@
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourceclick() {
- testFireEvent(Event.CLICK, pickListTop, "sourceclick");
+ testFireEvent(Event.CLICK, pickListSource, "sourceclick");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourcedblclick() {
- testFireEvent(Event.DBLCLICK, pickListTop, "sourcedblclick");
+ testFireEvent(Event.DBLCLICK, pickListSource, "sourcedblclick");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourcekeydown() {
- testFireEvent(Event.KEYDOWN, pickListTop, "sourcekeydown");
+ testFireEvent(Event.KEYDOWN, pickListSource, "sourcekeydown");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourcekeypress() {
- testFireEvent(Event.KEYPRESS, pickListTop, "sourcekeypress");
+ testFireEvent(Event.KEYPRESS, pickListSource, "sourcekeypress");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourcekeyup() {
- testFireEvent(Event.KEYUP, pickListTop, "sourcekeyup");
+ testFireEvent(Event.KEYUP, pickListSource, "sourcekeyup");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourcemousedown() {
- testFireEvent(Event.MOUSEDOWN, pickListTop, "sourcemousedown");
+ testFireEvent(Event.MOUSEDOWN, pickListSource, "sourcemousedown");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourcemousemove() {
- testFireEvent(Event.MOUSEMOVE, pickListTop, "sourcemousemove");
+ testFireEvent(Event.MOUSEMOVE, pickListSource, "sourcemousemove");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourcemouseout() {
- testFireEvent(Event.MOUSEOUT, pickListTop, "sourcemouseout");
+ testFireEvent(Event.MOUSEOUT, pickListSource, "sourcemouseout");
}
@Test
@@ -520,55 +466,55 @@
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOnsourcemouseup() {
- testFireEvent(Event.MOUSEUP, pickListTop, "sourcemouseup");
+ testFireEvent(Event.MOUSEUP, pickListSource, "sourcemouseup");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetclick() {
- testFireEvent(Event.CLICK, pickListTop, "targetclick");
+ testFireEvent(Event.CLICK, pickListTarget, "targetclick");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetdblclick() {
- testFireEvent(Event.DBLCLICK, pickListTop, "targetdblclick");
+ testFireEvent(Event.DBLCLICK, pickListTarget, "targetdblclick");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetkeydown() {
- testFireEvent(Event.KEYDOWN, pickListTop, "targetkeydown");
+ testFireEvent(Event.KEYDOWN, pickListTarget, "targetkeydown");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetkeypress() {
- testFireEvent(Event.KEYPRESS, pickListTop, "targetkeypress");
+ testFireEvent(Event.KEYPRESS, pickListTarget, "targetkeypress");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetkeyup() {
- testFireEvent(Event.KEYUP, pickListTop, "targetkeyup");
+ testFireEvent(Event.KEYUP, pickListTarget, "targetkeyup");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetmousedown() {
- testFireEvent(Event.MOUSEDOWN, pickListTop, "targetmousedown");
+ testFireEvent(Event.MOUSEDOWN, pickListTarget, "targetmousedown");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetmousemove() {
- testFireEvent(Event.MOUSEMOVE, pickListTop, "targetmousemove");
+ testFireEvent(Event.MOUSEMOVE, pickListTarget, "targetmousemove");
}
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetmouseout() {
- testFireEvent(Event.MOUSEOUT, pickListTop, "targetmouseout");
+ testFireEvent(Event.MOUSEOUT, pickListTarget, "targetmouseout");
}
@Test
@@ -579,7 +525,7 @@
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11322")
public void testOntargetmouseup() {
- testFireEvent(Event.MOUSEUP, pickListTop, "targetmouseup");
+ testFireEvent(Event.MOUSEUP, pickListTarget, "targetmouseup");
}
@Test
@@ -634,11 +580,11 @@
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)")))));
+
assertTrue("Alaska".equals(selenium.getText(pickListTrgtItemsStage.getDescendant(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)")))));
+
assertTrue("Alaska".equals(selenium.getText(pickListTrgtItemsStage.getDescendant(jq("div.rf-pick-opt:eq(1)")))));
// and then verify if all items are submitted in user defined order as well
selenium.click(a4jSubmit);
@@ -755,19 +701,17 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11337")
public void testValidator() {
addAllItems();
selenium.click(a4jSubmit);
// following message is predefined by validator
- waitModel.until(textEquals.locator(pickListMsgBox).text("PickList don't
like '@' char!"));
+ waitModel.until(textEquals.locator(pickListMsgBox).text("We are sorry, but @
is not allowed to join us!"));
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11337")
public void testValidatorMessage() {
- String validationMessage = "We are sorry, but @ is not allowed to join
us!";
+ String validationMessage = "We are sorry, but @ is not allowed to join us!
Custom validatorMessage.";
attributes.setValidatorMessage(validationMessage);
addAllItems();
selenium.click(a4jSubmit);
@@ -852,7 +796,7 @@
public void testAddAllBtn() {
addAllItems();
-
waitModel.until(countEquals.count(54).locator(pickListTrgtItemsStage.getChild(jq("div.rf-pick-opt"))));
+
waitModel.until(countEquals.count(54).locator(pickListTrgtItemsStage.getDescendant(jq("div.rf-pick-opt"))));
}
/**
@@ -948,8 +892,7 @@
// now move selected item to target list
selenium.click(addBtn);
- waitGui.until(elementPresent
- .locator(jq("div[id$=pickListTargetList] div.rf-pick-lst-scrl >
div[id$=pickListItem0]")));
+ waitGui.until(elementPresent.locator(pickListTrgtItemStage.format(0)));
// and check if item remain selected
String classAfterMove =
selenium.getAttribute(pickListTrgtItemStage.format(itemIdx).getAttribute(classAttr));