Author: ppitonak(a)redhat.com Date: 2010-12-17 10:56:05 -0500 (Fri, 17 Dec 2010) New Revision: 20656 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java Log: * tests for inplace select fixed Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2010-12-17 15:24:53 UTC (rev 20655) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2010-12-17 15:56:05 UTC (rev 20656) @@ -76,6 +76,7 @@ attributes.setAttribute("listWidth", "200px"); attributes.setAttribute("openOnEdit", true); attributes.setAttribute("rendered", true); + attributes.setAttribute("saveOnBlur", true); attributes.setAttribute("saveOnSelect", true); // TODO has to be tested in another way Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java 2010-12-17 15:24:53 UTC (rev 20655) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java 2010-12-17 15:56:05 UTC (rev 20656) @@ -23,14 +23,15 @@ import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import java.net.URL; + import org.jboss.test.selenium.css.CssProperty; - import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.waiting.EventFiredCondition; @@ -54,6 +55,7 @@ private JQueryLocator options = jq("span.rf-is-opt:eq({0})"); // 00..49 private JQueryLocator okButton = jq("input.rf-is-btn[id$=Okbtn]"); private JQueryLocator cancelButton = jq("input.rf-is-btn[id$=Cancelbtn]"); + private JQueryLocator output = pjq("span[id$=output]"); @Override public URL getTestUrl() { @@ -85,11 +87,17 @@ assertEquals(selenium.getText(options.format(i)), selectOptions[i / 10], "Select option nr. " + i); } - guardNoRequest(selenium).click(options.format(10)); + selenium.click(options.format(10)); + guardXhr(selenium).fireEvent(input, Event.BLUR); + waitGui.failWith("Output did not change.").until(textEquals.locator(output).text("Hawaii")); + assertTrue(selenium.belongsClass(select, "rf-is-c-s"), "New class should be added to inplace select."); assertTrue(selenium.belongsClass(edit, "rf-is-none"), "Edit should contain class rf-is-none when popup is closed."); assertEquals(selenium.getText(label), "Hawaii", "Label should contain selected value."); + + String listenerText = selenium.getText(jq("div#phasesPanel li:eq(3)")); + assertEquals(listenerText, "* value changed: null -> Hawaii", "Value change listener was not invoked."); } @Test @@ -176,7 +184,13 @@ @Test @IssueTracking("https://jira.jboss.org/browse/RF-9849") public void testOnblur() { - testFireEvent(Event.BLUR, select); + selenium.type(pjq("input[id$=onblurInput]"), "metamerEvents += \"blur \""); + selenium.waitForPageToLoad(TIMEOUT); + + selenium.click(options.format(10)); + guardXhr(selenium).fireEvent(input, Event.BLUR); + + waitGui.failWith("Attribute onblur does not work correctly").until(new EventFiredCondition(Event.BLUR)); } @Test @@ -187,6 +201,7 @@ selenium.click(select); selenium.click(options.format(10)); + guardXhr(selenium).fireEvent(input, Event.BLUR); waitGui.failWith("Attribute onchange does not work correctly").until( new EventFiredCondition(Event.CHANGE)); @@ -205,12 +220,13 @@ @Test @IssueTracking("https://jira.jboss.org/browse/RF-9849") public void testOnfocus() { - testFireEvent(Event.FOCUS, select); - } + selenium.type(pjq("input[type=text][id$=onfocusInput]"), "metamerEvents += \"focus \""); + selenium.waitForPageToLoad(); - @Test - public void testOninputblur() { - testFireEvent(Event.BLUR, input, "inputblur"); + selenium.click(select); + + waitGui.failWith("Attribute onfocus does not work correctly").until( + new EventFiredCondition(Event.FOCUS)); } @Test @@ -224,11 +240,6 @@ } @Test - public void testOninputfocus() { - testFireEvent(Event.FOCUS, input, "inputfocus"); - } - - @Test public void testOninputkeydown() { testFireEvent(Event.KEYDOWN, input, "inputkeydown"); } @@ -364,9 +375,15 @@ } @Test - @IssueTracking("https://jira.jboss.org/browse/RF-9849") - public void testOnselect() { - testFireEvent(Event.SELECT, input); + public void testOnselectitem() { + selenium.type(pjq("input[type=text][id$=onselectitemInput]"), "metamerEvents += \"selectitem \""); + selenium.waitForPageToLoad(); + + selenium.click(select); + selenium.click(options.format(10)); + + waitGui.failWith("Attribute onselectitem does not work correctly").until( + new EventFiredCondition(new Event("selectitem"))); } @Test @@ -463,7 +480,7 @@ selenium.click(select); selenium.mouseOver(options.format(0)); - + assertTrue(selenium.belongsClass(options.format(0), "metamer-ftest-class"), "Selected item does not contain defined class."); for (int i = 1; i < 50; i++) { assertFalse(selenium.belongsClass(options.format(i), "metamer-ftest-class"), "Not selected item " + i + " should not contain defined class.");