Author: ppitonak(a)redhat.com
Date: 2011-10-13 07:18:08 -0400 (Thu, 13 Oct 2011)
New Revision: 22796
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTooltipBean.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipTarget.java
Log:
tests for rich:panelMenuItem and rich:tooltip fixed
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTooltipBean.java
===================================================================
---
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTooltipBean.java 2011-10-13
09:51:18 UTC (rev 22795)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTooltipBean.java 2011-10-13
11:18:08 UTC (rev 22796)
@@ -69,7 +69,7 @@
attributes.setAttribute("mode", "client");
attributes.setAttribute("showEvent", "mouseenter");
attributes.setAttribute("hideEvent", "mouseleave");
- attributes.setAttribute("target", "form:panel");
+ attributes.setAttribute("target", "panel");
// attributes that needs to be tested in other way
attributes.remove("converter");
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-10-13
09:51:18 UTC (rev 22795)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemClientSideHandlers.java 2011-10-13
11:18:08 UTC (rev 22796)
@@ -88,7 +88,7 @@
super.testRequestEventsAfter(ajaxEvents);
}
- @Test
+ @Test(groups = { "4.Future" })
@IssueTracking("https://issues.jboss.org/browse/RF-10844")
public void testClientSideEventsOrderServer() {
panelMenuItemAttributes.set(mode, server);
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipTarget.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipTarget.java 2011-10-13
09:51:18 UTC (rev 22795)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipTarget.java 2011-10-13
11:18:08 UTC (rev 22796)
@@ -36,18 +36,18 @@
/**
* Test for @target attribute on page faces/components/richTooltip/targetting.xhtml
- *
+ *
* @author <a href="mailto:jjamrich@redhat.com">Jan Jamrich</a>
- *
+ *
* @version $Revision$
*/
public class TestTooltipTarget extends AbstractMetamerTest {
-
+
// private TooltipAttributes attributes = new TooltipAttributes();
private JQueryLocator panel1 = pjq("div[id$=regular-div]");
private JQueryLocator panel2 = pjq("div[id$=jsf-div]");
private JQueryLocator panel3 = pjq("div[id$=panel_body]");
-
+
TooltipModel tooltip1 = new TooltipModel(jq(".rf-tt"), panel1);
TooltipModel tooltip2 = new TooltipModel(jq(".rf-tt"), panel2);
TooltipModel tooltip3 = new TooltipModel(jq(".rf-tt"), panel3);
@@ -56,7 +56,7 @@
public URL getTestUrl() {
return URLUtils.buildUrl(contextPath,
"faces/components/richTooltip/targetting.xhtml");
}
-
+
@BeforeMethod
public void setupAttributes() {
tooltipAttributes.set(showEvent, "mouseover");
@@ -66,19 +66,22 @@
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-11370")
public void testTarget() {
- // 1. first target
- tooltipAttributes.set(target, "regular-div");
- tooltip1.recall();
- waitGui.until(isDisplayed.locator(tooltip1));
-
// 2. target
- tooltipAttributes.set(target, "form:jsf-div");
+ tooltipAttributes.set(target, "jsf-div");
tooltip2.recall();
waitGui.until(isDisplayed.locator(tooltip2));
-
+
// 3. default target
- tooltipAttributes.set(target, "form:panel");
+ tooltipAttributes.set(target, "panel");
tooltip3.recall();
waitGui.until(isDisplayed.locator(tooltip3));
}
+
+ @Test(groups = { "4.2" })
+ @IssueTracking("https://issues.jboss.org/browse/RF-11370")
+ public void testTargetWithRegularDiv() {
+ tooltipAttributes.set(target, "regular-div");
+ tooltip1.recall();
+ waitGui.until(isDisplayed.locator(tooltip1));
+ }
}