Author: jjamrich Date: 2011-09-23 09:26:09 -0400 (Fri, 23 Sep 2011) New Revision: 22743 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/richDropTarget/DropTargetAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java Log: RFPL-1439: Update DropTargetAttributes 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:25:44 UTC (rev 22742) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-23 13:26:09 UTC (rev 22743) @@ -18,6 +18,7 @@ import org.richfaces.tests.metamer.ftest.richDataScroller.DataScrollerAttributes; import org.richfaces.tests.metamer.ftest.richDragIndicator.DragIndicatorAttributes; import org.richfaces.tests.metamer.ftest.richDragSource.DragSourceAttributes; +import org.richfaces.tests.metamer.ftest.richDropTarget.DropTargetAttributes; import org.richfaces.tests.metamer.ftest.richTooltip.TooltipAttributes; public class AttributeList { @@ -40,5 +41,6 @@ public static Attributes<DataScrollerAttributes> dataScrollerAttributes = new Attributes<DataScrollerAttributes>(); public static Attributes<DragIndicatorAttributes> dragIndicatorAttributes = new Attributes<DragIndicatorAttributes>(); public static Attributes<DragSourceAttributes> dragSourceAttributes = new Attributes<DragSourceAttributes>(); + public static Attributes<DropTargetAttributes> dropTargetAttributes = new Attributes<DropTargetAttributes>(); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/DropTargetAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/DropTargetAttributes.java 2011-09-23 13:25:44 UTC (rev 22742) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/DropTargetAttributes.java 2011-09-23 13:26:09 UTC (rev 22743) @@ -21,46 +21,22 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.richDropTarget; -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> * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a> */ -public class DropTargetAttributes extends AbstractComponentAttributes { - public void setAcceptedTypes(String acceptedTypes) { - setProperty("acceptedTypes", acceptedTypes); - } +public enum DropTargetAttributes implements AttributeEnum { - public void setBypassUpdates(Boolean bypassUpdates) { - setProperty("bypassUpdates", bypassUpdates); - } - - public void setExecute(String execute) { - setProperty("execute", execute); - } - - public void setImmediate(Boolean immediate) { - setProperty("immediate", immediate); - } - - public void setOnbeforedomupdate(String onbeforedomupdate) { - setProperty("onbeforedomupdate", onbeforedomupdate); - } - - public void setOnbegin(String onbegin) { - setProperty("onbegin", onbegin); - } - - public void setOncomplete(String oncomplete) { - setProperty("oncomplete", oncomplete); - } - - public void setRender(String render) { - setProperty("render", render); - } - - public void setRendered(Boolean rendered) { - setProperty("rendered", rendered); - } + acceptedTypes, + bypassUpdates, + execute, + immediate, + onbeforedomupdate, + onbegin, + oncomplete, + render, + rendered + } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java 2011-09-23 13:25:44 UTC (rev 22742) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java 2011-09-23 13:26:09 UTC (rev 22743) @@ -36,6 +36,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.dropTargetAttributes; +import static org.richfaces.tests.metamer.ftest.richDropTarget.DropTargetAttributes.*; import java.net.URL; @@ -66,8 +68,6 @@ JQueryLocator dragValue = jq("span[id$=:dragValue]"); JQueryLocator dropValue = jq("span[id$=:dropValue]"); - private DropTargetAttributes attributes = new DropTargetAttributes(); - @Override public URL getTestUrl() { return buildUrl(contextPath, "faces/components/richDropTarget/simple.xhtml"); @@ -75,13 +75,13 @@ @Test public void testAcceptedTypes() { - attributes.setAcceptedTypes("drg2"); + dropTargetAttributes.set(acceptedTypes, "drg2"); testAcception(drg1, REJECTING); testAcception(drg2, ACCEPTING); testAcception(drg3, REJECTING); - attributes.setAcceptedTypes("drg1, drg3"); + dropTargetAttributes.set(acceptedTypes, "drg1, drg3"); testAcception(drg1, ACCEPTING); testAcception(drg2, REJECTING); @@ -90,7 +90,7 @@ @Test public void testRender() { - attributes.setRender("droppable1 droppable2 renderChecker"); + dropTargetAttributes.set(render, "droppable1 droppable2 renderChecker"); testAcception(drg1, ACCEPTING); @@ -103,7 +103,7 @@ @Test public void testRendered() { - attributes.setRendered(false); + dropTargetAttributes.set(rendered, false); selenium.getPageExtensions().install(); selenium.getRequestInterceptor().clearRequestTypeDone(); @@ -149,7 +149,7 @@ @Test public void testExecute() { - attributes.setExecute("executeChecker"); + dropTargetAttributes.set(execute, "executeChecker"); testAcception(drg1, ACCEPTING); guardedDrop(RequestType.XHR); @@ -162,7 +162,7 @@ @Test @RegressionTest("https://issues.jboss.org/browse/RF-10535") public void testImmediate() { - attributes.setImmediate(true); + dropTargetAttributes.set(immediate, true); testAcception(drg1, ACCEPTING); guardedDrop(RequestType.XHR); @@ -182,7 +182,7 @@ @Test @RegressionTest("https://issues.jboss.org/browse/RF-10535") public void testBypassUpdates() { - attributes.setBypassUpdates(true); + dropTargetAttributes.set(bypassUpdates, true); testAcception(drg1, ACCEPTING); guardedDrop(RequestType.XHR); @@ -193,9 +193,9 @@ @Test public void testEvents() { - attributes.setOnbeforedomupdate("metamerEvents += \"beforedomupdate \""); - attributes.setOnbegin("metamerEvents += \"begin \""); - attributes.setOncomplete("metamerEvents += \"complete \""); + dropTargetAttributes.set(onbeforedomupdate, "metamerEvents += \"beforedomupdate \""); + dropTargetAttributes.set(onbegin, "metamerEvents += \"begin \""); + dropTargetAttributes.set(oncomplete, "metamerEvents += \"complete \""); selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); testAcception(drg1, ACCEPTING);