Author: jjamrich Date: 2011-09-23 09:24:56 -0400 (Fri, 23 Sep 2011) New Revision: 22740 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java Log: RFPL-1439: Update DataScrollerAttributes to use unified way to setting attributes Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-23 13:24:32 UTC (rev 22739) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-23 13:24:56 UTC (rev 22740) @@ -15,6 +15,7 @@ import org.richfaces.tests.metamer.ftest.richCollapsibleSubTableToggler.CollapsibleSubTableTogglerAttributes; import org.richfaces.tests.metamer.ftest.richColumn.ColumnAttributes; import org.richfaces.tests.metamer.ftest.richComponentControl.ComponentControlAttributes; +import org.richfaces.tests.metamer.ftest.richDataScroller.DataScrollerAttributes; import org.richfaces.tests.metamer.ftest.richTooltip.TooltipAttributes; public class AttributeList { @@ -34,5 +35,6 @@ new Attributes<CollapsibleSubTableTogglerAttributes>(); public static Attributes<ColumnAttributes> columnAttributes = new Attributes<ColumnAttributes>(); public static Attributes<ComponentControlAttributes> componentControllAttributes = new Attributes<ComponentControlAttributes>(); + public static Attributes<DataScrollerAttributes> dataScrollerAttributes = new Attributes<DataScrollerAttributes>(); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java 2011-09-23 13:24:32 UTC (rev 22739) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java 2011-09-23 13:24:56 UTC (rev 22740) @@ -24,6 +24,7 @@ import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.dataScrollerAttributes; import java.net.URL; @@ -54,8 +55,6 @@ DataScroller dataScroller; DataScroller dataScroller1 = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE; DataScroller dataScroller2 = PaginationTester.DATA_SCROLLER_IN_TABLE_FOOTER; - - DataScrollerAttributes attributes = new DataScrollerAttributes(); PaginationTester paginationTester = new PaginationTester() { @@ -82,8 +81,8 @@ @BeforeMethod public void prepareComponent() { - attributes.setFastStep(fastStep); - attributes.setMaxPages(maxPages); + dataScrollerAttributes.set(DataScrollerAttributes.fastStep, fastStep); + dataScrollerAttributes.set(DataScrollerAttributes.maxPages, maxPages); paginationTester.setDataScroller(dataScroller); dataScroller.setFastStep(fastStep); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java 2011-09-23 13:24:32 UTC (rev 22739) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java 2011-09-23 13:24:56 UTC (rev 22740) @@ -21,18 +21,15 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.richDataScroller; -import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes; +import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum; /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public class DataScrollerAttributes extends AbstractComponentAttributes { - public void setFastStep(Integer fastStep) { - setProperty("fastStep", fastStep); - } - - public void setMaxPages(Integer maxPages) { - setProperty("maxPages", maxPages); - } +public enum DataScrollerAttributes implements AttributeEnum { + + fastStep, + maxPages + }