From richfaces-svn-commits at lists.jboss.org Mon Sep 5 04:51:54 2011 Content-Type: multipart/mixed; boundary="===============8255009048716504097==" 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: r22683 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: attributes and 1 other directory. Date: Mon, 05 Sep 2011 04:51:54 -0400 Message-ID: <201109050851.p858psnj029746@svn01.web.mwc.hst.phx2.redhat.com> --===============8255009048716504097== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: jjamrich Date: 2011-09-05 04:51:54 -0400 (Mon, 05 Sep 2011) New Revision: 22683 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes= ts/metamer/ftest/a4jRepeat/RepeatAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes= ts/metamer/ftest/a4jRepeat/TestSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes= ts/metamer/ftest/attributes/AttributeList.java Log: RFPL-1439: update a4j:repeat tests to use unified way to setting attributes Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa= ces/tests/metamer/ftest/a4jRepeat/RepeatAttributes.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/a4jRepeat/RepeatAttributes.java 2011-09-05 08:51:24 UTC (= rev 22682) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/a4jRepeat/RepeatAttributes.java 2011-09-05 08:51:54 UTC (= rev 22683) @@ -21,32 +21,16 @@ *************************************************************************= ******/ package org.richfaces.tests.metamer.ftest.a4jRepeat; = -import org.jboss.test.selenium.locator.JQueryLocator; -import org.jboss.test.selenium.locator.ExtendedLocator; -import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes; +import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum; = /** * @author Lukas Fryc * @version $Revision$ */ -public class RepeatAttributes extends AbstractComponentAttributes { +public enum RepeatAttributes implements AttributeEnum { = - public RepeatAttributes() { - } + first, + rendered, + rows = - public RepeatAttributes(ExtendedLocator root) { - super(root); - } - - public void setFirst(int first) { - setProperty("first", first); - } - - public void setRendered(String rendered) { - setProperty("rendered", rendered); - } - - public void setRows(int rows) { - setProperty("rows", rows); - } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa= ces/tests/metamer/ftest/a4jRepeat/TestSimple.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/a4jRepeat/TestSimple.java 2011-09-05 08:51:24 UTC (rev 22= 682) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/a4jRepeat/TestSimple.java 2011-09-05 08:51:54 UTC (rev 22= 683) @@ -25,6 +25,7 @@ import static java.lang.Math.min; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.r= epeatAttributes; = import java.net.URL; = @@ -44,7 +45,6 @@ protected static final int ELEMENTS_TOTAL =3D 20; = SimpleModel model; - RepeatAttributes attributes =3D new RepeatAttributes(); = @Inject @Use(empty =3D false) @@ -68,16 +68,16 @@ model =3D new SimpleModel(); = if (first !=3D null) { - attributes.setFirst(first); + repeatAttributes.set(RepeatAttributes.first, first); } if (rows !=3D null) { - attributes.setRows(rows); + repeatAttributes.set(RepeatAttributes.rows, rows); } } = @Test public void testRenderedAttribute() { - attributes.setRendered("false"); + repeatAttributes.set(RepeatAttributes.rendered, "false"); assertEquals(model.isRendered(), false); } = 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-05 08:51:24 UTC (re= v 22682) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te= sts/metamer/ftest/attributes/AttributeList.java 2011-09-05 08:51:54 UTC (re= v 22683) @@ -3,6 +3,7 @@ import org.richfaces.tests.metamer.ftest.a4jAttachQueue.AttachQueueAttribu= tes; import org.richfaces.tests.metamer.ftest.a4jPoll.PollAttributes; import org.richfaces.tests.metamer.ftest.a4jQueue.QueueAttributes; +import org.richfaces.tests.metamer.ftest.a4jRepeat.RepeatAttributes; import org.richfaces.tests.metamer.ftest.richTooltip.TooltipAttributes; = import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq; @@ -13,5 +14,6 @@ public static Attributes attachQueueAttrs2 =3D = new Attributes(pjq("table.attributes[id$=3Dattribute= s2]")); public static Attributes queueAttributes =3D new Attr= ibutes(pjq("table.attributes[id$=3DqueueAttributes]")); public static Attributes pollAttributes =3D new Attrib= utes(); + public static Attributes repeatAttributes =3D new At= tributes(); = } --===============8255009048716504097==--