Author: nbelaevski Date: 2008-11-19 12:45:32 -0500 (Wed, 19 Nov 2008) New Revision: 11250 Added: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-size.xhtml Removed: trunk/ui/core/src/test/resources/org/ajax4jsf/component/ajax-form.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/disabled.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/discovery-base.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-both.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-form.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-view.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/implicit-global-queue.xhtml trunk/ui/core/src/test/resources/org/ajax4jsf/component/legacy.xhtml Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/AjaxFormQueuesTest.java trunk/ui/core/src/test/java/org/ajax4jsf/component/ImplicitQueuesTest.java trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueDiscoveryTest.java Log: Queue test resources refactored Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/AjaxFormQueuesTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/AjaxFormQueuesTest.java 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/AjaxFormQueuesTest.java 2008-11-19 17:45:32 UTC (rev 11250) @@ -39,7 +39,7 @@ } protected void checkForm(String formName) throws Exception { - renderView("/ajax-form.xhtml"); + renderView("/queue-ajax-form.xhtml"); executeJavaScript("$('" + formName + ":link').click()"); executeTimer(); Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/ImplicitQueuesTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/ImplicitQueuesTest.java 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/ImplicitQueuesTest.java 2008-11-19 17:45:32 UTC (rev 11250) @@ -61,7 +61,7 @@ } public void testLegacyQueuesRequestDelay() throws Exception { - renderView("/legacy.xhtml"); + renderView("/queue-legacy.xhtml"); executeAfterDelay("$('form:buttonDelayed').click()"); delay(500); @@ -81,7 +81,7 @@ } public void testLegacyQueuesIgnoreDupResponces() throws Exception { - renderView("/legacy.xhtml"); + renderView("/queue-legacy.xhtml"); executeAfterDelay("$('form:buttonIgnoreDupResponces').click()"); delay(500); Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueDiscoveryTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueDiscoveryTest.java 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueDiscoveryTest.java 2008-11-19 17:45:32 UTC (rev 11250) @@ -67,7 +67,7 @@ } public void testGlobalViewQueue() throws Exception { - renderView("/global-view.xhtml"); + renderView("/queue-global-view.xhtml"); List<String> list = new ArrayList<String>(); assertListsEqual(list, getResults(page)); @@ -95,7 +95,7 @@ } public void testGlobalFormQueue() throws Exception { - renderView("/global-form.xhtml"); + renderView("/queue-global-form.xhtml"); List<String> list = new ArrayList<String>(); assertListsEqual(list, getResults(page)); @@ -136,7 +136,7 @@ } public void testGlobalFormBoth() throws Exception { - renderView("/global-both.xhtml"); + renderView("/queue-global-both.xhtml"); List<String> list = new ArrayList<String>(); assertListsEqual(list, getResults(page)); @@ -175,7 +175,7 @@ } public void testDisabled() throws Exception { - renderView("/disabled.xhtml"); + renderView("/queue-disabled.xhtml"); List<String> list = new ArrayList<String>(); assertListsEqual(list, getResults(page)); Added: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java (rev 0) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueSizeTest.java 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,37 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * 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; + +/** + * @author Nick Belaevski + * @since 3.3.0 + */ + +public class QueueSizeTest extends AbstractQueueComponentTest { + + public QueueSizeTest(String name) { + super(name); + } + + + +} Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/ajax-form.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/ajax-form.xhtml 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/ajax-form.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -1,46 +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"> - <head> - <title>a4j:form check page</title> - </head> - <body> - <f:view> - <script type="text/javascript"> - function $(name) { - return document.getElementById(name); - } - - window.testResults = {}; - </script> - - <a4j:status startText="...running..." startStyle="color: green" /> - - <a4j:queue oncomplete="window.testResults.viewDefault = true"/> - - <a4j:form ajaxSubmit="true" id="viewDefault"> - <h:commandButton value="view default queue" id="link" /> - </a4j:form> - - <a4j:queue oncomplete="window.testResults.viewNamed = true" name="viewNamed" /> - - <a4j:form ajaxSubmit="true" eventsQueue="viewNamed" id="viewNamed"> - <h:commandButton value="view named queue" id="link" /> - </a4j:form> - - <a4j:form ajaxSubmit="true" id="formDefault"> - <a4j:queue oncomplete="window.testResults.formDefault = true" /> - - <h:commandButton value="form default queue" id="link" /> - </a4j:form> - - <a4j:form ajaxSubmit="true" eventsQueue="formQueue" id="formNamed"> - <a4j:queue oncomplete="window.testResults.formNamed = true" name="formQueue" /> - - <h:commandButton value="form named queue" id="link" /> - </a4j:form> - </f:view> - </body> -</html> Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/disabled.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/disabled.xhtml 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/disabled.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -1,59 +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"> - <body> - <f:view> - <ui:include src="discovery-base.xhtml" /> - - <h:form id="form"> - <a4j:commandButton id="button" oncomplete="addResult('button')"> - <f:param name="data" value="button" /> - </a4j:commandButton> - <a4j:commandButton id="formQueueButton" oncomplete="addResult('formQueueButton')" eventsQueue="form"> - <f:param name="data" value="formQueueButton" /> - </a4j:commandButton> - - <a4j:queue oncomplete="addResult('disabled')" disabled="true" /> - <a4j:queue oncomplete="addResult('disabledForm')" name="form" disabled="true" /> - </h:form> - - <h:form id="form2"> - <a4j:commandButton id="button2" oncomplete="addResult('button2')"> - <f:param name="data" value="button2" /> - </a4j:commandButton> - <a4j:commandButton id="formQueueButton2" oncomplete="addResult('formQueueButton2')" eventsQueue="form2"> - <f:param name="data" value="formQueueButton2" /> - </a4j:commandButton> - - <a4j:queue oncomplete="addResult('disabledA')" disabled="true" /> - <a4j:queue oncomplete="addResult('form2-global:' + request.options.parameters.data)" /> - <a4j:queue oncomplete="addResult('disabledB')" disabled="true" /> - - <a4j:queue oncomplete="addResult('disabledA1')" disabled="true" name="form2" /> - <a4j:queue oncomplete="addResult('form2-queue:' + request.options.parameters.data)" name="form2"/> - <a4j:queue oncomplete="addResult('disabledB1')" disabled="true" name="form2" /> - </h:form> - - <h:form id="form3"> - <a4j:commandButton id="global" oncomplete="addResult('global')"> - <f:param name="data" value="global" /> - </a4j:commandButton> - <a4j:commandButton id="globalNamed" oncomplete="addResult('globalNamed')" eventsQueue="viewNamed"> - <f:param name="data" value="globalNamed" /> - </a4j:commandButton> - <a4j:commandButton id="globalNamedX" oncomplete="addResult('globalNamedX')" eventsQueue="viewNamedX"> - <f:param name="data" value="globalNamedX" /> - </a4j:commandButton> - </h:form> - - <a4j:queue oncomplete="addResult('disabled:' + request.options.parameters.data)" disabled="true" /> - <a4j:queue oncomplete="addResult('viewNamed:' + request.options.parameters.data)" name="viewNamed" disabled="true" /> - - <a4j:queue oncomplete="addResult('viewNamedXA:' + request.options.parameters.data)" name="viewNamedX" disabled="true" /> - <a4j:queue oncomplete="addResult('viewNamedX:' + request.options.parameters.data)" name="viewNamedX" /> - <a4j:queue oncomplete="addResult('viewNamedXB:' + request.options.parameters.data)" name="viewNamedX" disabled="true" /> - </f:view> - </body> -</html> Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/discovery-base.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/discovery-base.xhtml 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/discovery-base.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -1,22 +0,0 @@ -<ui:composition 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"> - - <script type="text/javascript"> - function $(id) { - return document.getElementById(id); - } - - window.testResult = new Array(); - - function addResult(value) { - window.testResult.push(value); - } - - function stub() { - } - </script> - - <a4j:status startText="...running..." startStyle="color: green" /> -</ui:composition> Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-both.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-both.xhtml 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-both.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -1,65 +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"> - <body> - <f:view> - <ui:include src="discovery-base.xhtml" /> - - <a4j:queue oncomplete="addResult(request.options.parameters.data)"/> - - <h:form id="form"> - <a4j:queue oncomplete="addResult('buttonFormQueue')"/> - - <a4j:commandButton id="button" oncomplete="stub()"> - <f:param name="data" value="button" /> - </a4j:commandButton> - - <a4j:commandButton id="viewQueueButton" oncomplete="stub()" eventsQueue="viewQueue"> - <f:param name="data" value="viewQueueButton" /> - </a4j:commandButton> - - <a4j:commandButton id="implicitDelayedQueue" requestDelay="500" - eventsQueue="implicitDelayedQueue" oncomplete="addResult('implicitDelayedQueue')"> - <f:param name="data" value="implicitDelayedQueue" /> - </a4j:commandButton> - </h:form> - - <h:form id="form2"> - <a4j:commandButton id="formQueueButton" eventsQueue="formQueue" requestDelay="1000" oncomplete="stub()"> - <f:param name="data" value="formQueueButton" /> - </a4j:commandButton> - - <a4j:queue oncomplete="addResult('formQueue:' + request.options.parameters.data)" name="formQueue"/> - - <a4j:commandButton id="button" requestDelay="1000" oncomplete="stub()"> - <f:param name="data" value="form2Button" /> - </a4j:commandButton> - - <a4j:commandButton id="implicitQueue" eventsQueue="implicitQueue" oncomplete="addResult('implicitQueue')"> - <f:param name="data" value="implicitQueue" /> - </a4j:commandButton> - </h:form> - - <h:form id="form3"> - - <a4j:commandButton id="button"> - <f:param name="data" value="form3Button" /> - </a4j:commandButton> - - <a4j:commandButton id="anotherImplicitQueue" ignoreDupResponses="true" eventsQueue="anotherImplicitQueue" oncomplete="addResult('anotherImplicitQueue')"> - <f:param name="data" value="anotherImplicitQueue" /> - </a4j:commandButton> - </h:form> - - <h:form> - <a4j:queue oncomplete="addResult('functionFormQueue')"/> - - <a4j:jsFunction name="ajaxFunction" /> - </h:form> - - <a4j:queue oncomplete="addResult('viewQueue:' + request.options.parameters.data)" name="viewQueue"/> - </f:view> - </body> -</html> Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-form.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-form.xhtml 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-form.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -1,53 +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"> - <body> - <f:view> - <ui:include src="discovery-base.xhtml" /> - - <h:form id="form"> - <a4j:queue oncomplete="addResult('alt1:' + request.options.parameters.data)" name="alternativeQueue1" /> - <a4j:queue oncomplete="addResult('buttonFormQueue')"/> - - <a4j:commandButton id="button" oncomplete="stub()"> - <f:param name="data" value="button" /> - </a4j:commandButton> - - <a4j:commandButton id="implicitQueue" eventsQueue="implicitQueue" oncomplete="addResult('implicitQueue')"> - <f:param name="data" value="implicitQueue" /> - </a4j:commandButton> - - <a4j:commandButton id="alternativeQueueButton" eventsQueue="alternativeQueue" oncomplete="addResult('alternativeQueueButton')"> - <f:param name="data" value="alternativeQueueButton" /> - </a4j:commandButton> - - <a4j:commandButton id="alternativeQueue1Button" eventsQueue="alternativeQueue1" oncomplete="addResult('alternativeQueue1Button')"> - <f:param name="data" value="alternativeQueue1Button" /> - </a4j:commandButton> - - </h:form> - - <h:form> - <a4j:jsFunction name="ajaxFunction" oncomplete="addResult('ajaxFunction')"/> - </h:form> - - - <h:form id="form2"> - <a4j:commandButton id="button" requestDelay="1000" oncomplete="stub()" /> - <a4j:commandButton id="implicitDelayedQueue" requestDelay="500" - eventsQueue="implicitDelayedQueue" oncomplete="addResult('implicitDelayedQueue')"> - <f:param name="data" value="implicitDelayedQueue" /> - </a4j:commandButton> - - <a4j:commandButton id="alternativeQueueButton" eventsQueue="alternativeQueue" oncomplete="addResult('alternativeQueueButton')"> - <f:param name="data" value="alternativeQueueButton" /> - </a4j:commandButton> - - <a4j:queue oncomplete="addResult('buttonForm2Queue')"/> - <a4j:queue oncomplete="addResult('alt:' + request.options.parameters.data)" name="alternativeQueue" /> - </h:form> - </f:view> - </body> -</html> Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-view.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-view.xhtml 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-view.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -1,40 +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"> - <body> - <f:view> - <ui:include src="discovery-base.xhtml" /> - - <h:form id="form"> - <a4j:commandButton id="button" oncomplete="stub()" requestDelay="100"> - <f:param name="data" value="button" /> - </a4j:commandButton> - - <a4j:commandButton id="alternativeQueueButton" eventsQueue="alternativeQueue" oncomplete="addResult('alternativeQueueButton')"> - <f:param name="data" value="alternativeQueueButton" /> - </a4j:commandButton> - - <a4j:commandButton id="implicitQueue" eventsQueue="implicitQueue" oncomplete="addResult('implicitQueue')"> - <f:param name="data" value="implicitQueue" /> - </a4j:commandButton> - </h:form> - - <h:form id="form2"> - <a4j:jsFunction name="ajaxFunction" oncomplete="stub()"> - <f:param name="data" value="function" /> - </a4j:jsFunction> - - <a4j:commandButton id="implicitDelayedQueue" requestDelay="500" - eventsQueue="implicitDelayedQueue" oncomplete="addResult('implicitDelayedQueue')"> - <f:param name="data" value="implicitDelayedQueue" /> - </a4j:commandButton> - </h:form> - - <a4j:queue oncomplete="addResult(request.options.parameters.data)"/> - <a4j:queue oncomplete="addResult('alt:' + request.options.parameters.data)" name="alternativeQueue" /> - - </f:view> - </body> -</html> Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/implicit-global-queue.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/implicit-global-queue.xhtml 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/implicit-global-queue.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -1,10 +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"> - <body> - <f:view> - </f:view> - </body> -</html> Deleted: trunk/ui/core/src/test/resources/org/ajax4jsf/component/legacy.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/legacy.xhtml 2008-11-19 17:07:07 UTC (rev 11249) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/legacy.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -1,24 +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"> - <body> - <f:view> - <script type="text/javascript"> - XMLHttpRequest.defaultRequestTime = 5000; - - function $(id) { - return document.getElementById(id); - } - - var counter = 0; - var time = 0; - </script> - <h:form id="form"> - <a4j:commandButton id="buttonDelayed" requestDelay="1000" /> - <a4j:commandButton id="buttonIgnoreDupResponces" ignoreDupResponses="true" oncomplete="counter++;time = Timer.currentTime;"/> - </h:form> - </f:view> - </body> -</html> Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/ajax-form.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,46 @@ +<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"> + <head> + <title>a4j:form check page</title> + </head> + <body> + <f:view> + <script type="text/javascript"> + function $(name) { + return document.getElementById(name); + } + + window.testResults = {}; + </script> + + <a4j:status startText="...running..." startStyle="color: green" /> + + <a4j:queue oncomplete="window.testResults.viewDefault = true"/> + + <a4j:form ajaxSubmit="true" id="viewDefault"> + <h:commandButton value="view default queue" id="link" /> + </a4j:form> + + <a4j:queue oncomplete="window.testResults.viewNamed = true" name="viewNamed" /> + + <a4j:form ajaxSubmit="true" eventsQueue="viewNamed" id="viewNamed"> + <h:commandButton value="view named queue" id="link" /> + </a4j:form> + + <a4j:form ajaxSubmit="true" id="formDefault"> + <a4j:queue oncomplete="window.testResults.formDefault = true" /> + + <h:commandButton value="form default queue" id="link" /> + </a4j:form> + + <a4j:form ajaxSubmit="true" eventsQueue="formQueue" id="formNamed"> + <a4j:queue oncomplete="window.testResults.formNamed = true" name="formQueue" /> + + <h:commandButton value="form named queue" id="link" /> + </a4j:form> + </f:view> + </body> +</html> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-ajax-form.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/disabled.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,59 @@ +<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> + <ui:include src="queue-discovery-base.xhtml" /> + + <h:form id="form"> + <a4j:commandButton id="button" oncomplete="addResult('button')"> + <f:param name="data" value="button" /> + </a4j:commandButton> + <a4j:commandButton id="formQueueButton" oncomplete="addResult('formQueueButton')" eventsQueue="form"> + <f:param name="data" value="formQueueButton" /> + </a4j:commandButton> + + <a4j:queue oncomplete="addResult('disabled')" disabled="true" /> + <a4j:queue oncomplete="addResult('disabledForm')" name="form" disabled="true" /> + </h:form> + + <h:form id="form2"> + <a4j:commandButton id="button2" oncomplete="addResult('button2')"> + <f:param name="data" value="button2" /> + </a4j:commandButton> + <a4j:commandButton id="formQueueButton2" oncomplete="addResult('formQueueButton2')" eventsQueue="form2"> + <f:param name="data" value="formQueueButton2" /> + </a4j:commandButton> + + <a4j:queue oncomplete="addResult('disabledA')" disabled="true" /> + <a4j:queue oncomplete="addResult('form2-global:' + request.options.parameters.data)" /> + <a4j:queue oncomplete="addResult('disabledB')" disabled="true" /> + + <a4j:queue oncomplete="addResult('disabledA1')" disabled="true" name="form2" /> + <a4j:queue oncomplete="addResult('form2-queue:' + request.options.parameters.data)" name="form2"/> + <a4j:queue oncomplete="addResult('disabledB1')" disabled="true" name="form2" /> + </h:form> + + <h:form id="form3"> + <a4j:commandButton id="global" oncomplete="addResult('global')"> + <f:param name="data" value="global" /> + </a4j:commandButton> + <a4j:commandButton id="globalNamed" oncomplete="addResult('globalNamed')" eventsQueue="viewNamed"> + <f:param name="data" value="globalNamed" /> + </a4j:commandButton> + <a4j:commandButton id="globalNamedX" oncomplete="addResult('globalNamedX')" eventsQueue="viewNamedX"> + <f:param name="data" value="globalNamedX" /> + </a4j:commandButton> + </h:form> + + <a4j:queue oncomplete="addResult('disabled:' + request.options.parameters.data)" disabled="true" /> + <a4j:queue oncomplete="addResult('viewNamed:' + request.options.parameters.data)" name="viewNamed" disabled="true" /> + + <a4j:queue oncomplete="addResult('viewNamedXA:' + request.options.parameters.data)" name="viewNamedX" disabled="true" /> + <a4j:queue oncomplete="addResult('viewNamedX:' + request.options.parameters.data)" name="viewNamedX" /> + <a4j:queue oncomplete="addResult('viewNamedXB:' + request.options.parameters.data)" name="viewNamedX" disabled="true" /> + </f:view> + </body> +</html> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-disabled.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/discovery-base.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,22 @@ +<ui:composition 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"> + + <script type="text/javascript"> + function $(id) { + return document.getElementById(id); + } + + window.testResult = new Array(); + + function addResult(value) { + window.testResult.push(value); + } + + function stub() { + } + </script> + + <a4j:status startText="...running..." startStyle="color: green" /> +</ui:composition> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-discovery-base.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-both.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,65 @@ +<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> + <ui:include src="queue-discovery-base.xhtml" /> + + <a4j:queue oncomplete="addResult(request.options.parameters.data)"/> + + <h:form id="form"> + <a4j:queue oncomplete="addResult('buttonFormQueue')"/> + + <a4j:commandButton id="button" oncomplete="stub()"> + <f:param name="data" value="button" /> + </a4j:commandButton> + + <a4j:commandButton id="viewQueueButton" oncomplete="stub()" eventsQueue="viewQueue"> + <f:param name="data" value="viewQueueButton" /> + </a4j:commandButton> + + <a4j:commandButton id="implicitDelayedQueue" requestDelay="500" + eventsQueue="implicitDelayedQueue" oncomplete="addResult('implicitDelayedQueue')"> + <f:param name="data" value="implicitDelayedQueue" /> + </a4j:commandButton> + </h:form> + + <h:form id="form2"> + <a4j:commandButton id="formQueueButton" eventsQueue="formQueue" requestDelay="1000" oncomplete="stub()"> + <f:param name="data" value="formQueueButton" /> + </a4j:commandButton> + + <a4j:queue oncomplete="addResult('formQueue:' + request.options.parameters.data)" name="formQueue"/> + + <a4j:commandButton id="button" requestDelay="1000" oncomplete="stub()"> + <f:param name="data" value="form2Button" /> + </a4j:commandButton> + + <a4j:commandButton id="implicitQueue" eventsQueue="implicitQueue" oncomplete="addResult('implicitQueue')"> + <f:param name="data" value="implicitQueue" /> + </a4j:commandButton> + </h:form> + + <h:form id="form3"> + + <a4j:commandButton id="button"> + <f:param name="data" value="form3Button" /> + </a4j:commandButton> + + <a4j:commandButton id="anotherImplicitQueue" ignoreDupResponses="true" eventsQueue="anotherImplicitQueue" oncomplete="addResult('anotherImplicitQueue')"> + <f:param name="data" value="anotherImplicitQueue" /> + </a4j:commandButton> + </h:form> + + <h:form> + <a4j:queue oncomplete="addResult('functionFormQueue')"/> + + <a4j:jsFunction name="ajaxFunction" /> + </h:form> + + <a4j:queue oncomplete="addResult('viewQueue:' + request.options.parameters.data)" name="viewQueue"/> + </f:view> + </body> +</html> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-both.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-form.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,53 @@ +<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> + <ui:include src="queue-discovery-base.xhtml" /> + + <h:form id="form"> + <a4j:queue oncomplete="addResult('alt1:' + request.options.parameters.data)" name="alternativeQueue1" /> + <a4j:queue oncomplete="addResult('buttonFormQueue')"/> + + <a4j:commandButton id="button" oncomplete="stub()"> + <f:param name="data" value="button" /> + </a4j:commandButton> + + <a4j:commandButton id="implicitQueue" eventsQueue="implicitQueue" oncomplete="addResult('implicitQueue')"> + <f:param name="data" value="implicitQueue" /> + </a4j:commandButton> + + <a4j:commandButton id="alternativeQueueButton" eventsQueue="alternativeQueue" oncomplete="addResult('alternativeQueueButton')"> + <f:param name="data" value="alternativeQueueButton" /> + </a4j:commandButton> + + <a4j:commandButton id="alternativeQueue1Button" eventsQueue="alternativeQueue1" oncomplete="addResult('alternativeQueue1Button')"> + <f:param name="data" value="alternativeQueue1Button" /> + </a4j:commandButton> + + </h:form> + + <h:form> + <a4j:jsFunction name="ajaxFunction" oncomplete="addResult('ajaxFunction')"/> + </h:form> + + + <h:form id="form2"> + <a4j:commandButton id="button" requestDelay="1000" oncomplete="stub()" /> + <a4j:commandButton id="implicitDelayedQueue" requestDelay="500" + eventsQueue="implicitDelayedQueue" oncomplete="addResult('implicitDelayedQueue')"> + <f:param name="data" value="implicitDelayedQueue" /> + </a4j:commandButton> + + <a4j:commandButton id="alternativeQueueButton" eventsQueue="alternativeQueue" oncomplete="addResult('alternativeQueueButton')"> + <f:param name="data" value="alternativeQueueButton" /> + </a4j:commandButton> + + <a4j:queue oncomplete="addResult('buttonForm2Queue')"/> + <a4j:queue oncomplete="addResult('alt:' + request.options.parameters.data)" name="alternativeQueue" /> + </h:form> + </f:view> + </body> +</html> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-form.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/global-view.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,40 @@ +<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> + <ui:include src="queue-discovery-base.xhtml" /> + + <h:form id="form"> + <a4j:commandButton id="button" oncomplete="stub()" requestDelay="100"> + <f:param name="data" value="button" /> + </a4j:commandButton> + + <a4j:commandButton id="alternativeQueueButton" eventsQueue="alternativeQueue" oncomplete="addResult('alternativeQueueButton')"> + <f:param name="data" value="alternativeQueueButton" /> + </a4j:commandButton> + + <a4j:commandButton id="implicitQueue" eventsQueue="implicitQueue" oncomplete="addResult('implicitQueue')"> + <f:param name="data" value="implicitQueue" /> + </a4j:commandButton> + </h:form> + + <h:form id="form2"> + <a4j:jsFunction name="ajaxFunction" oncomplete="stub()"> + <f:param name="data" value="function" /> + </a4j:jsFunction> + + <a4j:commandButton id="implicitDelayedQueue" requestDelay="500" + eventsQueue="implicitDelayedQueue" oncomplete="addResult('implicitDelayedQueue')"> + <f:param name="data" value="implicitDelayedQueue" /> + </a4j:commandButton> + </h:form> + + <a4j:queue oncomplete="addResult(request.options.parameters.data)"/> + <a4j:queue oncomplete="addResult('alt:' + request.options.parameters.data)" name="alternativeQueue" /> + + </f:view> + </body> +</html> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-global-view.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/implicit-global-queue.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,10 @@ +<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> + </f:view> + </body> +</html> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-implicit-global.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml (from rev 11246, trunk/ui/core/src/test/resources/org/ajax4jsf/component/legacy.xhtml) =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,24 @@ +<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> + <script type="text/javascript"> + XMLHttpRequest.defaultRequestTime = 5000; + + function $(id) { + return document.getElementById(id); + } + + var counter = 0; + var time = 0; + </script> + <h:form id="form"> + <a4j:commandButton id="buttonDelayed" requestDelay="1000" /> + <a4j:commandButton id="buttonIgnoreDupResponces" ignoreDupResponses="true" oncomplete="counter++;time = Timer.currentTime;"/> + </h:form> + </f:view> + </body> +</html> Property changes on: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-legacy.xhtml ___________________________________________________________________ Name: svn:mergeinfo + Added: trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-size.xhtml =================================================================== --- trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-size.xhtml (rev 0) +++ trunk/ui/core/src/test/resources/org/ajax4jsf/component/queue-size.xhtml 2008-11-19 17:45:32 UTC (rev 11250) @@ -0,0 +1,11 @@ +<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 name="defaultSizeQueue" /> + </f:view> + </body> +</html>