Author: jjamrich
Date: 2011-09-05 04:50:31 -0400 (Mon, 05 Sep 2011)
New Revision: 22680
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestAttachQueueNamed.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/a4jQueue/QueueAttributes.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java
Log:
RFPL-1439: update tests for a4j:queue to use unified way to setting attributes
This change affects attachQueue as well since in this example is another queue (with 2
attached queues). Created one static instance in AttributesList with constructor, in case
when need instance without contructor (with default locator) is instance created within
class which needs it.
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestAttachQueueNamed.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestAttachQueueNamed.java 2011-09-05
08:49:53 UTC (rev 22679)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestAttachQueueNamed.java 2011-09-05
08:50:31 UTC (rev 22680)
@@ -22,11 +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.a4jQueue.QueueAttributes.requestDelay;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.queueAttributes;
import java.net.URL;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
-import org.richfaces.tests.metamer.ftest.a4jQueue.QueueAttributes;
import org.richfaces.tests.metamer.ftest.a4jQueue.QueueModel;
import org.richfaces.tests.metamer.ftest.a4jQueue.QueueModel.Input;
import org.testng.annotations.Test;
@@ -40,7 +41,6 @@
private static final Long DELAY = 5000L;
QueueModel queue = new QueueModel();
- QueueAttributes queueAttributes = new
QueueAttributes(pjq("table.attributes[id$=queueAttributes]"));
@Override
public URL getTestUrl() {
@@ -52,7 +52,7 @@
*/
@Test
public void testNameReferencing() {
- queueAttributes.setRequestDelay(DELAY);
+ queueAttributes.set(requestDelay, DELAY);
queue.initializeTimes();
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:53 UTC (rev 22679)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java 2011-09-05
08:50:31 UTC (rev 22680)
@@ -25,9 +25,9 @@
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.richfaces.tests.metamer.ftest.attributes.AttributeList.queueAttributes;
import static org.testng.Assert.assertFalse;
import java.net.URL;
@@ -53,8 +53,6 @@
QueueModel queue = new QueueModel();
- QueueAttributes attributesQueue1 = new
QueueAttributes(pjq("table.attributes[id$=queueAttributes]"));
-
@Override
public URL getTestUrl() {
return buildUrl(contextPath,
"faces/components/a4jAttachQueue/nested.xhtml");
@@ -62,9 +60,9 @@
@BeforeMethod
public void setupDelays() {
- attachQueueAttrs1.set(requestDelay, DELAY_A);
- attachQueueAttrs2.set(requestDelay, DELAY_B);
- attributesQueue1.setRequestDelay(GLOBAL_DELAY);
+ attachQueueAttrs1.set(AttachQueueAttributes.requestDelay, DELAY_A);
+ attachQueueAttrs2.set(AttachQueueAttributes.requestDelay, DELAY_B);
+ queueAttributes.set(QueueAttributes.requestDelay, GLOBAL_DELAY);
}
@Test
@@ -78,7 +76,7 @@
@Test
public void testNoDelay() {
- attachQueueAttrs1.set(requestDelay, 0);
+ attachQueueAttrs1.set(AttachQueueAttributes.requestDelay, 0);
queue.initializeCounts();
@@ -120,7 +118,7 @@
@Test
public void testRendered() {
- attachQueueAttrs1.set(requestDelay, 1500);
+ attachQueueAttrs1.set(AttachQueueAttributes.requestDelay, 1500);
attachQueueAttrs1.set(onrequestqueue,
JavaScript.js("alert('requestQueued')"));
attachQueueAttrs1.set(onrequestdequeue,
JavaScript.js("alert('requestDequeued')"));
attachQueueAttrs1.set(rendered, false);
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueAttributes.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueAttributes.java 2011-09-05
08:49:53 UTC (rev 22679)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueAttributes.java 2011-09-05
08:50:31 UTC (rev 22680)
@@ -21,70 +21,25 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.a4jQueue;
-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 QueueAttributes extends AbstractComponentAttributes {
+public enum QueueAttributes implements AttributeEnum {
+
+ ignoreDupResponses,
+ name,
+ onbeforedomupdate,
+ oncomplete,
+ onerror,
+ onevent,
+ onrequestdequeue,
+ onrequestqueue,
+ onsubmit,
+ rendered,
+ requestDelay,
+ timeout
- public QueueAttributes() {
- }
-
- public QueueAttributes(ExtendedLocator<JQueryLocator> root) {
- super(root);
- }
-
- public void setIgnoreDupResponses(boolean ignoreDupResponses) {
- setProperty("ignoreDupResponses", ignoreDupResponses);
- }
-
- public void setName(String name) {
- setProperty("name", name);
- }
-
- public void setOnBeforeDomUpdate(JavaScript onBeforeDomUpdate) {
- setProperty("onbeforedomupdate", onBeforeDomUpdate);
- }
-
- public void setOnComplete(JavaScript onComplete) {
- setProperty("oncomplete", onComplete);
- }
-
- public void setOnEvent(JavaScript onEvent) {
- setProperty("onevent", onEvent);
- }
-
- public void setOnError(JavaScript onError) {
- setProperty("onerror", onError);
- }
-
- public void setOnRequestDequeue(JavaScript onRequestDequeue) {
- setProperty("onrequestdequeue", onRequestDequeue);
- }
-
- public void setOnRequestQueue(JavaScript onRequestQueue) {
- setProperty("onrequestqueue", onRequestQueue);
- }
-
- public void setOnSubmit(JavaScript onSubmit) {
- setProperty("onsubmit", onSubmit);
- }
-
- public void setRendered(boolean rendered) {
- setProperty("rendered", rendered);
- }
-
- public void setRequestDelay(long requestDelay) {
- setProperty("requestDelay", requestDelay);
- }
-
- public void setTimeout(long timeout) {
- setProperty("timeout", timeout);
- }
-
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java 2011-09-05
08:49:53 UTC (rev 22679)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java 2011-09-05
08:50:31 UTC (rev 22680)
@@ -30,6 +30,7 @@
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.a4jQueue.QueueModel.Input;
import org.richfaces.tests.metamer.ftest.annotations.Templates;
+import org.richfaces.tests.metamer.ftest.attributes.Attributes;
import org.testng.annotations.Test;
/**
@@ -48,16 +49,16 @@
QueueModel queueB = prepareLocators("formQueue2");
QueueModel globalQueue = prepareLocators("globalQueue");
- QueueAttributes attributesQueueA = prepareAttributes("formQueue1");
- QueueAttributes attributesQueueB = prepareAttributes("formQueue2");
- QueueAttributes attributesGlobalQueue = prepareAttributes("globalQueue");
+ Attributes<QueueAttributes> attributesQueueA =
prepareAttributes("formQueue1");
+ Attributes<QueueAttributes> attributesQueueB =
prepareAttributes("formQueue2");
+ Attributes<QueueAttributes> attributesGlobalQueue =
prepareAttributes("globalQueue");
private static QueueModel prepareLocators(String identifier) {
return new
QueueModel(pjq("div.rf-p[id$={0}Panel]").format(identifier));
}
- private static QueueAttributes prepareAttributes(String identifier) {
- return new
QueueAttributes(pjq("div.rf-p[id$={0}AttributesPanel]").format(identifier));
+ private static Attributes<QueueAttributes> prepareAttributes(String identifier)
{
+ return new
Attributes<QueueAttributes>(pjq("div.rf-p[id$={0}AttributesPanel]").format(identifier));
}
@Override
@@ -80,8 +81,8 @@
*/
@Test
public void testTimingOneQueueTwoEvents() {
- attributesQueueA.setRequestDelay(DELAY_A);
- attributesGlobalQueue.setRequestDelay(GLOBAL_DELAY);
+ attributesQueueA.set(QueueAttributes.requestDelay, DELAY_A);
+ attributesGlobalQueue.set(QueueAttributes.requestDelay, GLOBAL_DELAY);
queueA.initializeTimes();
@@ -113,8 +114,8 @@
*/
@Test
public void testCountsOneQueueTwoEvents() {
- attributesQueueA.setRequestDelay(DELAY_A);
- attributesGlobalQueue.setRequestDelay(GLOBAL_DELAY);
+ attributesQueueA.set(QueueAttributes.requestDelay, DELAY_A);
+ attributesGlobalQueue.set(QueueAttributes.requestDelay, GLOBAL_DELAY);
queueA.initializeCounts();
@@ -151,9 +152,9 @@
*/
@Test
public void testTimingTwoQueuesFourEvents() {
- attributesQueueA.setRequestDelay(DELAY_A);
- attributesQueueB.setRequestDelay(DELAY_B);
- attributesGlobalQueue.setRequestDelay(GLOBAL_DELAY);
+ attributesQueueA.set(QueueAttributes.requestDelay, DELAY_A);
+ attributesQueueB.set(QueueAttributes.requestDelay, DELAY_B);
+ attributesGlobalQueue.set(QueueAttributes.requestDelay, GLOBAL_DELAY);
queueA.initializeTimes();
queueB.initializeTimes();
@@ -196,9 +197,9 @@
*/
@Test
public void testCountsTwoQueuesThreeEvents() {
- attributesQueueA.setRequestDelay(DELAY_A);
- attributesQueueB.setRequestDelay(DELAY_B);
- attributesGlobalQueue.setRequestDelay(GLOBAL_DELAY);
+ attributesQueueA.set(QueueAttributes.requestDelay, DELAY_A);
+ attributesQueueB.set(QueueAttributes.requestDelay, DELAY_B);
+ attributesGlobalQueue.set(QueueAttributes.requestDelay, GLOBAL_DELAY);
queueA.initializeCounts();
queueB.initializeCounts();
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java 2011-09-05
08:49:53 UTC (rev 22679)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java 2011-09-05
08:50:31 UTC (rev 22680)
@@ -23,6 +23,7 @@
import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.testng.Assert.assertEquals;
+import static org.richfaces.tests.metamer.ftest.a4jQueue.QueueAttributes.*;
import com.thoughtworks.selenium.SeleniumException;
@@ -35,6 +36,7 @@
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.richfaces.tests.metamer.ftest.annotations.RegressionTest;
import org.richfaces.tests.metamer.ftest.annotations.Use;
+import org.richfaces.tests.metamer.ftest.attributes.Attributes;
import org.testng.annotations.Test;
/**
@@ -44,7 +46,7 @@
public class TestGlobalQueue extends AbstractMetamerTest {
QueueModel queue = new QueueModel();
- QueueAttributes attributes = new QueueAttributes();
+ Attributes<QueueAttributes> attributes = new
Attributes<QueueAttributes>();
@Inject
@Use(empty = false)
@@ -61,7 +63,7 @@
@Test
@Use(field = "requestDelay", ints = { 0, 500, 1500, 5000 })
public void testRequestDelay() {
- attributes.setRequestDelay(requestDelay);
+ attributes.set(QueueAttributes.requestDelay, requestDelay);
queue.initializeTimes();
@@ -78,7 +80,7 @@
*/
@Test
public void testMultipleRequestsWithDelay() {
- attributes.setRequestDelay(3000);
+ attributes.set(QueueAttributes.requestDelay, 3000);
queue.initializeCounts();
@@ -113,7 +115,7 @@
@Test
@RegressionTest("https://issues.jboss.org/browse/RFPL-1194")
public void testMultipleRequestsWithNoDelay() {
- attributes.setRequestDelay(0);
+ attributes.set(QueueAttributes.requestDelay, 0);
queue.initializeCounts();
@@ -160,8 +162,8 @@
@Test
@IssueTracking("https://issues.jboss.org/browse/RF-9328")
public void testRendered() {
- attributes.setRequestDelay(1500);
- attributes.setRendered(false);
+ attributes.set(QueueAttributes.requestDelay, 1500);
+ attributes.set(rendered, false);
queue.initializeTimes();
queue.fireEvent(1);
@@ -173,8 +175,8 @@
// TODO not implemented yet
public void testTimeout() {
- attributes.setRequestDelay(0);
- attributes.setTimeout(1000);
+ attributes.set(QueueAttributes.requestDelay, 0);
+ attributes.set(timeout, 1000);
XHRHalter.enable();
@@ -191,7 +193,7 @@
@Test
public void testIgnoreDuplicatedResponsesFalse() {
- attributes.setIgnoreDupResponses(false);
+ attributes.set(ignoreDupResponses, false);
XHRHalter.enable();
queue.type("a");
@@ -211,7 +213,7 @@
@Test
public void testIgnoreDuplicatedResponsesTrue() {
- attributes.setIgnoreDupResponses(true);
+ attributes.set(ignoreDupResponses, true);
XHRHalter.enable();
queue.type("c");
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:53 UTC (rev 22679)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-05
08:50:31 UTC (rev 22680)
@@ -1,6 +1,7 @@
package org.richfaces.tests.metamer.ftest.attributes;
import org.richfaces.tests.metamer.ftest.a4jAttachQueue.AttachQueueAttributes;
+import org.richfaces.tests.metamer.ftest.a4jQueue.QueueAttributes;
import org.richfaces.tests.metamer.ftest.richTooltip.TooltipAttributes;
import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq;
@@ -9,4 +10,6 @@
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]"));
+ public static Attributes<QueueAttributes> queueAttributes = new
Attributes<QueueAttributes>(pjq("table.attributes[id$=queueAttributes]"));
+
}