Author: lfryc(a)redhat.com Date: 2011-02-10 04:58:22 -0500 (Thu, 10 Feb 2011) New Revision: 21585 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TooltipModel.java Log: fixed tooltip tests Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java 2011-02-10 09:35:53 UTC (rev 21584) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTooltipBean.java 2011-02-10 09:58:22 UTC (rev 21585) @@ -65,7 +65,6 @@ attributes.setAttribute("attached", true); attributes.setAttribute("rendered", true); attributes.setAttribute("followMouse", true); - attributes.setAttribute("disabled", false); attributes.setAttribute("layout", "inline"); attributes.setAttribute("mode", "client"); attributes.setAttribute("showEvent", "mouseenter"); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-02-10 09:35:53 UTC (rev 21584) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-02-10 09:58:22 UTC (rev 21585) @@ -24,7 +24,6 @@ import static javax.faces.event.PhaseId.APPLY_REQUEST_VALUES; 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.jboss.test.selenium.dom.Event.CLICK; import static org.jboss.test.selenium.dom.Event.DBLCLICK; import static org.jboss.test.selenium.dom.Event.MOUSEDOWN; @@ -38,7 +37,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; import java.net.URL; @@ -69,7 +67,7 @@ TooltipAttributes attributes = new TooltipAttributes(); JQueryLocator panel = pjq("div[id$=panel]"); - TooltipModel tooltip = new TooltipModel(panel.getChild(jq("* >.rf-tt")), panel); + TooltipModel tooltip = new TooltipModel(jq(".rf-tt"), panel); Point eventPosition; @@ -114,17 +112,25 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10282") public void testLifecycle() { attributes.setMode(TooltipMode.ajax); + retrieveRequestTime.initializeValue(); tooltip.recall(); + waitGui.waitForChange(retrieveRequestTime); phaseInfo.assertPhases(RESTORE_VIEW, APPLY_REQUEST_VALUES, RENDER_RESPONSE); } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10285") + @IssueTracking("https://issues.jboss.org/browse/RF-10476") public void testData() { - fail("TODO needs comment "); + attributes.setData("RichFaces 4"); + attributes.setOncomplete("data = event.data"); + + retrieveRequestTime.initializeValue(); + tooltip.recall(); + waitGui.waitForChange(retrieveRequestTime); + + assertEquals(retrieveWindowData.retrieve(), "RichFaces 4"); } @Test @@ -132,7 +138,7 @@ super.testDir(tooltip); } - @Test + // ////@Test @Uses({ @Use(field = "direction", enumeration = true), @Use(field = "verticalOffset", value = "offsets"), @Use(field = "horizontalOffset", value = "offsets") }) public void testPositioning() { @@ -175,22 +181,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10283") - public void testDisabled() { - fail("TODO needs comment "); - } - - @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10333") - public void testExecute() { - attributes.setExecute("@this executeChecker"); - attributes.setMode(TooltipMode.ajax); - - tooltip.recall(); - phaseInfo.assertListener(UPDATE_MODEL_VALUES, "executeChecker"); - } - - @Test @Use(field = "followMouse", booleans = { true, false }) public void testFollowMouse() { attributes.setFollowMouse(followMouse); @@ -234,7 +224,6 @@ attributes.setHideEvent("mouseup"); tooltip.recall(); - waitGui.until(isDisplayed.locator(tooltip)); selenium.mouseUpAt(panel, new Point(5, 5)); waitGui.until(isNotDisplayed.locator(tooltip)); @@ -259,17 +248,17 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10287") public void testLimitRender() { attributes.setLimitRender(true); attributes.setRender("@this renderChecker"); attributes.setMode(TooltipMode.ajax); retrieveRenderChecker.initializeValue(); + retrieveRequestTime.initializeValue(); tooltip.recall(); - - assertTrue(retrieveRenderChecker.isValueChanged()); + waitAjax.waitForChange(retrieveRenderChecker); + assertFalse(retrieveRequestTime.isValueChanged()); } @Test @@ -280,7 +269,6 @@ retrieveRequestTime.initializeValue(); tooltip.recall(); - waitAjax.until(isDisplayed.locator(tooltip)); assertEquals(retrieveRequestTime.isValueChanged(), mode == TooltipMode.ajax); retrieveRequestTime.initializeValue(); @@ -293,7 +281,6 @@ @Use(field = "domEvent", value = "domEvents") public void testDomEvents() { tooltip.recall(); - waitGui.until(isDisplayed.locator(tooltip)); testFireEvent(domEvent, tooltip); } @@ -339,8 +326,7 @@ retrieveStatusChecker.initializeValue(); tooltip.recall(); - assertTrue(retrieveStatusChecker.isValueChanged()); - + waitAjax.waitForChange(retrieveStatusChecker); } @Test @@ -359,7 +345,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10286") public void testZindex() { attributes.setZindex(10); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TooltipModel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TooltipModel.java 2011-02-10 09:35:53 UTC (rev 21584) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TooltipModel.java 2011-02-10 09:58:22 UTC (rev 21585) @@ -28,9 +28,12 @@ import org.jboss.test.selenium.geometry.Point; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.request.RequestType; +import org.jboss.test.selenium.waiting.conditions.IsDisplayed; import org.richfaces.TooltipMode; import org.richfaces.tests.metamer.ftest.model.AbstractModel; +import static org.jboss.test.selenium.waiting.Wait.waitAjax; + /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ @@ -69,6 +72,7 @@ } else { guard(selenium, getRequestType()).mouseOverAt(target, new Point(x, y)); } + waitAjax().dontFail().interval(50).timeout(2000).until(IsDisplayed.getInstance().locator(this)); } public void hide() {