Author: ppitonak(a)redhat.com Date: 2011-03-07 07:09:27 -0500 (Mon, 07 Mar 2011) New Revision: 22068 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java Log: tests for drop down menu and menu group fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java 2011-03-07 06:44:44 UTC (rev 22067) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java 2011-03-07 12:09:27 UTC (rev 22068) @@ -34,6 +34,7 @@ import org.jboss.test.selenium.css.CssProperty; import org.jboss.test.selenium.dom.Event; +import org.jboss.test.selenium.encapsulated.JavaScript; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.waiting.EventFiredCondition; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; @@ -82,7 +83,7 @@ assertFalse(selenium.isVisible(menuItem41), "Menu item \"Save\" should not be visible on the page."); assertFalse(selenium.isDisplayed(groupList), "Submenu should not be expanded."); - guardNoRequest(selenium).mouseOver(group); + guardNoRequest(selenium).getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseenter()")); assertTrue(selenium.isDisplayed(groupList), "Submenu should be expanded."); assertTrue(selenium.isElementPresent(menuItem41), "Menu item \"Save\" should be present on the page."); @@ -119,7 +120,7 @@ selenium.waitForPageToLoad(); selenium.mouseOver(fileMenuLabel); - selenium.mouseOut(fileMenuLabel); + selenium.getEval(new JavaScript("window.jQuery('" + fileMenuLabel.getRawLocator() + "').mouseleave()")); assertTrue(selenium.isDisplayed(fileMenuList), "Menu should be expanded."); waitFor(3000); assertFalse(selenium.isDisplayed(fileMenuList), "Menu should not be expanded."); @@ -181,9 +182,9 @@ selenium.waitForPageToLoad(); selenium.mouseOver(fileMenuLabel); - selenium.mouseOver(group); + selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseenter()")); waitGui.interval(2000).withDelay(true).failWith("Menu group was not opened.").until(isDisplayed.locator(groupList)); - selenium.mouseOut(group); + selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseleave()")); waitGui.failWith("Attribute ongrouphide does not work correctly").until(new EventFiredCondition(new Event("grouphide"))); } @@ -194,7 +195,7 @@ selenium.waitForPageToLoad(); selenium.mouseOver(fileMenuLabel); - selenium.mouseOver(group); + selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseenter()")); waitGui.interval(2000).withDelay(true).failWith("Menu group was not opened.").until(isDisplayed.locator(group)); waitGui.failWith("Attribute ongroupshow does not work correctly").until(new EventFiredCondition(new Event("groupshow"))); @@ -206,7 +207,7 @@ selenium.waitForPageToLoad(); selenium.mouseOver(fileMenuLabel); - selenium.mouseOut(fileMenuLabel); + selenium.getEval(new JavaScript("window.jQuery('" + fileMenuLabel.getRawLocator() + "').mouseleave()")); waitGui.failWith("Attribute onhide does not work correctly").until(new EventFiredCondition(new Event("hide"))); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java 2011-03-07 06:44:44 UTC (rev 22067) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java 2011-03-07 12:09:27 UTC (rev 22068) @@ -32,6 +32,7 @@ import java.net.URL; import org.jboss.test.selenium.dom.Event; +import org.jboss.test.selenium.encapsulated.JavaScript; import org.jboss.test.selenium.locator.Attribute; import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.JQueryLocator; @@ -82,7 +83,7 @@ assertFalse(selenium.isVisible(menuItem41), "Menu item \"Save\" should not be visible on the page."); assertFalse(selenium.isDisplayed(groupList), "Submenu should not be expanded."); - guardNoRequest(selenium).mouseOver(group); + guardNoRequest(selenium).getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseenter()")); assertTrue(selenium.isDisplayed(groupList), "Submenu should be expanded."); assertTrue(selenium.isElementPresent(menuItem41), "Menu item \"Save\" should be present on the page."); @@ -196,9 +197,9 @@ selenium.mouseOver(fileMenuLabel); waitGui.failWith("Menu was not open.").until(isDisplayed.locator(fileMenuList)); - selenium.mouseOver(group); + selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseenter()")); waitGui.failWith("Submenu was not open").until(isDisplayed.locator(groupList)); - selenium.mouseOut(group); + selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseleave()")); waitGui.failWith("Attribute onhide does not work correctly").until(new EventFiredCondition(new Event("hide"))); } @@ -250,7 +251,7 @@ selenium.mouseOver(fileMenuLabel); waitGui.failWith("Menu was not open.").until(isDisplayed.locator(fileMenuList)); - selenium.mouseOver(group); + selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseenter()")); waitGui.failWith("Submenu was not open").until(isDisplayed.locator(groupList)); waitGui.failWith("Attribute onhide does not work correctly").until(new EventFiredCondition(new Event("show")));