Author: dsvyatobatsko Date: 2009-01-29 12:24:46 -0500 (Thu, 29 Jan 2009) New Revision: 12500 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java Log: Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-29 17:24:09 UTC (rev 12499) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-29 17:24:46 UTC (rev 12500) @@ -1291,31 +1291,31 @@ } } - public Object assertEvents(String id, List<SeleniumEvent> eventsExpected) { + public Object assertEvents(String locator, List<SeleniumEvent> eventsExpected) { for (SeleniumEvent ev : eventsExpected) { if (ev == SeleniumEvent.ONCLICK) { - selenium.click(id); + selenium.click(locator); }else if (ev == SeleniumEvent.ONDBLCLICK) { - selenium.doubleClick(id); + selenium.doubleClick(locator); } else if (ev == SeleniumEvent.ONMOUSEDOWN) { - selenium.mouseDown(id); + selenium.mouseDown(locator); }else if (ev == SeleniumEvent.ONMOUSEMOVE) { - selenium.mouseMove(id); + selenium.mouseMove(locator); }else if (ev == SeleniumEvent.ONMOUSEUP) { - selenium.mouseUp(id); + selenium.mouseUp(locator); }else if (ev == SeleniumEvent.ONMOUSEOVER) { - selenium.mouseOver(id); + selenium.mouseOver(locator); }else if (ev == SeleniumEvent.ONMOUSEOUT) { - selenium.mouseOut(id); + selenium.mouseOut(locator); }else if (ev == SeleniumEvent.ONKEYDOWN) { - selenium.keyDown(id, "a"); + selenium.keyDown(locator, "a"); }else if (ev == SeleniumEvent.ONKEYUP) { - selenium.keyUp(id, "a"); + selenium.keyUp(locator, "a"); }else if (ev == SeleniumEvent.ONKEYPRESS) { - selenium.keyPress(id, "a"); + selenium.keyPress(locator, "a"); }else if (ev == SeleniumEvent.ONFOCUS) { - selenium.focus(id); + selenium.focus(locator); } }