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/tests/metamer/ftest/attributes/AttributeList.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/ComponentControlAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/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/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:06 UTC (rev 22738) +++ 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) @@ -14,6 +14,7 @@ import org.richfaces.tests.metamer.ftest.richAutocomplete.AutocompleteAttributes; 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.richTooltip.TooltipAttributes; public class AttributeList { @@ -32,5 +33,6 @@ public static Attributes<CollapsibleSubTableTogglerAttributes> collapsibleSubTableTogglerAttributes = new Attributes<CollapsibleSubTableTogglerAttributes>(); public static Attributes<ColumnAttributes> columnAttributes = new Attributes<ColumnAttributes>(); + public static Attributes<ComponentControlAttributes> componentControllAttributes = new Attributes<ComponentControlAttributes>(); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/ComponentControlAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/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/tests/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 <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -public class ComponentControlAttributes extends AbstractComponentAttributes { - 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/richfaces/tests/metamer/ftest/richComponentControl/ComponentControlDataScroller.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/ComponentControlDataScroller.java 2011-09-23 13:24:06 UTC (rev 22738) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/ComponentControlDataScroller.java 2011-09-23 13:24:32 UTC (rev 22739) @@ -24,6 +24,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.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.componentControllAttributes; import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.model.AssertingDataScroller; @@ -36,8 +37,6 @@ JQueryLocator button = jq(":submit[id$=button]"); - ComponentControlAttributes attributes = new ComponentControlAttributes(); - public ComponentControlDataScroller() { super(jq("span.rf-ds[id$=scroller]")); } @@ -63,7 +62,7 @@ } private void doOperation(String operation) { - attributes.setOperation(operation); + componentControllAttributes.set(ComponentControlAttributes.operation, operation); guardXhr(selenium).click(button); }