Author: nbelaevski Date: 2009-01-23 18:44:08 -0500 (Fri, 23 Jan 2009) New Revision: 12414 Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/AbstractQueueComponentTest.java trunk/ui/core/src/test/java/org/ajax4jsf/component/ImplicitQueuesTest.java trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-size.xhtml Log: https://jira.jboss.org/jira/browse/RF-5788 Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/AbstractQueueComponentTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/AbstractQueueComponentTest.java 2009-01-23 23:42:05 UTC (rev 12413) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/AbstractQueueComponentTest.java 2009-01-23 23:44:08 UTC (rev 12414) @@ -46,7 +46,6 @@ import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.renderkit.UserResourceRenderer2; import org.ajax4jsf.renderkit.RendererUtils.HTML; -import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.resource.ResourceNotFoundException; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/ImplicitQueuesTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/ImplicitQueuesTest.java 2009-01-23 23:42:05 UTC (rev 12413) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/ImplicitQueuesTest.java 2009-01-23 23:44:08 UTC (rev 12414) @@ -83,24 +83,33 @@ clickOnTime(0, "form:buttonIgnoreDupResponces"); clickOnTime(500, "form:buttonIgnoreDupResponces"); - clickOnTime(750, "form:buttonIgnoreDupResponces"); executeTimer(); TestsResult result = getTestsResult(); List<RequestData> dataList = result.getDataList(); - assertEquals(3, dataList.size()); + + //RF-5788 + //assertEquals(3, dataList.size()); + assertEquals(2, dataList.size()); //request time set to 5000 in .xhtml file checkRequestData(dataList.get(0), "form:buttonIgnoreDupResponces", 0, 5000, false); - checkRequestData(dataList.get(1), "form:buttonIgnoreDupResponces", 500, 5500, false); - checkRequestData(dataList.get(2), "form:buttonIgnoreDupResponces", 750, 5750, false); + checkRequestData(dataList.get(1), "form:buttonIgnoreDupResponces", 5000, 10000, false); + + //RF-5788 + //checkRequestData(dataList.get(2), "form:buttonIgnoreDupResponces", 750, 5750, false); - assertEquals(5750d, result.getCurrentTime()); + //RF-5788 + //assertEquals(5750d, result.getCurrentTime()); + assertEquals(10000d, result.getCurrentTime()); Double requestsCompletedCounter = (Double) executeJavaScript("counter"); assertEquals(1d, requestsCompletedCounter); Double requestsCompletionTime = (Double) executeJavaScript("time"); - assertEquals(5750d, requestsCompletionTime); + + //RF-5788 + //assertEquals(5750d, requestsCompletionTime); + assertEquals(10000d, requestsCompletionTime); } } Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java 2009-01-23 23:42:05 UTC (rev 12413) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java 2009-01-23 23:44:08 UTC (rev 12414) @@ -114,8 +114,8 @@ ajax(0, "a", parametersBuilder.similarityGroupingId("a")); ajax(500, "b", parametersBuilder.similarityGroupingId("a")); - ajax(2000, "c", parametersBuilder.similarityGroupingId("a")); - ajax(2500, "d", parametersBuilder.similarityGroupingId("a").ignoreDupResponses(false)); + ajax(2500, "c", parametersBuilder.similarityGroupingId("a")); + ajax(3000, "d", parametersBuilder.similarityGroupingId("a").ignoreDupResponses(false)); TestsResult result = getTestsResult(); List<RequestData> dataList = result.getDataList(); @@ -123,18 +123,18 @@ assertEquals(4, dataList.size()); checkRequestData(dataList.get(0), "a", 0, 1000, false); - checkRequestData(dataList.get(1), "b", 500, 1500, false); + checkRequestData(dataList.get(1), "b", 1000, 2000, false); - checkRequestData(dataList.get(2), "c", 2000, 3000, false); - checkRequestData(dataList.get(3), "d", 3000, 4000, false); + checkRequestData(dataList.get(2), "c", 2500, 3500, false); + checkRequestData(dataList.get(3), "d", 3500, 4500, false); NativeArray array = (NativeArray) executeJavaScript("queueIgnoreDupResponsesTest"); long length = array.getLength(); assertEquals(3, length); - assertEquals("b:1500", (String) array.get(0, array)); - assertEquals("c:3000", (String) array.get(1, array)); - assertEquals("d:4000", (String) array.get(2, array)); + assertEquals("b:2000", (String) array.get(0, array)); + assertEquals("c:3500", (String) array.get(1, array)); + assertEquals("d:4500", (String) array.get(2, array)); } public void testIgnoreDupResponsesDefault() throws Exception { @@ -154,9 +154,26 @@ checkRequestData(dataList.get(0), "a", 0, 500, false); checkRequestData(dataList.get(1), "b", 500, 1000, false); - checkRequestData(dataList.get(2), "c", 750, 1250, false); + checkRequestData(dataList.get(2), "c", 1000, 1500, false); } + public void testIgnoreDupResponsesTimeout() throws Exception { + renderView(VIEW_NAME); + + ParametersBuilder parametersBuilder = createAjaxParameters(). + eventsQueue("queueTimeout").ignoreDupResponses(true).requestDelay(0).requestTime(1000); + + ajax(0, "a", parametersBuilder.timeout(500)); + ajax(100, "b", parametersBuilder); + + TestsResult result = getTestsResult(); + List<RequestData> dataList = result.getDataList(); + + assertEquals(2, dataList.size()); + checkRequestData(dataList.get(0), "a", 0, 500, true); + checkRequestData(dataList.get(1), "b", 500, 1500, false); + } + public void testSimpleAjax() throws Exception { renderView(VIEW_NAME); @@ -210,4 +227,31 @@ assertEquals(80d, result.getCurrentTime()); } + + public void testStatusIgnoreDupResponses() throws Exception { + renderView(VIEW_NAME); + + ParametersBuilder parameters = createAjaxParameters().requestDelay(0).eventsQueue("queueIgnoreDupResponses"); + + ajax(0, "a", parameters); + ajax(100, "b", parameters); + + TestsResult result = getTestsResult(); + List<RequestData> dataList = result.getDataList(); + assertEquals(2, dataList.size()); + + checkRequestData(dataList.get(0), "a", 0, DEFAULT_REQUEST_TIME, false); + checkRequestData(dataList.get(1), "b", DEFAULT_REQUEST_TIME, 2 * DEFAULT_REQUEST_TIME, false); + + NativeArray array = (NativeArray) executeJavaScript("window.statusData"); + assertEquals(2, array.getLength()); + + NativeArray nestedArray = (NativeArray) array.get(0, array); + assertEquals(Double.valueOf(0), nestedArray.get(0, nestedArray)); + assertEquals(Double.valueOf(DEFAULT_REQUEST_TIME), nestedArray.get(1, nestedArray)); + + nestedArray = (NativeArray) array.get(1, array); + assertEquals(Double.valueOf(DEFAULT_REQUEST_TIME), nestedArray.get(0, nestedArray)); + assertEquals(Double.valueOf(2 * DEFAULT_REQUEST_TIME), nestedArray.get(1, nestedArray)); + } } Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java 2009-01-23 23:42:05 UTC (rev 12413) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java 2009-01-23 23:44:08 UTC (rev 12414) @@ -398,4 +398,25 @@ Double secondEventTime = (Double) secondHandlerData.get("_time", secondHandlerData); assertEquals(3d, secondEventTime); } + + public void testSingleSizedQueueIgnoreDupResponses() throws Exception { + renderView("/queue-size.xhtml"); + + ParametersBuilder parametersBuilder = createAjaxParameters().eventsQueue("singleSizedDefaultQueue"). + requestDelay(0); + + ajax(0, "a", parametersBuilder); + ajax(500, "b", parametersBuilder); + + TestsResult result = getTestsResult(); + List<RequestData> list = result.getDataList(); + assertEquals(1, list.size()); + + checkRequestData(list.get(0), "a", 0, DEFAULT_REQUEST_TIME, false); + + NativeArray handlersData = (NativeArray) executeJavaScript("defaultSingleSizedQueueResults"); + assertEquals(1, handlersData.getLength()); + + assertEquals("a", handlersData.get(0, handlersData)); + } } Modified: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml 2009-01-23 23:42:05 UTC (rev 12413) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml 2009-01-23 23:44:08 UTC (rev 12414) @@ -11,6 +11,9 @@ <f:view> <a4j:status startText="...running..." stopText="stopped" startStyle="color: green" /> + <a4j:status id="queueStatus" forceId="true" onstart="window.startStatusTime = Timer.currentTime;" + onstop="statusData.push([window.startStatusTime, Timer.currentTime]); window.startStatusTime = undefined;" /> + <a4j:queue name="queueDefaults" /> <a4j:queue name="queueRequestDelay" requestDelay="15" /> @@ -18,13 +21,15 @@ <a4j:queue name="queueTimeout" timeout="5000" /> <script type="text/javascript"> - window.queueIgnoreDupResponsesTest = new Array(); + //LOG.LEVEL = LOG.ALL; + window.queueIgnoreDupResponsesTest = new Array(); + window.statusData = new Array(); </script> - <a4j:queue name="queueIgnoreDupResponses" ignoreDupResponses="true" oncomplete="queueIgnoreDupResponsesTest.push(data + ':' + Timer.currentTime)" /> + <a4j:queue status="queueStatus" name="queueIgnoreDupResponses" ignoreDupResponses="true" oncomplete="queueIgnoreDupResponsesTest.push(data + ':' + Timer.currentTime)" /> <a4j:queue name="testQueue" /> - + </f:view> </body> </html> Modified: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-size.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-size.xhtml 2009-01-23 23:42:05 UTC (rev 12413) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-size.xhtml 2009-01-23 23:44:08 UTC (rev 12414) @@ -38,6 +38,8 @@ defaultExceededQueueResults.push({queue: queue, query: query, options: options, event: event, _time: Timer.currentTime}); } + + defaultSingleSizedQueueResults = new Array(); </script> <a4j:queue onsizeexceeded="addEventData(this, query, options, event)" size="2" name="defaultExceededQueue" /> @@ -47,6 +49,8 @@ <a4j:commandButton id="button2" eventsQueue="defaultExceededQueue" value="button" /> <a4j:commandButton id="button3" eventsQueue="defaultExceededQueue" value="button" /> </h:form> + + <a4j:queue name="singleSizedDefaultQueue" size="1" ignoreDupResponses="true" oncomplete="defaultSingleSizedQueueResults.push(data)" /> </f:view> </body> </html>