From richfaces-svn-commits at lists.jboss.org Fri Sep 23 09:24:32 2011 Content-Type: multipart/mixed; boundary="===============5805282965292559657==" 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: r22739 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richComponentControl and 1 other directory. Date: Fri, 23 Sep 2011 09:24:32 -0400 Message-ID: <201109231324.p8NDOWWS028599@svn01.web.mwc.hst.phx2.redhat.com> --===============5805282965292559657== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: jjamrich Date: 2011-09-23 09:24:32 -0400 (Fri, 23 Sep 2011) New Revision: 22739 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes= ts/metamer/ftest/attributes/AttributeList.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes= ts/metamer/ftest/richComponentControl/ComponentControlAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes= ts/metamer/ftest/richComponentControl/ComponentControlDataScroller.java Log: RFPL-1439: Update ComponentControllAttributes to use unified way to setting= attributes Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa= ces/tests/metamer/ftest/attributes/AttributeList.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/attributes/AttributeList.java 2011-09-23 13:24:06 UTC (re= v 22738) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/attributes/AttributeList.java 2011-09-23 13:24:32 UTC (re= v 22739) @@ -14,6 +14,7 @@ import org.richfaces.tests.metamer.ftest.richAutocomplete.AutocompleteAttr= ibutes; import org.richfaces.tests.metamer.ftest.richCollapsibleSubTableToggler.Co= llapsibleSubTableTogglerAttributes; import org.richfaces.tests.metamer.ftest.richColumn.ColumnAttributes; +import org.richfaces.tests.metamer.ftest.richComponentControl.ComponentCon= trolAttributes; import org.richfaces.tests.metamer.ftest.richTooltip.TooltipAttributes; = public class AttributeList { @@ -32,5 +33,6 @@ public static Attributes collaps= ibleSubTableTogglerAttributes =3D = new Attributes(); public static Attributes columnAttributes =3D new At= tributes(); + public static Attributes componentControll= Attributes =3D new Attributes(); = } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa= ces/tests/metamer/ftest/richComponentControl/ComponentControlAttributes.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/richComponentControl/ComponentControlAttributes.java 2011= -09-23 13:24:06 UTC (rev 22738) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/richComponentControl/ComponentControlAttributes.java 2011= -09-23 13:24:32 UTC (rev 22739) @@ -21,22 +21,16 @@ *************************************************************************= ******/ package org.richfaces.tests.metamer.ftest.richComponentControl; = -import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes; +import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum; = /** * @author Lukas Fryc * @version $Revision$ */ -public class ComponentControlAttributes extends AbstractComponentAttribute= s { - public void setOperation(String operation) { - setProperty("operation", operation); - } +public enum ComponentControlAttributes implements AttributeEnum { = - public void setSelector(String selector) { - setProperty("selector", selector); - } + operation, + selector, + target = - public void setTarget(String target) { - setProperty("target", target); - } } = Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa= ces/tests/metamer/ftest/richComponentControl/ComponentControlDataScroller.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/richComponentControl/ComponentControlDataScroller.java 20= 11-09-23 13:24:06 UTC (rev 22738) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/richComponentControl/ComponentControlDataScroller.java 20= 11-09-23 13:24:32 UTC (rev 22739) @@ -24,6 +24,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactor= y.guardXhr; import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.testng.Assert.assertEquals; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.c= omponentControllAttributes; = import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.model.AssertingDataScroller; @@ -36,8 +37,6 @@ = JQueryLocator button =3D jq(":submit[id$=3Dbutton]"); = - ComponentControlAttributes attributes =3D new ComponentControlAttribut= es(); - public ComponentControlDataScroller() { super(jq("span.rf-ds[id$=3Dscroller]")); } @@ -63,7 +62,7 @@ } = private void doOperation(String operation) { - attributes.setOperation(operation); + componentControllAttributes.set(ComponentControlAttributes.operati= on, operation); guardXhr(selenium).click(button); } = --===============5805282965292559657==--