From richfaces-svn-commits at lists.jboss.org Mon Apr 4 12:12:14 2011 Content-Type: multipart/mixed; boundary="===============8633861631340612044==" MIME-Version: 1.0 From: richfaces-svn-commits at lists.jboss.org To: richfaces-svn-commits at lists.jboss.org Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r22364 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richTooltip and 1 other directory. Date: Mon, 04 Apr 2011 12:12:14 -0400 Message-ID: <201104041612.p34GCEoR016630@svn01.web.mwc.hst.phx2.redhat.com> --===============8633861631340612044== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ppitonak(a)redhat.com Date: 2011-04-04 12:12:14 -0400 (Mon, 04 Apr 2011) New Revision: 22364 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes= ts/metamer/ftest/a4jQueue/TestGlobalQueue.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes= ts/metamer/ftest/richTooltip/TestTooltipSimple.java Log: tests updated Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa= ces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/a4jQueue/TestGlobalQueue.java 2011-04-04 13:23:24 UTC (re= v 22363) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/a4jQueue/TestGlobalQueue.java 2011-04-04 16:12:14 UTC (re= v 22364) @@ -24,6 +24,8 @@ import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; = +import com.thoughtworks.selenium.SeleniumException; + import java.net.URL; = import org.jboss.cheiron.halt.XHRHalter; @@ -31,11 +33,10 @@ import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.Test; = -import com.thoughtworks.selenium.SeleniumException; - /** * @author Lukas Fryc * @version $Revision$ @@ -110,7 +111,7 @@ *

*/ @Test - @IssueTracking("https://issues.jboss.org/browse/RFPL-1194") + @RegressionTest("https://issues.jboss.org/browse/RFPL-1194") public void testMultipleRequestsWithNoDelay() { attributes.setRequestDelay(0); = Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa= ces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-04-04 13:23:24 UT= C (rev 22363) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-04-04 16:12:14 UT= C (rev 22364) @@ -64,44 +64,33 @@ = private static final int EVENT_OFFSET =3D 10; private static final int PRESET_OFFSET =3D 5; - TooltipAttributes attributes =3D new TooltipAttributes(); JQueryLocator panel =3D pjq("div[id$=3Dpanel]"); TooltipModel tooltip =3D new TooltipModel(jq(".rf-tt"), panel); - Point eventPosition; - @Inject @Use(empty =3D true) Positioning direction; - - Integer[] offsets =3D new Integer[] { 0, PRESET_OFFSET, -PRESET_OFFSET= }; - + Integer[] offsets =3D new Integer[]{0, PRESET_OFFSET, -PRESET_OFFSET}; @Inject @Use(ints =3D 0) Integer verticalOffset; - @Inject @Use(ints =3D 0) Integer horizontalOffset; - @Inject @Use(empty =3D true) Event domEvent; - Event[] domEvents =3D { CLICK, DBLCLICK, MOUSEDOWN, MOUSEMOVE, MOUSEOU= T, MOUSEOVER, MOUSEUP }; - + Event[] domEvents =3D {CLICK, DBLCLICK, MOUSEDOWN, MOUSEMOVE, MOUSEOUT= , MOUSEOVER, MOUSEUP}; @Inject @Use(empty =3D true) Boolean followMouse =3D true; - @Inject @Use(empty =3D true) Integer presetDelay; - @Inject @Use(empty =3D true) TooltipLayout layout; - @Inject @Use(empty =3D true) TooltipMode mode; @@ -156,8 +145,10 @@ } = @Test - @Uses({ @Use(field =3D "direction", enumeration =3D true), @Use(field = =3D "verticalOffset", value =3D "offsets"), - @Use(field =3D "horizontalOffset", value =3D "offsets") }) + @Uses({ + @Use(field =3D "direction", enumeration =3D true), + @Use(field =3D "verticalOffset", value =3D "offsets"), + @Use(field =3D "horizontalOffset", value =3D "offsets")}) public void testPositioning() { attributes.setDirection(direction); attributes.setHorizontalOffset(horizontalOffset); @@ -179,7 +170,7 @@ break; case LEFT: assertEquals(tooltipPosition.getX() + tooltipDimension= .getWidth(), eventPosition.getX() - - horizontalOffset); + - horizontalOffset); default: } } @@ -191,14 +182,14 @@ break; case TOP: assertEquals(tooltipPosition.getY() + tooltipDimension= .getHeight(), eventPosition.getY() - - verticalOffset); + - verticalOffset); default: } } } = @Test - @Use(field =3D "followMouse", booleans =3D { true, false }) + @Use(field =3D "followMouse", booleans =3D {true, false}) public void testFollowMouse() { attributes.setFollowMouse(followMouse); = @@ -217,13 +208,14 @@ } = @Test - @Use(field =3D "presetDelay", ints =3D { 0, 1000, 5000 }) + @Use(field =3D "presetDelay", ints =3D {0, 1000, 5000}) public void testHideDelay() { = attributes.setMode(TooltipMode.ajax); attributes.setHideDelay(presetDelay); = new DelayTester(presetDelay) { + public void beforeAction() { tooltip.recall(); } @@ -285,7 +277,9 @@ retrieveRequestTime.initializeValue(); = tooltip.recall(); - assertEquals(retrieveRequestTime.isValueChanged(), mode =3D=3D Too= ltipMode.ajax); + if (mode =3D=3D TooltipMode.ajax) { + waitGui.waitForChange(retrieveRequestTime); + } = retrieveRequestTime.initializeValue(); tooltip.hide(); @@ -309,7 +303,7 @@ } = @Test - @Use(field =3D "presetDelay", ints =3D { 0, 1000, 5000 }) + @Use(field =3D "presetDelay", ints =3D {0, 1000, 5000}) @RegressionTest("https://issues.jboss.org/browse/RF-10522") public void testShowDelay() { = @@ -317,6 +311,7 @@ attributes.setShowDelay(presetDelay); = new DelayTester(presetDelay) { + public void action() { tooltip.recall(); waitGui.timeout(presetDelay + 2000).until(isDisplayed.loca= tor(tooltip)); @@ -374,10 +369,10 @@ final Dimension panelDimension =3D selenium.getElementDimension(pa= nel); = eventPosition =3D new Point(panelPosition.getX() + panelDimension.= getWidth() - EVENT_OFFSET, panelPosition.getY() - + panelDimension.getHeight() - EVENT_OFFSET); + + panelDimension.getHeight() - EVENT_OFFSET); = tooltip.recall(panelDimension.getWidth() - EVENT_OFFSET + offsetX,= panelDimension.getHeight() - EVENT_OFFSET - + offsetY); + + offsetY); } = private HorizontalAlignment getHorizontalAlignment() { @@ -405,11 +400,12 @@ } = private enum HorizontalAlignment { + LEFT, RIGHT } = private enum VerticalAlignment { + TOP, BOTTOM } - } --===============8633861631340612044==--