[richfaces-svn-commits] JBoss Rich Faces SVN: r11831 - in trunk/ui/core/src/test: resources/org/ajax4jsf/component and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue Dec 16 12:31:53 EST 2008
Author: nbelaevski
Date: 2008-12-16 12:31:52 -0500 (Tue, 16 Dec 2008)
New Revision: 11831
Added:
trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll-drop.xhtml
Modified:
trunk/ui/core/src/test/java/org/ajax4jsf/component/QueuedPollTest.java
trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll.xhtml
trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js
Log:
https://jira.jboss.org/jira/browse/RF-5375
Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueuedPollTest.java
===================================================================
--- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueuedPollTest.java 2008-12-16 17:30:45 UTC (rev 11830)
+++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueuedPollTest.java 2008-12-16 17:31:52 UTC (rev 11831)
@@ -52,7 +52,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 600, 1600, false);
+ checkRequestData(dataList.get(0), "firstForm:queuedDefaultPoll", 600, 1600, false);
}
public void testQueuedPollRequestDelay() throws Exception {
@@ -63,7 +63,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 300, 1300, false);
+ checkRequestData(dataList.get(0), "firstForm:queuedDelayedPoll", 300, 1300, false);
}
public void testDelayedQueueDefaultPollRequestDelay() throws Exception {
@@ -74,7 +74,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 1500, 2500, false);
+ checkRequestData(dataList.get(0), "secondForm:delayedQueueDefaultPoll", 1500, 2500, false);
}
public void testDelayedQueuePollRequestDelay() throws Exception {
@@ -85,7 +85,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 2400, 3400, false);
+ checkRequestData(dataList.get(0), "secondForm:delayedQueueDelayedPoll", 2400, 3400, false);
}
public void testUnqueuedDefaultPollRequestDelay() throws Exception {
@@ -96,7 +96,7 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 700, 1700, false);
+ checkRequestData(dataList.get(0), "thirdForm:unqueuedDefaultPoll", 700, 1700, false);
}
public void testunQueuedPollRequestDelay() throws Exception {
@@ -107,6 +107,65 @@
List<RequestData> dataList = result.getDataList();
assertEquals(1, dataList.size());
- checkRequestData(dataList.get(0), null, 950, 1950, false);
+ checkRequestData(dataList.get(0), "thirdForm:unqueuedDelayedPoll", 950, 1950, false);
}
+
+ public void testDropNextDroppedPoll() throws Exception {
+ setFlag("renderDropNext");
+ renderView("/queue-poll-drop.xhtml");
+
+ ParametersBuilder parametersBuilder = createAjaxParameters().eventsQueue("dropNextQueue").
+ requestDelay(0);
+
+ ajax(0, "a", parametersBuilder.similarityGroupingId(1).requestTime(3000));
+
+ //poll has 2000 interval, so ajax request at 2100 will make queue drop it from list
+ ajax(2500, "b", parametersBuilder.similarityGroupingId(2).requestTime(500));
+
+ TestsResult result = getTestsResult();
+ List<RequestData> dataList = result.getDataList();
+ assertEquals(3, dataList.size());
+
+ checkRequestData(dataList.get(0), "a", 0, 3000, false);
+ checkRequestData(dataList.get(1), "b", 3000, 3500, false);
+
+ //poll has been kicked from queue at 2500, requeued in 2000
+ checkRequestData(dataList.get(2), "firstForm:poll", 2500 + 2000, 2500 + 2000 + 1000 /* default request time */,
+ false);
+ }
+
+ public void testDropNextDroppedPollSingle() throws Exception {
+ setFlag("renderDropNextSingle");
+ renderView("/queue-poll-drop.xhtml");
+
+ ajax(0, "a", createAjaxParameters().requestTime(3000).requestDelay(0).eventsQueue("dropNextQueueSingle"));
+
+ TestsResult result = getTestsResult();
+ List<RequestData> dataList = result.getDataList();
+ assertEquals(2, dataList.size());
+
+ checkRequestData(dataList.get(0), "a", 0, 3000, false);
+ checkRequestData(dataList.get(1), "thirdForm:poll", 4000, 5000, false);
+ }
+
+ public void testDropNewDroppedPoll() throws Exception {
+ setFlag("renderDropNew");
+ renderView("/queue-poll-drop.xhtml");
+
+ ParametersBuilder parametersBuilder = createAjaxParameters().eventsQueue("dropNewQueue").
+ requestDelay(0);
+
+ ajax(0, "a", parametersBuilder.similarityGroupingId(1).requestTime(3000));
+
+ //poll has 2500 interval, so ajax request at 2000 will make queue drop it from the list
+ ajax(2000, "b", parametersBuilder.similarityGroupingId(2).requestTime(500));
+
+ TestsResult result = getTestsResult();
+ List<RequestData> dataList = result.getDataList();
+ assertEquals(3, dataList.size());
+
+ checkRequestData(dataList.get(0), "a", 0, 3000, false);
+ checkRequestData(dataList.get(1), "b", 3000, 3500, false);
+ checkRequestData(dataList.get(2), "secondForm:poll", 5000, 6000, false);
+ }
}
Added: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll-drop.xhtml
===================================================================
--- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll-drop.xhtml (rev 0)
+++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll-drop.xhtml 2008-12-16 17:31:52 UTC (rev 11831)
@@ -0,0 +1,26 @@
+<html
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+ <body>
+ <f:view>
+ <a4j:queue size="2" name="dropNextQueue" sizeExceededBehavior="dropNext" />
+ <a4j:queue size="2" name="dropNewQueue" sizeExceededBehavior="dropNew" />
+ <a4j:queue size="1" name="dropNextQueueSingle" sizeExceededBehavior="dropNext" />
+
+ <h:form id="firstForm" rendered="#{renderDropNext}">
+ <a4j:poll interval="2000" id="poll" eventsQueue="dropNextQueue" />
+ </h:form>
+
+ <h:form id="secondForm" rendered="#{renderDropNew}">
+ <a4j:poll interval="2500" id="poll" eventsQueue="dropNewQueue" />
+ </h:form>
+
+ <h:form id="thirdForm" rendered="#{renderDropNextSingle}">
+ <a4j:poll interval="2000" id="poll" eventsQueue="dropNextQueueSingle" />
+ </h:form>
+
+ </f:view>
+ </body>
+</html>
Modified: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll.xhtml
===================================================================
--- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll.xhtml 2008-12-16 17:30:45 UTC (rev 11830)
+++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-poll.xhtml 2008-12-16 17:31:52 UTC (rev 11831)
@@ -6,21 +6,21 @@
<body>
<f:view>
- <h:form>
+ <h:form id="firstForm">
<a4j:queue />
<a4j:poll id="queuedDefaultPoll" enabled="#{queuedDefaultPollEnabled}" interval="600" />
<a4j:poll id="queuedDelayedPoll" enabled="#{queuedDelayedPollEnabled}" interval="200" requestDelay="100" />
</h:form>
- <h:form>
+ <h:form id="secondForm">
<a4j:queue requestDelay="10000" />
<a4j:poll id="delayedQueueDefaultPoll" enabled="#{delayedQueueDefaultPollEnabled}" interval="1500" />
<a4j:poll id="delayedQueueDelayedPoll" enabled="#{delayedQueueDelayedPollEnabled}" interval="2000" requestDelay="400" />
</h:form>
- <h:form>
+ <h:form id="thirdForm">
<a4j:poll id="unqueuedDefaultPoll" enabled="#{unqueuedDefaultPollEnabled}" interval="700" />
<a4j:poll id="unqueuedDelayedPoll" enabled="#{unqueuedDelayedPollEnabled}" interval="900" requestDelay="50" />
</h:form>
Modified: trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js
===================================================================
--- trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js 2008-12-16 17:30:45 UTC (rev 11830)
+++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/simulation.js 2008-12-16 17:31:52 UTC (rev 11831)
@@ -203,7 +203,7 @@
}
XMLHttpRequest.requestTime = options.requestTime || defaultRequestTime || DEFAULT_REQUEST_TIME;
- XMLHttpRequest.data = options.data || (event && event.srcElement.id);
+ XMLHttpRequest.data = options.data || (event && event.srcElement.id) || options.pollId;
try {
var req = oldSubmitQuery.apply(this, arguments);
More information about the richfaces-svn-commits
mailing list