Author: nbelaevski Date: 2008-11-19 12:46:41 -0500 (Wed, 19 Nov 2008) New Revision: 11251 Added: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml Removed: trunk/ui/core/src/test/java/org/ajax4jsf/component/ScriptTest.java trunk/ui/core/src/test/resources/org/ajax4jsf/component/script.xhtml Log: Queue test resources refactored Copied: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java (from rev 11246, trunk/ui/core/src/test/java/org/ajax4jsf/component/ScriptTest.java) =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java (rev 0) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java 2008-11-19 17:46:41 UTC (rev 11251) @@ -0,0 +1,111 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + +package org.ajax4jsf.component; + +import java.util.List; + +/** + * @author Denis Morozov + * @author Nick Belaevski + */ +public class QueueScriptedTest extends AbstractQueueComponentTest { + + private static final String QUEUE_NAME = "testQueue"; + + private static final String VIEW_NAME = "/queue-scripted.xhtml"; + + public QueueScriptedTest(String name) { + super(name); + } + + public void testSimpleAjax() throws Exception { + renderView(VIEW_NAME); + + delay(50); + ajax("a", createAjaxParameters().requestTime(100)); + ajax("b", createAjaxParameters().requestTime(150)); + + TestsResult result = getTestsResult(); + List<RequestData> dataList = result.getDataList(); + assertEquals(2, dataList.size()); + assertRequestData(dataList.get(0), "a", 50, 150, false); + assertRequestData(dataList.get(1), "b", 50, 200, false); + + assertEquals(200d, result.getCurrentTime()); + } + + public void testSimpleQueuedAjax() throws Exception { + renderView(VIEW_NAME); + + delay(50); + ParametersBuilder queueParameters = createAjaxParameters().requestTime(500).eventsQueue(QUEUE_NAME); + ajax("a", queueParameters.requestId(0)); + delay(200); + ajax("b", queueParameters.requestId(1)); + + TestsResult result = getTestsResult(); + List<RequestData> dataList = result.getDataList(); + assertEquals(2, dataList.size()); + assertRequestData(dataList.get(0), "a", 50, 550, false); + assertRequestData(dataList.get(1), "b", 550, 1050, false); + + assertEquals(1050d, result.getCurrentTime()); + } + + public void testScript() throws Exception { + renderView(VIEW_NAME); + + delay(500); + ajax("a", "{requestDelay: 100, requestId: '12', requestTime: 100, eventsQueue: 'q'}"); + delay(4100); + ajax("b", "{requestDelay: 4400, requestId: '12', requestTime: 101, timeout: 10, eventsQueue: 'q'}"); + ajax("c", "{requestDelay: 0, requestId: '123', requestTime: 1, timeout: 10, eventsQueue: 'q'}"); + + System.out.println(getTestsResult()); + } + + public void testImplicitQueue() throws Exception { + renderView(VIEW_NAME); + + ParametersBuilder parameters = createAjaxParameters(). + requestDelay(100). + implicitEventsQueue("myqueue"). + requestTime(10); + + ajax("a", parameters); + delay(10); + ajax("b", parameters); + delay(10); + ajax("c", parameters.requestDelay(50)); + + TestsResult result = getTestsResult(); + List<RequestData> dataList = result.getDataList(); + assertEquals(1, dataList.size()); + + RequestData requestData = dataList.get(0); + assertRequestData(requestData, "c", 70, 80, false); + + assertEquals(80d, result.getCurrentTime()); + + } +} Property changes on: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueScriptedTest.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/ui/core/src/test/java/org/ajax4jsf/component/ScriptTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/ScriptTest.java 2008-11-19 17:45:32 UTC (rev 11250) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/ScriptTest.java 2008-11-19 17:46:41 UTC (rev 11251) @@ -1,111 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -package org.ajax4jsf.component; - -import java.util.List; - -/** - * @author Denis Morozov - * @author Nick Belaevski - */ -public class ScriptTest extends AbstractQueueComponentTest { - - private static final String QUEUE_NAME = "testQueue"; - - private static final String VIEW_NAME = "/script.xhtml"; - - public ScriptTest(String name) { - super(name); - } - - public void testSimpleAjax() throws Exception { - renderView(VIEW_NAME); - - delay(50); - ajax("a", createAjaxParameters().requestTime(100)); - ajax("b", createAjaxParameters().requestTime(150)); - - TestsResult result = getTestsResult(); - List<RequestData> dataList = result.getDataList(); - assertEquals(2, dataList.size()); - assertRequestData(dataList.get(0), "a", 50, 150, false); - assertRequestData(dataList.get(1), "b", 50, 200, false); - - assertEquals(200d, result.getCurrentTime()); - } - - public void testSimpleQueuedAjax() throws Exception { - renderView(VIEW_NAME); - - delay(50); - ParametersBuilder queueParameters = createAjaxParameters().requestTime(500).eventsQueue(QUEUE_NAME); - ajax("a", queueParameters.requestId(0)); - delay(200); - ajax("b", queueParameters.requestId(1)); - - TestsResult result = getTestsResult(); - List<RequestData> dataList = result.getDataList(); - assertEquals(2, dataList.size()); - assertRequestData(dataList.get(0), "a", 50, 550, false); - assertRequestData(dataList.get(1), "b", 550, 1050, false); - - assertEquals(1050d, result.getCurrentTime()); - } - - public void testScript() throws Exception { - renderView(VIEW_NAME); - - delay(500); - ajax("a", "{requestDelay: 100, requestId: '12', requestTime: 100, eventsQueue: 'q'}"); - delay(4100); - ajax("b", "{requestDelay: 4400, requestId: '12', requestTime: 101, timeout: 10, eventsQueue: 'q'}"); - ajax("c", "{requestDelay: 0, requestId: '123', requestTime: 1, timeout: 10, eventsQueue: 'q'}"); - - System.out.println(getTestsResult()); - } - - public void testImplicitQueue() throws Exception { - renderView(VIEW_NAME); - - ParametersBuilder parameters = createAjaxParameters(). - requestDelay(100). - implicitEventsQueue("myqueue"). - requestTime(10); - - ajax("a", parameters); - delay(10); - ajax("b", parameters); - delay(10); - ajax("c", parameters.requestDelay(50)); - - TestsResult result = getTestsResult(); - List<RequestData> dataList = result.getDataList(); - assertEquals(1, dataList.size()); - - RequestData requestData = dataList.get(0); - assertRequestData(requestData, "c", 70, 80, false); - - assertEquals(80d, result.getCurrentTime()); - - } -} Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/script.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml 2008-11-19 17:46:41 UTC (rev 11251) @@ -0,0 +1,18 @@ +<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" + xmlns:c="http://java.sun.com/jstl/core"> + <head> + <title></title> + </head> + <body> + <f:view> + <a4j:status startText="...running..." stopText="stopped" startStyle="color: green" /> + + <a4j:queue size="2" sizeExceededBehavior="fireNext" name="testQueue" /> + + </f:view> + </body> +</html> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-scripted.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/script.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/script.xhtml 2008-11-19 17:45:32 UTC (rev 11250) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/script.xhtml 2008-11-19 17:46:41 UTC (rev 11251) @@ -1,18 +0,0 @@ -<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" - xmlns:c="http://java.sun.com/jstl/core"> - <head> - <title></title> - </head> - <body> - <f:view> - <a4j:status startText="...running..." stopText="stopped" startStyle="color: green" /> - - <a4j:queue size="2" sizeExceededBehavior="fireNext" name="testQueue" /> - - </f:view> - </body> -</html>