From richfaces-svn-commits at lists.jboss.org Mon Oct 6 07:41:40 2008 Content-Type: multipart/mixed; boundary="===============3756160862410695658==" 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: r10668 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces and 1 other directory. Date: Mon, 06 Oct 2008 07:41:40 -0400 Message-ID: --===============3756160862410695658== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: andrei_exadel Date: 2008-10-06 07:41:40 -0400 (Mon, 06 Oct 2008) New Revision: 10668 Added: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfac= es/SeleniumEvent.java Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4js= f/autotest/AutoTestContext.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4js= f/autotest/AutoTestServlet.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfac= es/SeleniumTestBase.java Log: AutoTest refactoring Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/= ajax4jsf/autotest/AutoTestContext.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 --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4j= sf/autotest/AutoTestContext.java 2008-10-03 19:09:01 UTC (rev 10667) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4j= sf/autotest/AutoTestContext.java 2008-10-06 11:41:40 UTC (rev 10668) @@ -1,7 +1,9 @@ package org.ajax4jsf.autotest; = import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; = public class AutoTestContext { = @@ -9,6 +11,8 @@ = List events =3D new ArrayList(); = + Map attributes =3D new HashMap(); + = String rendered; = public AutoTestContext(String component) { @@ -18,6 +22,10 @@ public void addEvent(String ev) { events.add(ev); } + = + public void addAttribute(String name, String value) { + attributes.put(name, value); + } = /** * @return the component @@ -32,6 +40,10 @@ public List getEvents() { return events; } + = + public Map getAttributes() { + return attributes; + } = /** * @return the rendered Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/= ajax4jsf/autotest/AutoTestServlet.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 --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4j= sf/autotest/AutoTestServlet.java 2008-10-03 19:09:01 UTC (rev 10667) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4j= sf/autotest/AutoTestServlet.java 2008-10-06 11:41:40 UTC (rev 10668) @@ -25,6 +25,10 @@ = private static final String EVENT_PARAMETER_NAME =3D "ev"; = + private static final String ATTRIBUTE_PARAMETER_NAME =3D "at_name"; + = + private static final String ATTRIBUTE_PARAMETER_VALUE =3D "at_value"; + = private static final String CONTEXT_NAME =3D "SeleniumAutoTestContext"; = String header =3D ""); writer.write(""); = @@ -65,12 +74,19 @@ throws ServletException, IOException { String component =3D req.getParameter(COMPONENT_PARAMETER_NAME); String [] events =3D req.getParameterValues(EVENT_PARAMETER_NAME); + String [] attributes_name =3D req.getParameterValues(ATTRIBUTE_PARAMETER= _NAME); + String [] attributes_value =3D req.getParameterValues(ATTRIBUTE_PARAMETE= R_VALUE); = + = AutoTestContext context =3D new AutoTestContext(component); for (String event: events) { context.addEvent(event); } = + for (int i =3D 0; i < attributes_name.length; i++) { + context.addAttribute(attributes_name[i], attributes_value[i]); + } + = getServletContext().setAttribute(CONTEXT_NAME, context); = resp.sendRedirect("/richfaces/faces/NEKO/pages/_autotest/autotest.xhtml"= ); Added: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/ric= hfaces/SeleniumEvent.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 --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfa= ces/SeleniumEvent.java (rev 0) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfa= ces/SeleniumEvent.java 2008-10-06 11:41:40 UTC (rev 10668) @@ -0,0 +1,27 @@ +package org.richfaces; + +public enum SeleniumEvent { + = + ONCLICK("onclick"), + ONDBCLICK("ondbclick"), + ONMOUSEOVER("onmouseover"), + ONMOUSEMOVE("onmousemove"), + ONMOUSEOUT("onmouseout"), + ONMOUSEDOWN("onmousedown"), + ONMOUSEUP("onmouseup"), + ONDRAGANDDROP("ondraganddrop"), + ONKEYDOWN("onkeydown"), + ONKEYUP("onkeyup"), + ONKEYPRESS("onkeypress"); + = + private String name; + = + private SeleniumEvent(String name) { + this.name =3D name; + } + = + public String getName() { + return name; + } + +} Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/= richfaces/SeleniumTestBase.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 --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfa= ces/SeleniumTestBase.java 2008-10-03 19:09:01 UTC (rev 10667) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfa= ces/SeleniumTestBase.java 2008-10-06 11:41:40 UTC (rev 10668) @@ -23,10 +23,12 @@ = import java.util.ArrayList; import java.util.List; +import java.util.Map; = import org.ajax4jsf.bean.Configurator; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.template.Template; +import org.apache.tools.ant.types.FilterSet.OnMissing; import org.openqa.selenium.server.RemoteControlConfiguration; import org.openqa.selenium.server.SeleniumServer; import org.testng.Assert; @@ -982,16 +984,29 @@ } } = - public void autoTest(Template template, String component, List= events) { + public void autoTest(Template template, String component, List events, Map attributes) { selenium.open(protocol + "://" + host + ":" + port + "/" + APPLICATIO= N_NAME + filterPrefix + "/pages/_autotest/autotestsetup.xhtml"); waitForPageToLoad(); = runScript("setComponent('"+component+"');", false); = - for (String ev : events) { - runScript("addEvent('"+ev+"');", false); + List assertevent =3D new ArrayList(); + = + for (SeleniumEvent ev : events) { + if (ev !=3D SeleniumEvent.ONDRAGANDDROP) { + runScript("addEvent('"+ev.getName()+"');", false); + assertevent.add(ev.getName()); + }else { + runScript("addEvent('ondrag');addEvent('ondrop');", false); + assertevent.add("ondrag"); + assertevent.add("ondrop"); + } } = + for (String attr : attributes.keySet()) { + runScript("addAttribute('"+attr+"', '"+attributes.get(attr)+"');", f= alse); + } + = runScript("submitForm();", false); waitForPageToLoad(); = @@ -999,13 +1014,31 @@ waitForPageToLoad(); = String id =3D template.getPrefix() + "test"; - for (String ev : events) { - if ("onclick".equals(ev)) { + for (SeleniumEvent ev : events) { + if (ev =3D=3D SeleniumEvent.ONCLICK) { clickById(id); + }else if (ev =3D=3D SeleniumEvent.ONDBCLICK) { + selenium.doubleClick(id); + } else if (ev =3D=3D SeleniumEvent.ONMOUSEDOWN) { + selenium.mouseDown(id); + }else if (ev =3D=3D SeleniumEvent.ONMOUSEMOVE) { + selenium.mouseMove(id); + }else if (ev =3D=3D SeleniumEvent.ONMOUSEUP) { + selenium.mouseUp(id); + }else if (ev =3D=3D SeleniumEvent.ONMOUSEOVER) { + selenium.mouseOver(id); + }else if (ev =3D=3D SeleniumEvent.ONMOUSEOUT) { + selenium.mouseOut(id); + }else if (ev =3D=3D SeleniumEvent.ONKEYDOWN) { + selenium.keyDown(id, "a"); + }else if (ev =3D=3D SeleniumEvent.ONKEYUP) { + selenium.keyUp(id, "a"); + }else if (ev =3D=3D SeleniumEvent.ONKEYPRESS) { + selenium.keyPress(id, "a"); } = } = - assertEvents(events); + assertEvents(assertevent); } } --===============3756160862410695658==--