Author: jjamrich
Date: 2011-09-05 04:49:53 -0400 (Mon, 05 Sep 2011)
New Revision: 22679
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/AttachQueueAttributes.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java
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/Attributes.java
Log:
RFPL-1439: update tests for AttachedQueue to use unified way to setting attributes
Tests for AttachedQueue don't completelly use new - unified way to setting attributes,
because there is third queue used, which is not changed yet. This changes are related only
to class managing access to atttributes in AttachedQueue example in Metamer (mean
AttachedQueue tests package)
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/AttachQueueAttributes.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/AttachQueueAttributes.java 2011-09-05
08:49:19 UTC (rev 22678)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/AttachQueueAttributes.java 2011-09-05
08:49:53 UTC (rev 22679)
@@ -21,57 +21,19 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.a4jAttachQueue;
-import org.jboss.test.selenium.encapsulated.JavaScript;
-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 <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-public class AttachQueueAttributes extends AbstractComponentAttributes {
-
- public AttachQueueAttributes() {
- }
-
- public AttachQueueAttributes(ExtendedLocator<JQueryLocator> root) {
- super(root);
- }
-
- public void setIgnoreDupResponses(boolean ignoreDupResponses) {
- setProperty("ignoreDupResponses", ignoreDupResponses);
- }
-
- public void setName(String name) {
- setProperty("name", name);
- }
-
- public void setOnRequestDequeue(JavaScript onRequestDequeue) {
- setProperty("onrequestdequeue", onRequestDequeue);
- }
-
- public void setOnRequestQueue(JavaScript onRequestQueue) {
- setProperty("onrequestqueue", onRequestQueue);
- }
-
- public void setQueueId(String queueId) {
- setProperty("queueId", queueId);
- }
-
- public void setRendered(boolean rendered) {
- setProperty("rendered", rendered);
- }
-
- public void setRequestDelay(long requestDelay) {
- setProperty("requestDelay", requestDelay);
- }
-
- public void setRequestGroupingId(String requestGroupingId) {
- setProperty("rquestGroupingId", requestGroupingId);
- }
-
- public void setTimeout(long timeout) {
- setProperty("timeout", timeout);
- }
+public enum AttachQueueAttributes implements AttributeEnum {
+
+ ignoreDupResponses,
+ name,
+ onrequestdequeue,
+ onrequestqueue,
+ rendered,
+ requestDelay,
+ requestGroupingId
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java 2011-09-05
08:49:19 UTC (rev 22678)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java 2011-09-05
08:49:53 UTC (rev 22679)
@@ -22,6 +22,12 @@
package org.richfaces.tests.metamer.ftest.a4jAttachQueue;
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static
org.richfaces.tests.metamer.ftest.a4jAttachQueue.AttachQueueAttributes.onrequestdequeue;
+import static
org.richfaces.tests.metamer.ftest.a4jAttachQueue.AttachQueueAttributes.onrequestqueue;
+import static
org.richfaces.tests.metamer.ftest.a4jAttachQueue.AttachQueueAttributes.rendered;
+import static
org.richfaces.tests.metamer.ftest.a4jAttachQueue.AttachQueueAttributes.requestDelay;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.attachQueueAttrs1;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.attachQueueAttrs2;
import static org.testng.Assert.assertFalse;
import java.net.URL;
@@ -46,9 +52,7 @@
static final Long DELAY_B = 5000L;
QueueModel queue = new QueueModel();
-
- AttachQueueAttributes attributesAttachQueue1 = new
AttachQueueAttributes(pjq("table.attributes[id$=attributes1]"));
- AttachQueueAttributes attributesAttachQueue2 = new
AttachQueueAttributes(pjq("table.attributes[id$=attributes2]"));
+
QueueAttributes attributesQueue1 = new
QueueAttributes(pjq("table.attributes[id$=queueAttributes]"));
@Override
@@ -58,8 +62,8 @@
@BeforeMethod
public void setupDelays() {
- attributesAttachQueue1.setRequestDelay(DELAY_A);
- attributesAttachQueue2.setRequestDelay(DELAY_B);
+ attachQueueAttrs1.set(requestDelay, DELAY_A);
+ attachQueueAttrs2.set(requestDelay, DELAY_B);
attributesQueue1.setRequestDelay(GLOBAL_DELAY);
}
@@ -74,7 +78,7 @@
@Test
public void testNoDelay() {
- attributesAttachQueue1.setRequestDelay(0);
+ attachQueueAttrs1.set(requestDelay, 0);
queue.initializeCounts();
@@ -116,10 +120,10 @@
@Test
public void testRendered() {
- attributesAttachQueue1.setRequestDelay(1500);
-
attributesAttachQueue1.setOnRequestQueue(JavaScript.js("alert('requestQueued')"));
-
attributesAttachQueue1.setOnRequestDequeue(JavaScript.js("alert('requestDequeued')"));
- attributesAttachQueue1.setRendered(false);
+ attachQueueAttrs1.set(requestDelay, 1500);
+ attachQueueAttrs1.set(onrequestqueue,
JavaScript.js("alert('requestQueued')"));
+ attachQueueAttrs1.set(onrequestdequeue,
JavaScript.js("alert('requestDequeued')"));
+ attachQueueAttrs1.set(rendered, false);
queue.initializeTimes();
queue.fireEvent(1);
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-05
08:49:19 UTC (rev 22678)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-05
08:49:53 UTC (rev 22679)
@@ -1,7 +1,12 @@
package org.richfaces.tests.metamer.ftest.attributes;
+import org.richfaces.tests.metamer.ftest.a4jAttachQueue.AttachQueueAttributes;
import org.richfaces.tests.metamer.ftest.richTooltip.TooltipAttributes;
+import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq;
+
public class AttributeList {
public static Attributes<TooltipAttributes> tooltipAttributes = new
Attributes<TooltipAttributes>();
+ public static Attributes<AttachQueueAttributes> attachQueueAttrs1 = new
Attributes<AttachQueueAttributes>(pjq("table.attributes[id$=attributes1]"));
+ public static Attributes<AttachQueueAttributes> attachQueueAttrs2 = new
Attributes<AttachQueueAttributes>(pjq("table.attributes[id$=attributes2]"));
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/Attributes.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/Attributes.java 2011-09-05
08:49:19 UTC (rev 22678)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/Attributes.java 2011-09-05
08:49:53 UTC (rev 22679)
@@ -6,6 +6,7 @@
import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq;
import org.jboss.test.selenium.dom.Event;
+import org.jboss.test.selenium.encapsulated.JavaScript;
import org.jboss.test.selenium.framework.AjaxSelenium;
import org.jboss.test.selenium.framework.AjaxSeleniumProxy;
import org.jboss.test.selenium.interception.CommandContext;
@@ -34,19 +35,34 @@
RequestType requestType = RequestType.HTTP;
+ /**
+ * Ctor for create Attributes instance with different root locator
+ * @param <LT> - ExtentedLocator type definition
+ * @param root - ExtendedLocator
+ */
+ public <LT extends ExtendedLocator<JQueryLocator>> Attributes(LT root) {
+ this.root.setLocator(root);
+ }
+
+ public Attributes() { }
+
public void set(T attribute, String string) {
setProperty(attribute.toString(), string);
}
// TODO jjamrich 2011-09-02: make sure that this resolve to correct string
representation of number given as attr
- public void set(T attribute, Integer integer) {
- setProperty(attribute.toString(), integer);
+ public void set(T attribute, Number no) {
+ setProperty(attribute.toString(), no);
}
public void set(T attribute, Boolean bool) {
setProperty(attribute.toString(), bool);
}
+ public void set(T attribute, JavaScript js) {
+ setProperty(attribute.toString(), js);
+ }
+
public void set(T attribute, Enum<?> item) {
setProperty(attribute.toString(), item.toString());
}
@@ -147,5 +163,14 @@
public void setRequestType(RequestType requestType) {
this.requestType = requestType;
}
+
+ public ExtendedLocator<JQueryLocator> getRoot() {
+ return root.getLocator();
+ }
+ public void setRoot(ExtendedLocator<JQueryLocator> root) {
+ this.root.setLocator(root);
+ }
+
+
}