Author: ppitonak(a)redhat.com Date: 2011-10-26 07:00:28 -0400 (Wed, 26 Oct 2011) New Revision: 22844 Added: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java Modified: modules/tests/metamer/branches/wfk2-product-branch/ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richFileUpload/simple.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/moreStacks.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/simple.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/validation.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richPickList/simple.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richValidator/single.xhtml modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/AbstractOrderingListTest.java modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml modules/tests/metamer/branches/wfk2-product-branch/ftest/run-test-with-replace-context-params.sh Log: merged with trunk Property changes on: modules/tests/metamer/branches/wfk2-product-branch ___________________________________________________________________ Modified: svn:mergeinfo - /modules/tests/metamer/trunk:22762-22826 + /modules/tests/metamer/trunk:22762-22826,22828-22843 Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -35,8 +35,10 @@ import javax.faces.event.ComponentSystemEvent; import org.richfaces.component.UITree; +import org.richfaces.event.DropEvent; import org.richfaces.tests.metamer.Attributes; import org.richfaces.tests.metamer.bean.Model; +import org.richfaces.tests.metamer.bean.RichBean; import org.richfaces.tests.metamer.model.tree.CompactDisc; import org.richfaces.tests.metamer.model.tree.CompactDiscXmlDescriptor; import org.richfaces.tests.metamer.model.tree.Company; @@ -144,6 +146,10 @@ } return country; } + + public void processDragging(DropEvent dropEvent) { + RichBean.logToPage("* dropListener"); + } public List<NamedNode> getRoot() { Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -45,12 +45,12 @@ <h:column> <h:inputText id="simpleText1" value="#{a4jAjaxBean.input}" valueChangeListener="#{richBean.valueChangeListener}" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </h:inputText> </h:column> <h:column> <h:inputText id="simpleText2" value="#{a4jAjaxBean.input}" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </h:inputText> </h:column> @@ -60,12 +60,12 @@ <h:column> <rich:autocomplete id="autocomplete1" value="#{a4jAjaxBean.input}" valueChangeListener="#{richBean.valueChangeListener}" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </rich:autocomplete> </h:column> <h:column> <rich:autocomplete id="autocomplete2" value="#{a4jAjaxBean.input}"> - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </rich:autocomplete> </h:column> @@ -90,12 +90,12 @@ <h:column> <rich:editor id="editor1" value="#{a4jAjaxBean.input}" width="310px" height="40px" valueChangeListener="#{richBean.valueChangeListener}" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </rich:editor> </h:column> <h:column> <rich:editor id="editor2" value="#{a4jAjaxBean.input}" width="310px" height="40px" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </rich:editor> </h:column> @@ -169,7 +169,7 @@ </h:panelGrid> <br/> - <a4j:outputPanel id="output1" layout="block"> + <a4j:outputPanel id="output" layout="block"> Output: <h:outputText value="#{a4jAjaxBean.input}"/> </a4j:outputPanel> Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richFileUpload/simple.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:rich="http://richfaces.org/rich" + xmlns:a4j="http://richfaces.org/a4j"> - <!-- +<!-- JBoss, Home of Professional Open Source Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a @@ -26,85 +26,79 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - <ui:composition template="/templates/template.xhtml"> +<ui:composition template="/templates/template.xhtml"> - <ui:define name="view"> - <f:metadata> - <f:viewParam name="templates" value="#{templateBean.templates}"> - <f:converter converterId="templatesListConverter" /> - </f:viewParam> - </f:metadata> - </ui:define> + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> - <ui:define name="component"> + <ui:define name="component"> - <rich:fileUpload id="fileUpload" - acceptedTypes="#{richFileUploadBean.attributes['acceptedTypes'].value}" - addLabel="#{richFileUploadBean.attributes['addLabel'].value}" - clearAllLabel="#{richFileUploadBean.attributes['clearAllLabel'].value}" - clearLabel="#{richFileUploadBean.attributes['clearLabel'].value}" - data="#{richFileUploadBean.attributes['data'].value}" - deleteLabel="#{richFileUploadBean.attributes['deleteLabel'].value}" - dir="#{richFileUploadBean.attributes['dir'].value}" - disabled="#{richFileUploadBean.attributes['disabled'].value}" - doneLabel="#{richFileUploadBean.attributes['doneLabel'].value}" - execute="#{richFileUploadBean.attributes['execute'].value}" - fileUploadListener="#{richFileUploadBean.listener}" - lang="#{richFileUploadBean.attributes['lang'].value}" - limitRender="#{richFileUploadBean.attributes['limitRender'].value}" - noDuplicate="#{richFileUploadBean.attributes['noDuplicate'].value}" - onbeforedomupdate="#{richFileUploadBean.attributes['onbeforedomupdate'].value}" - onbegin="#{richFileUploadBean.attributes['onbegin'].value}" - onclear="#{richFileUploadBean.attributes['onclear'].value}" - onclick="#{richFileUploadBean.attributes['onclick'].value}" - oncomplete="#{richFileUploadBean.attributes['oncomplete'].value}" - ondblclick="#{richFileUploadBean.attributes['ondblclick'].value}" - onfilesubmit="#{richFileUploadBean.attributes['onfilesubmit'].value}" - onkeydown="#{richFileUploadBean.attributes['onkeydown'].value}" - onkeypress="#{richFileUploadBean.attributes['onkeypress'].value}" - onkeyup="#{richFileUploadBean.attributes['onkeyup'].value}" - onmousedown="#{richFileUploadBean.attributes['onmousedown'].value}" - onmousemove="#{richFileUploadBean.attributes['onmousemove'].value}" - onmouseout="#{richFileUploadBean.attributes['onmouseout'].value}" - onmouseover="#{richFileUploadBean.attributes['onmouseover'].value}" - onmouseup="#{richFileUploadBean.attributes['onmouseup'].value}" - ontyperejected="#{richFileUploadBean.attributes['ontyperejected'].value}" - onuploadcomplete="#{richFileUploadBean.attributes['onuploadcomplete'].value}" - render="#{richFileUploadBean.attributes['render'].value}" - rendered="#{richFileUploadBean.attributes['rendered'].value}" - serverErrorLabel="#{richFileUploadBean.attributes['serverErrorLabel'].value}" - sizeExceededLabel="#{richFileUploadBean.attributes['sizeExceededLabel'].value}" - status="#{richFileUploadBean.attributes['status'].value}" - style="#{richFileUploadBean.attributes['style'].value}" - styleClass="#{richFileUploadBean.attributes['styleClass'].value}" - title="#{richFileUploadBean.attributes['title'].value}" - uploadLabel="#{richFileUploadBean.attributes['uploadLabel'].value}" - /> + <rich:fileUpload id="fileUpload" acceptedTypes="#{richFileUploadBean.attributes['acceptedTypes'].value}" + addLabel="#{richFileUploadBean.attributes['addLabel'].value}" + clearAllLabel="#{richFileUploadBean.attributes['clearAllLabel'].value}" + clearLabel="#{richFileUploadBean.attributes['clearLabel'].value}" + data="#{richFileUploadBean.attributes['data'].value}" + deleteLabel="#{richFileUploadBean.attributes['deleteLabel'].value}" + dir="#{richFileUploadBean.attributes['dir'].value}" disabled="#{richFileUploadBean.attributes['disabled'].value}" + doneLabel="#{richFileUploadBean.attributes['doneLabel'].value}" + execute="#{richFileUploadBean.attributes['execute'].value}" fileUploadListener="#{richFileUploadBean.listener}" + lang="#{richFileUploadBean.attributes['lang'].value}" + limitRender="#{richFileUploadBean.attributes['limitRender'].value}" + maxFilesQuantity="#{richFileUploadBean.attributes['maxFilesQuantity'].value}" + noDuplicate="#{richFileUploadBean.attributes['noDuplicate'].value}" + onbeforedomupdate="#{richFileUploadBean.attributes['onbeforedomupdate'].value}" + onbegin="#{richFileUploadBean.attributes['onbegin'].value}" + onclear="#{richFileUploadBean.attributes['onclear'].value}" + onclick="#{richFileUploadBean.attributes['onclick'].value}" + oncomplete="#{richFileUploadBean.attributes['oncomplete'].value}" + ondblclick="#{richFileUploadBean.attributes['ondblclick'].value}" + onfilesubmit="#{richFileUploadBean.attributes['onfilesubmit'].value}" + onkeydown="#{richFileUploadBean.attributes['onkeydown'].value}" + onkeypress="#{richFileUploadBean.attributes['onkeypress'].value}" + onkeyup="#{richFileUploadBean.attributes['onkeyup'].value}" + onmousedown="#{richFileUploadBean.attributes['onmousedown'].value}" + onmousemove="#{richFileUploadBean.attributes['onmousemove'].value}" + onmouseout="#{richFileUploadBean.attributes['onmouseout'].value}" + onmouseover="#{richFileUploadBean.attributes['onmouseover'].value}" + onmouseup="#{richFileUploadBean.attributes['onmouseup'].value}" + ontyperejected="#{richFileUploadBean.attributes['ontyperejected'].value}" + onuploadcomplete="#{richFileUploadBean.attributes['onuploadcomplete'].value}" + render="#{richFileUploadBean.attributes['render'].value}" + rendered="#{richFileUploadBean.attributes['rendered'].value}" + serverErrorLabel="#{richFileUploadBean.attributes['serverErrorLabel'].value}" + sizeExceededLabel="#{richFileUploadBean.attributes['sizeExceededLabel'].value}" + status="#{richFileUploadBean.attributes['status'].value}" style="#{richFileUploadBean.attributes['style'].value}" + styleClass="#{richFileUploadBean.attributes['styleClass'].value}" + title="#{richFileUploadBean.attributes['title'].value}" + uploadLabel="#{richFileUploadBean.attributes['uploadLabel'].value}" /> - <br/> - <fieldset style="width: 376px;"> - <legend>Uploaded Files</legend> - <a4j:outputPanel id="uploadedFilesPanel" ajaxRendered="true"> - <ul> - <a4j:repeat value="#{richFileUploadBean.items}" var="item"> - <li>#{item.name}</li> - </a4j:repeat> - </ul> + <br /> + <fieldset style="width: 376px;"> + <legend>Uploaded Files</legend> + <a4j:outputPanel id="uploadedFilesPanel" ajaxRendered="true"> + <ul> + <a4j:repeat value="#{richFileUploadBean.items}" var="item"> + <li>#{item.name}</li> + </a4j:repeat> + </ul> - <br/> + <br /> - <a4j:commandButton id="clearUploadedDataButton" - action="#{richFileUploadBean.clearUploadedData}" - value="Clear Uploaded Data" - rendered="#{richFileUploadBean.renderButton}" /> - </a4j:outputPanel> - </fieldset> + <a4j:commandButton id="clearUploadedDataButton" action="#{richFileUploadBean.clearUploadedData}" + value="Clear Uploaded Data" rendered="#{richFileUploadBean.renderButton}" /> + </a4j:outputPanel> + </fieldset> - </ui:define> + </ui:define> - <ui:define name="outOfTemplateAfter"> - <metamer:attributes value="#{richFileUploadBean.attributes}" id="attributes" render="log"/> - </ui:define> + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{richFileUploadBean.attributes}" id="attributes" render="log" /> + </ui:define> - </ui:composition> +</ui:composition> </html> \ No newline at end of file Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/moreStacks.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/moreStacks.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/moreStacks.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" 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:metamer="http://java.sun.com/jsf/composite/metamer" - xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich">> + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> +> - <!-- +<!-- JBoss, Home of Professional Open Source Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a @@ -26,142 +27,122 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - <ui:composition template="/templates/template.xhtml"> - - <ui:define name="view"> - <f:metadata> - <f:viewParam name="templates" value="#{templateBean.templates}"> - <f:converter converterId="templatesListConverter" /> - </f:viewParam> - </f:metadata> - </ui:define> - - <ui:define name="component"> - <h:form> - <rich:notifyMessages ajaxRendered="true" - animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" - delay="#{notifyBean.attributesNotifyMessages['delay'].value}" - execute="{@form}" - for="number1" - globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" - hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" - keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" - interval="#{notifyBean.attributesNotifyMessages['interval'].value}" - nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" - showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" - showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" - showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" - showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" - stack="topRightStack" - stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" - sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" - styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" - /> - <rich:notifyMessages ajaxRendered="true" - animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" - delay="#{notifyBean.attributesNotifyMessages['delay'].value}" - execute="{@form}" - for="number2" - globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" - hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" - keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" - interval="#{notifyBean.attributesNotifyMessages['interval'].value}" - nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" - showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" - showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" - showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" - showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" - stack="bottomRightStack" - stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" - sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" - styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" - /> - - <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" - detail="Stack 2 - #{notifyBean.attributesNotify['detail'].value}" - delay="#{notifyBean.attributesNotify['delay'].value}" - hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" - nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotify['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" - showHistory="#{notifyBean.attributesNotify['showHistory'].value}" - showShadow="#{notifyBean.attributesNotify['showShadow'].value}" - stack="topRightStack" - stayTime="#{notifyBean.attributesNotify['stayTime'].value}" - sticky="#{notifyBean.attributesNotify['sticky'].value}" - styleClass="#{notifyBean.attributesNotify['styleClass'].value}" - summary="Stack 2 - #{notifyBean.attributesNotify['summary'].value}" - /> - <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" - delay="#{notifyBean.attributesNotify['delay'].value}" - detail="Stack 2 - #{notifyBean.attributesNotify['detail'].value}" - hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" - nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotify['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" - showHistory="#{notifyBean.attributesNotify['showHistory'].value}" - showShadow="#{notifyBean.attributesNotify['showShadow'].value}" - stack="bottomRightStack" - stayTime="#{notifyBean.attributesNotify['stayTime'].value}" - sticky="#{notifyBean.attributesNotify['sticky'].value}" - styleClass="#{notifyBean.attributesNotify['styleClass'].value}" - summary="Stack 2 - #{notifyBean.attributesNotify['summary'].value}" - /> - - <rich:notifyStack id="topRightStack" - direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" - method="#{notifyBean.attributesNotifyStackFirst['method'].value}" - position="#{notifyBean.attributesNotifyStackFirst['position'].value}" - rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" - styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" - /> - - <rich:notifyStack id="bottomRightStack" - direction="#{notifyBean.attributesNotifyStackSecond['direction'].value}" - method="#{notifyBean.attributesNotifyStackSecond['method'].value}" - position="#{notifyBean.attributesNotifyStackSecond['position'].value}" - rendered="#{notifyBean.attributesNotifyStackSecond['rendered'].value}" - styleClass="#{notifyBean.attributesNotifyStackSecond['styleClass'].value}" - /> - - <h:outputLabel for="number1" value="Number for Stack 1 (from 5 to 10)"/> - <h:inputText id="number1" required="true"> - <f:validateLongRange minimum="5" maximum="10"/> - </h:inputText> - <br /> - <h:outputLabel for="number2" value="Number for Stack 2 (from 5 to 10)"/> - <h:inputText id="number2" required="true"> - <f:validateLongRange minimum="5" maximum="10"/> - </h:inputText> - <br /> - <h:commandButton action="@form" value="h:commandButton Submit" id="hCommandButtonSubmit" /> - <a4j:commandButton action="@form" value="a4j:commandButton Submit" id="a4jCommandButtonSubmit" /> - - </h:form> - </ui:define> - - <ui:define name="outOfTemplateAfter"> - <h2>Attributes - Notify</h2> - <metamer:attributes value="#{notifyBean.attributesNotify}" id="attributesNotify" render="panel"/> - <h2>Attributes - Notify Messages</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyMessages}" id="attributesNotifyMessages" render="panel"/> - <h2>Attributes - Notify Stack 1</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyStackFirst}" id="attributesNotifyStack1" render="panel"/> - <h2>Attributes - Notify Stack 2</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyStackSecond}" id="attributesNotifyStack2" render="panel"/> - </ui:define> - </ui:composition> - +<ui:composition template="/templates/template.xhtml"> + + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="component"> + + <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" + delay="#{notifyBean.attributesNotifyMessages['delay'].value}" execute="{@form}" for="number1" + globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" + hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" + keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" + interval="#{notifyBean.attributesNotifyMessages['interval'].value}" + nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" + showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" + showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" + showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" + showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" stack="topRightStack" + stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" + sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" + styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" /> + <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" + delay="#{notifyBean.attributesNotifyMessages['delay'].value}" execute="{@form}" for="number2" + globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" + hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" + keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" + interval="#{notifyBean.attributesNotifyMessages['interval'].value}" + nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" + showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" + showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" + showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" + showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" stack="bottomRightStack" + stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" + sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" + styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" /> + + <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" + detail="Stack 2 - #{notifyBean.attributesNotify['detail'].value}" + delay="#{notifyBean.attributesNotify['delay'].value}" + hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" + nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotify['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" + showHistory="#{notifyBean.attributesNotify['showHistory'].value}" + showShadow="#{notifyBean.attributesNotify['showShadow'].value}" stack="topRightStack" + stayTime="#{notifyBean.attributesNotify['stayTime'].value}" sticky="#{notifyBean.attributesNotify['sticky'].value}" + styleClass="#{notifyBean.attributesNotify['styleClass'].value}" + summary="Stack 2 - #{notifyBean.attributesNotify['summary'].value}" /> + <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" + delay="#{notifyBean.attributesNotify['delay'].value}" + detail="Stack 2 - #{notifyBean.attributesNotify['detail'].value}" + hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" + nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotify['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" + showHistory="#{notifyBean.attributesNotify['showHistory'].value}" + showShadow="#{notifyBean.attributesNotify['showShadow'].value}" stack="bottomRightStack" + stayTime="#{notifyBean.attributesNotify['stayTime'].value}" sticky="#{notifyBean.attributesNotify['sticky'].value}" + styleClass="#{notifyBean.attributesNotify['styleClass'].value}" + summary="Stack 2 - #{notifyBean.attributesNotify['summary'].value}" /> + + <rich:notifyStack id="topRightStack" direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" + method="#{notifyBean.attributesNotifyStackFirst['method'].value}" + position="#{notifyBean.attributesNotifyStackFirst['position'].value}" + rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" + styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" /> + + <rich:notifyStack id="bottomRightStack" direction="#{notifyBean.attributesNotifyStackSecond['direction'].value}" + method="#{notifyBean.attributesNotifyStackSecond['method'].value}" + position="#{notifyBean.attributesNotifyStackSecond['position'].value}" + rendered="#{notifyBean.attributesNotifyStackSecond['rendered'].value}" + styleClass="#{notifyBean.attributesNotifyStackSecond['styleClass'].value}" /> + <h:form> + <h:outputLabel for="number1" value="Number for Stack 1 (from 5 to 10)" /> + <h:inputText id="number1" required="true"> + <f:validateLongRange minimum="5" maximum="10" /> + </h:inputText> + <br /> + <h:outputLabel for="number2" value="Number for Stack 2 (from 5 to 10)" /> + <h:inputText id="number2" required="true"> + <f:validateLongRange minimum="5" maximum="10" /> + </h:inputText> + <br /> + <h:commandButton action="@form" value="h:commandButton Submit" id="hCommandButtonSubmit" /> + <a4j:commandButton action="@form" value="a4j:commandButton Submit" id="a4jCommandButtonSubmit" /> + + </h:form> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <h2>Attributes - Notify</h2> + <metamer:attributes value="#{notifyBean.attributesNotify}" id="attributesNotify" render="panel" /> + <h2>Attributes - Notify Messages</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyMessages}" id="attributesNotifyMessages" render="panel" /> + <h2>Attributes - Notify Stack 1</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyStackFirst}" id="attributesNotifyStack1" render="panel" /> + <h2>Attributes - Notify Stack 2</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyStackSecond}" id="attributesNotifyStack2" render="panel" /> + </ui:define> +</ui:composition> + </html> \ No newline at end of file Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/simple.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/simple.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/simple.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -38,57 +38,50 @@ </ui:define> <ui:define name="component"> - <h:form> - <a4j:outputPanel ajaxRendered="true"> - - <rich:notifyStack id="exampleNotifyStack" - direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" - method="#{notifyBean.attributesNotifyStackFirst['method'].value}" - position="#{notifyBean.attributesNotifyStackFirst['position'].value}" - rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" - styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" - /> - <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" - delay="#{notifyBean.attributesNotify['delay'].value}" - detail="#{notifyBean.attributesNotify['detail'].value}" - hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" - nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotify['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" - showHistory="#{notifyBean.attributesNotify['showHistory'].value}" - showShadow="#{notifyBean.attributesNotify['showShadow'].value}" - stack="exampleNotifyStack" - stayTime="#{notifyBean.attributesNotify['stayTime'].value}" - sticky="#{notifyBean.attributesNotify['sticky'].value}" - styleClass="#{notifyBean.attributesNotify['styleClass'].value}" - summary="#{notifyBean.attributesNotify['summary'].value}" - /> - <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" - delay="#{notifyBean.attributesNotifyMessages['delay'].value}" - execute="{@form}" - for="#{notifyBean.attributesNotifyMessages['for'].value}" - globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" - hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" - keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" - interval="#{notifyBean.attributesNotifyMessages['interval'].value}" - nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" - showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" - showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" - showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" - showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" - stack="exampleNotifyStack" - stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" - sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" - styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" - /> - </a4j:outputPanel> - <a4j:commandButton id="produceError" value="Produce Error" action="#{notifyBean.produceError}" execute="@form"/> + + <a4j:outputPanel> + + <rich:notifyStack id="exampleNotifyStack" direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" + method="#{notifyBean.attributesNotifyStackFirst['method'].value}" + position="#{notifyBean.attributesNotifyStackFirst['position'].value}" + rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" + styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" /> + <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" + delay="#{notifyBean.attributesNotify['delay'].value}" detail="#{notifyBean.attributesNotify['detail'].value}" + hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" + nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotify['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" + showHistory="#{notifyBean.attributesNotify['showHistory'].value}" + showShadow="#{notifyBean.attributesNotify['showShadow'].value}" stack="exampleNotifyStack" + stayTime="#{notifyBean.attributesNotify['stayTime'].value}" + sticky="#{notifyBean.attributesNotify['sticky'].value}" + styleClass="#{notifyBean.attributesNotify['styleClass'].value}" + summary="#{notifyBean.attributesNotify['summary'].value}" /> + <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" + delay="#{notifyBean.attributesNotifyMessages['delay'].value}" execute="{@form}" + for="#{notifyBean.attributesNotifyMessages['for'].value}" + globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" + hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" + keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" + interval="#{notifyBean.attributesNotifyMessages['interval'].value}" + nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" + showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" + showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" + showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" + showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" stack="exampleNotifyStack" + stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" + sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" + styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" /> + </a4j:outputPanel> + <h:form> + <a4j:commandButton id="produceError" value="Produce Error" action="#{notifyBean.produceError}" execute="@form" /> <a4j:commandButton id="produceFatal" value="Produce Fatal" action="#{notifyBean.produceFatal}" execute="@form"/> <a4j:commandButton id="produceInfo" value="Produce Info" action="#{notifyBean.produceInfo}" execute="@form"/> <a4j:commandButton id="produceWarn" value="Produce Warn" action="#{notifyBean.produceWarn}" execute="@form"/> Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/validation.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/validation.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/validation.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" 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:rich="http://richfaces.org/rich" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:a4j="http://richfaces.org/a4j"> - <!-- +<!-- JBoss, Home of Professional Open Source Copyright 2010-2011, Red Hat, Inc. and individual contributors by the @authors tag. See the copyright.txt in the distribution for a @@ -26,84 +26,74 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> - <ui:composition template="/templates/template.xhtml"> +<ui:composition template="/templates/template.xhtml"> - <ui:define name="view"> - <f:metadata> - <f:viewParam name="templates" value="#{templateBean.templates}"> - <f:converter converterId="templatesListConverter" /> - </f:viewParam> - </f:metadata> - </ui:define> + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> - <ui:define name="component"> - <h:form> - <rich:notifyMessages ajaxRendered="true" - animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" - delay="#{notifyBean.attributesNotifyMessages['delay'].value}" - execute="{@form}" - for="number" - globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" - hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" - keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" - interval="#{notifyBean.attributesNotifyMessages['interval'].value}" - nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" - showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" - showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" - showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" - showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" - stack="exampleNotifyStack" - stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" - sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" - styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" - /> - - <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" - delay="#{notifyBean.attributesNotify['delay'].value}" - detail="#{notifyBean.attributesNotify['detail'].value}" - hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" - nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotify['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" - showHistory="#{notifyBean.attributesNotify['showHistory'].value}" - showShadow="#{notifyBean.attributesNotify['showShadow'].value}" - stack="exampleNotifyStack" - stayTime="#{notifyBean.attributesNotify['stayTime'].value}" - sticky="#{notifyBean.attributesNotify['sticky'].value}" - styleClass="#{notifyBean.attributesNotify['styleClass'].value}" - summary=" #{notifyBean.attributesNotify['title'].value}" - /> - - <rich:notifyStack id="exampleNotifyStack" - direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" - method="#{notifyBean.attributesNotifyStackFirst['method'].value}" - position="#{notifyBean.attributesNotifyStackFirst['position'].value}" - rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" - styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" /> - - <h:outputLabel for="number" value="Number (from 5 to 10)"/> - <h:inputText id="number" required="true"> - <f:validateLongRange minimum="5" maximum="10"/> - <a4j:ajax event="change" execute="@form"/> - </h:inputText> - - </h:form> - </ui:define> - - <ui:define name="outOfTemplateAfter"> - <h2>Attributes - Notify</h2> - <metamer:attributes value="#{notifyBean.attributesNotify}" id="attributesNotify" render="panel"/> - <h2>Attributes - Notify Messages</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyMessages}" id="attributesNotifyMessages" render="panel"/> - <h2>Attributes - Notify Stack</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyStackFirst}" id="attributesNotifyStack" render="panel"/> - </ui:define> - </ui:composition> - + <ui:define name="component"> + + <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" + delay="#{notifyBean.attributesNotifyMessages['delay'].value}" execute="{@form}" for="number" + globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" + hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" + keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" + interval="#{notifyBean.attributesNotifyMessages['interval'].value}" + nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" + showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" + showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" + showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" + showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" stack="exampleNotifyStack" + stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" + sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" + styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" /> + + <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" + delay="#{notifyBean.attributesNotify['delay'].value}" detail="#{notifyBean.attributesNotify['detail'].value}" + hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" + nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotify['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" + showHistory="#{notifyBean.attributesNotify['showHistory'].value}" + showShadow="#{notifyBean.attributesNotify['showShadow'].value}" stack="exampleNotifyStack" + stayTime="#{notifyBean.attributesNotify['stayTime'].value}" sticky="#{notifyBean.attributesNotify['sticky'].value}" + styleClass="#{notifyBean.attributesNotify['styleClass'].value}" + summary=" #{notifyBean.attributesNotify['title'].value}" /> + + <rich:notifyStack id="exampleNotifyStack" direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" + method="#{notifyBean.attributesNotifyStackFirst['method'].value}" + position="#{notifyBean.attributesNotifyStackFirst['position'].value}" + rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" + styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" /> + <h:form> + <h:outputLabel for="number" value="Number (from 5 to 10)" /> + <h:inputText id="number" required="true"> + <f:validateLongRange minimum="5" maximum="10" /> + <a4j:ajax event="change" execute="@form" /> + </h:inputText> + + </h:form> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <h2>Attributes - Notify</h2> + <metamer:attributes value="#{notifyBean.attributesNotify}" id="attributesNotify" render="panel" /> + <h2>Attributes - Notify Messages</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyMessages}" id="attributesNotifyMessages" render="panel" /> + <h2>Attributes - Notify Stack</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyStackFirst}" id="attributesNotifyStack" render="panel" /> + </ui:define> +</ui:composition> + </html> \ No newline at end of file Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richPickList/simple.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richPickList/simple.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richPickList/simple.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -112,6 +112,8 @@ sourceCaption="#{richPickListBean.attributes['sourceCaption'].value}" style="#{richPickListBean.attributes['style'].value}" styleClass="#{richPickListBean.attributes['styleClass'].value}" + switchByClick="#{richPickListBean.attributes['switchByClick'].value}" + switchByDblClick="#{richPickListBean.attributes['switchByDblClick'].value}" targetCaption="#{richPickListBean.attributes['targetCaption'].value}" upText="#{richPickListBean.attributes['upText'].value}" upTopText="#{richPickListBean.attributes['upTopText'].value}" Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -38,6 +38,11 @@ <metamer:testPageLink id="treeAdaptors" outcome="treeAdaptors" value="Tree Adaptors"> The <b>rich:tree</b> with declarative model using <b>rich:treeModelRecursiveAdaptor</b> and <b>rich:treeModelAdaptor</b>. </metamer:testPageLink> + + <metamer:testPageLink id="rf-10994" outcome="rf-10994" value="RF-10994"> + The simple sample of <b>rich:tree</b> and <b>DnD</b> simulation issue + <a href="https://issues.jboss.org/browse/RF-10994" target="_blank">RF-10994</a> + </metamer:testPageLink> </ui:define> Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml (from rev 22843, modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/rf-10994.xhtml) =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml (rev 0) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> + + <!-- +JBoss, Home of Professional Open Source +Copyright 2010-2011, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This software 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 software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + + <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="rich:tree with DnD" /> + + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="head"> + <h:outputStylesheet library="css" name="richDragAndDrop.css" /> + </ui:define> + + <ui:define name="component"> + + <h3><b>JIRA <a href="https://issues.jboss.org/browse/RF-10994">RF-10994<... simulation</b></h3> + + <p><i>Tree by default using ajax mode. So when you expanding nodes -leafs which getting loaded should be draggable.<br/> + But there is no draggable script resource so you could see JS errors instead saying that Draggable si not a constructor.<br/> + If change toggleType to client - works fine. + If add any draggable component to the page - it also starts works as scripts already inplace. + </i></p> + + <rich:dragIndicator id="indicator" /> + + <p> + <rich:tree value="#{richTreeBean.root}" nodeType="#{node.type}" var="node"> + + <rich:treeNode type="country" title="Country node type" expanded="#{richTreeBean.expanded[node]}" > + <a4j:outputPanel layout="block"> + <rich:dropTarget acceptedTypes="file" dropListener="#{richTreeBean.processDragging}" /> + <h:outputText value="#{node.name}" /> + </a4j:outputPanel> + </rich:treeNode> + + <rich:treeNode type="company" title="Company node type" expanded="#{richTreeBean.expanded[node]}" > + <a4j:outputPanel layout="block"> + <rich:dragSource type="file" dragIndicator="indicator" /> + <h:outputText value="#{node.name}" /> + </a4j:outputPanel> + </rich:treeNode> + + <rich:treeNode type="cd" title="CD node type" expanded="#{richTreeBean.expanded[node]}" > + <a4j:outputPanel layout="block"> + <h:outputText value="#{node.artist} - #{node.title}" /> + </a4j:outputPanel> + </rich:treeNode> + + </rich:tree> + </p> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + + <fieldset> + <legend>DnD in rich:tree</legend> + <metamer:attributes value="#{richTreeBean.attributes}" id="attributes" /> + </fieldset> + + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richValidator/single.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richValidator/single.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richValidator/single.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -48,59 +48,11 @@ <ui:define name="component"> <script type="text/javascript"> function setCorrectValues() { - var today = new Date(); - var inPast = new Date(today.getTime() - 4 * 24 * 3600 * 1000); - var inFuture = new Date(today.getTime() + 4 * 24 * 3600 * 1000); - - $('input[id$=assertTrue]')[0].checked = true; - $('input[id$=assertFalse]')[0].checked = false; - $('input[id$=decimalMinMax]').val('3'); - $('input[id$=digits]').val('2.567'); - $('input[id$=max]').val('9'); - $('input[id$=min]').val('4'); - $('input[id$=minMax]').val('4'); - $('input[id$=notEmpty]').val('RichFaces 4'); - $('input[id$=notNull]').val('RichFaces 4'); - $('input[id$=pattern]').val('richFaces 4'); - $('input[id$=regexp]').val('100'); - $('input[id$=custom]').val('RichFaces'); - $('input[id$=past]').val(inPast.format("d mmm yyyy")); - $('input[id$=future]').val(inFuture.format("d mmm yyyy")); - $('input[id$=stringSize]').val('JSF'); - $('input[value=A]')[0].checked=true - $('input[value=B]')[0].checked=true - $('input[value=C]')[0].checked=false - $('input[value=D]')[0].checked=false - $('input[value=E]')[0].checked=false - $('input[value=F]')[0].checked=false + $('input[id$=min]').val('4'); } - function setWrongValues() { - var today = new Date(); - var inPast = new Date(today.getTime() - 4 * 24 * 3600 * 1000); - var inFuture = new Date(today.getTime() + 4 * 24 * 3600 * 1000); - - $('input[id$=assertTrue]')[0].checked = false; - $('input[id$=assertFalse]')[0].checked = true; - $('input[id$=decimalMinMax]').val('10.668'); - $('input[id$=digits]').val('15.627123'); - $('input[id$=max]').val('122'); - $('input[id$=min]').val('-544'); - $('input[id$=minMax]').val('-5'); - $('input[id$=notEmpty]').val(''); - $('input[id$=notNull]').val(''); - $('input[id$=pattern]').val('@@@'); - $('input[id$=regexp]').val('@@@'); - $('input[id$=custom]').val('@@@'); - $('input[id$=past]').val(inFuture.format("d mmm yyyy")); - $('input[id$=future]').val(inPast.format("d mmm yyyy")); - $('input[id$=stringSize]').val('JSF 2'); - $('input[value=A]')[0].checked=false - $('input[value=B]')[0].checked=false - $('input[value=C]')[0].checked=false - $('input[value=D]')[0].checked=false - $('input[value=E]')[0].checked=false - $('input[value=F]')[0].checked=true + function setWrongValues() { + $('input[id$=min]').val('1'); } </script> @@ -108,8 +60,10 @@ <input id="setWrongValuesButton" type="button" value="set wrong values" onclick="setWrongValues()"/> <h:panelGrid columns="3"> - - <rich:validator data="#{richValidatorBean.attributes['data'].value}" + + <h:outputLabel for="min" value="#{minBean.description}" /> + <h:inputText id="min" value="#{minBean.value}" label="#{minBean.label}" converter="#{minBean.converter}"> + <rich:validator data="#{richValidatorBean.attributes['data'].value}" disabled="#{richValidatorBean.attributes['disabled'].value}" immediate="#{richValidatorBean.attributes['immediate'].value}" onbeforedomupdate="#{richValidatorBean.attributes['onbeforedomupdate'].value}" @@ -119,14 +73,9 @@ onerror="#{richValidatorBean.attributes['onerror'].value}" queueId="#{richValidatorBean.attributes['queueId'].value}" status="#{richValidatorBean.attributes['status'].value}" - > - - <h:outputLabel for="min" value="#{minBean.description}" /> - <h:inputText id="min" value="#{minBean.value}" label="#{minBean.label}" converter="#{minBean.converter}" /> + event="blur" /> + </h:inputText> <rich:message id="minMsg" for="min" /> - - - </rich:validator> </h:panelGrid> Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml 2011-10-26 11:00:28 UTC (rev 22844) @@ -447,6 +447,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.enabled</name> + <value>true</value> </property> </activation> <build> @@ -465,7 +466,7 @@ <artifactItem> <groupId>org.richfaces.tests</groupId> <artifactId>metamer</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>${deployable.version}</version> <type>war</type> <classifier>${deployable.classifier}</classifier> <overWrite>true</overWrite> @@ -488,6 +489,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.enabled</name> + <value>true</value> </property> </activation> <build> @@ -526,6 +528,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.compressedStages</name> + <value>true</value> </property> </activation> <build> @@ -563,6 +566,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.packedStages</name> + <value>true</value> </property> </activation> <build> @@ -600,6 +604,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.enabled</name> + <value>true</value> </property> </activation> <build> Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest/run-test-with-replace-context-params.sh =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest/run-test-with-replace-context-params.sh 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest/run-test-with-replace-context-params.sh 2011-10-26 11:00:28 UTC (rev 22844) @@ -1,2 +1,12 @@ #!/bin/bash -mvn clean package -Pjboss6x-mojarra -Dtemplates=plain -DcontainerId=jboss6x -Dcargo.jvmargs.additional=-Xmx1536m -Dcontainer.installer.url=file:///media/velkyDisk/Download/jboss-as-distribution-6.0.0.Final.zip -Dorg.richfaces.resourceMapping.enabled -Dorg.richfaces.resourceMapping.packedStages -Dorg.richfaces.resourceMapping.compressedStages -Dbrowser="*chrome /opt/firefox-3.5.5/firefox-bin" -Dtest=TestRichMenuItem -Ddeployable.location=$PWD/target/metamer-updated-jee6.war +mvn clean package -Pjboss6x-mojarra \ +-Dtemplates=plain \ +-DcontainerId=jboss6x \ +-Dcargo.jvmargs.additional=-Xmx1536m \ +-Dcontainer.installer.url=file:///media/velkyDisk/Download/jboss-as-distribution-6.0.0.Final.zip \ +-Dorg.richfaces.resourceMapping.enabled=true \ +-Dorg.richfaces.resourceMapping.packedStages=true \ +-Dorg.richfaces.resourceMapping.compressedStages=true \ +-Dbrowser="*chrome /opt/firefox-3.5.5/firefox-bin" \ +-Ddeployable.location=target/metamer-updated-jee6.war \ +-Dtest=TestRichMenuItem Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -53,6 +53,11 @@ protected final Attributes<NotifyStackAttributes> attributesStack = new Attributes<NotifyStackAttributes>(pjq("table.attributes[id$=attributesNotifyStack]")); /** + * attributes for test + */ + protected final Attributes<NotifyTestAttributes> attributesTest = new Attributes<NotifyTestAttributes>(pjq("table.attributes[id$=attributesBean]")); + + /** * notify locator which matches on all notifies and messages */ protected final JQueryLocator notify = jq("div.rf-ntf"); Copied: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java (from rev 22843, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java) =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java (rev 0) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -0,0 +1,35 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.ftest.richNotify; + +import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum; + +/** + * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a> + */ +public enum NotifyTestAttributes implements AttributeEnum { + + messageCount, + messageDetail, + messageText + +} Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -32,12 +32,11 @@ import java.util.Map; import org.jboss.test.selenium.css.CssProperty; -import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.waiting.NegationCondition; import org.jboss.test.selenium.waiting.selenium.SeleniumCondition; import org.richfaces.tests.metamer.bean.rich.RichNotifyBean; -import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -105,52 +104,33 @@ attributesNotify.set(NotifyAttributes.showHistory, true); assertTrue(selenium.isElementPresent(notifyHistory), "The showHistory is set to <true> and one notify is present, but there is no history menu."); close(notify); - produceMessage(notifyError, "Error", 1); - close(notify); - close(notify); // click on the All button in history menu selenium.click(notifyHistoryAll); - waitModel - .failWith("After clicking on <All> in history menu there should be all notifies. Expected <2>, found <" + getNumberOfNotifies() + ">") - .until(new SeleniumCondition() { - @Override - public boolean isTrue() { - return getNumberOfNotifies() == 2; - } - }); + waitGui + .failWith("After clicking on <All> in history menu there should be all notifies.") + .until(elementPresent.locator(notify)); close(notify); - close(notify); // click on the Last button in the history menu selenium.click(notifyHistoryLast); waitModel - .failWith("After clicking on <Last> in history menu there should be last notify. Expected <1>, found <" + getNumberOfNotifies() + ">") - .until(new SeleniumCondition() { - @Override - public boolean isTrue() { - return getNumberOfNotifies() == 1; - } - }); + .failWith("After clicking on <Last> in history menu there should be last notify.") + .until(elementPresent.locator(notify)); } @Test public void testAttributesStayTime() { // stayTime is set to a very high number - close(notify); - produceMessage(notifyError, "Error", 1); - close(notifyError); delay(1000); assertTrue(selenium.isElementPresent(notify), "The stayTime is set to very high number and after some little delay the notify is not present."); // set the stayTime to <500> attributesNotify.set(NotifyAttributes.stayTime, 500); - produceMessage(notifyError, "Error", 1); - close(notifyError); // wait for <1000> delay(1000); assertFalse(selenium.isElementPresent(notify), "The stayTime is set to 500 but after some delay the notify is still present."); } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11433") + @RegressionTest("https://issues.jboss.org/browse/RF-11433") public void testAttributeSticky() { // set the stayTime to <0> attributesNotify.set(NotifyAttributes.stayTime, 0); @@ -159,7 +139,7 @@ waitGui .failWith("The stayTime is set to <0> and sticky to <false>, so the notify shouldn't be present.") .until(NegationCondition.getInstance().condition(elementPresent.locator(notify))); - // produce messages and notifies and close messages + // produce messages and close them for(String type : messages.keySet()) { produceMessage(messages.get(type), type, 1); close(messages.get(type)); @@ -172,20 +152,14 @@ waitGui .failWith("The stayTime is set to <0> and sticky to <true>, so the notify should be present.") .until(elementPresent.locator(notify)); - closeAll(notify); - // produce messages and notifies and close messages + // produce messages and close them for(String type : messages.keySet()) { produceMessage(messages.get(type), type, 1); close(messages.get(type)); } - waitModel - .failWith("The stayTime is set to <0> and sticky to <true>, so the notifies should be present.") - .until(new SeleniumCondition() { - @Override - public boolean isTrue() { - return selenium.getCount(notify) == messages.size(); - } - }); + waitGui + .failWith("The stayTime is set to <0> and sticky to <true>, so the notify should be present.") + .until(elementPresent.locator(notify)); } @Test @@ -251,17 +225,16 @@ @Test public void testAttributeMessagesShowHistory() { // check whether the history isn't present (showHistory is set to <false>) - close(notify); assertFalse(selenium.isElementPresent(notifyHistory), "The showHistory is set to <false> and there shouldn't be any history menu."); // set the showHistory to <true> attributesMessages.set(NotifyMessagesAttributes.showHistory, true); + close(notify); // check whether the history isn't displayed (there is no message in the history) assertFalse(selenium.isElementPresent(notifyHistory), "The showHistory is set to <true>, but there is no message, so there shouldn't be any history menu."); // produce messages and close them for(String type : messages.keySet()) { produceMessage(messages.get(type), type, 1); - close(notify); - close(notify); + close(messages.get(type)); } // click on All button in the history menu selenium.click(notifyHistoryAll); @@ -361,21 +334,21 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11433") + @RegressionTest("https://issues.jboss.org/browse/RF-11433") public void testCloseAndProduceNotify() { // check closing the notify close(notify); waitGui .failWith("After closing notify message the message is stil present.") .until(NegationCondition.getInstance().condition(elementPresent.locator(notify))); - // check producing notifies + // check notify is not produced for(String type : messages.keySet()) { produceMessage(messages.get(type), type, 1); close(messages.get(type)); } waitGui - .failWith("After producing messages the correct number of notifies isn't present. Expected <" + messages.size() + ">, was <" + selenium.getCount(notify) + ">") - .until(countEquals.locator(notify).count(messages.size())); + .failWith("After producing messages there should be no notify. Expected <0>, was <" + selenium.getCount(notify) + ">") + .until(countEquals.locator(notify).count(0)); } @Test @@ -387,19 +360,16 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11433") + @RegressionTest("https://issues.jboss.org/browse/RF-11433") public void testProduceMoreMessages() { // set the messageCount to <testedNumber> int testedNumber = 3; - selenium.type(pjq("input[name*=messageCountInput]"), testedNumber + ""); - selenium.fireEvent(pjq("input[name*=messageCountInput]"), Event.BLUR); - selenium.waitForPageToLoad(); + attributesTest.set(NotifyTestAttributes.messageCount, testedNumber); close(notify); for(String type : messages.keySet()) { produceMessage(messages.get(type), type, testedNumber); - assertEquals(getNumberOfNotifies(), 1, "Number of produced messages has been set to <" + testedNumber + "> but number of notifies should be still <1>."); + assertEquals(getNumberOfNotifies(), 0, "Number of produced messages has been set to <" + testedNumber + "> but number of notifies should be still <0>."); closeAll(messages.get(type)); - close(notify); } } } Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/AbstractOrderingListTest.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/AbstractOrderingListTest.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/AbstractOrderingListTest.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -42,6 +42,8 @@ private JQueryLocator requestTime = jq("span#requestTime"); + private JQueryLocator phaseListenerFormat = jq("div#phasesPanel li:eq({0})"); + private JQueryLocator submitButton = pjq("input[id$=submitButton]"); protected static final Attributes<OrderingListAttributes> ATTRIBUTES = new Attributes<OrderingListAttributes>(); @@ -71,6 +73,10 @@ return orderingList; } + protected JQueryLocator getPhaseListener(int index) { + return phaseListenerFormat.format(index); + } + protected void moveBottom() { int beforeIndex = orderingList.getIndexOfSelectedItem(); String stateA = orderingList.getItemColumnValue(beforeIndex, 0); @@ -139,7 +145,6 @@ } protected void submit() { - String timeBefore = selenium.getText(requestTime); selenium.click(submitButton); selenium.waitForPageToLoad(); } Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -240,9 +240,13 @@ super.testStyle(getOrderingList().getLocator()); } - @Test(enabled=false) + @Test public void testValueChangeListener() { - + getOrderingList().selectItem(0); + getOrderingList().moveBottom(); + submit(); + assertTrue(selenium.isElementPresent(getPhaseListener(3))); + assertTrue(selenium.getText(getPhaseListener(3)).contains("*3 value changed")); } private void testSizeCssProperty(JQueryLocator element, OrderingListAttributes attribute, CssProperty cssProperty) { Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -22,9 +22,12 @@ package org.richfaces.tests.metamer.ftest.richValidator; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import java.net.URL; +import org.jboss.test.selenium.dom.Event; +import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.utils.URLUtils; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.testng.annotations.Test; @@ -40,6 +43,11 @@ * @version $Revision$ */ public class TestWrappingValidatorSingle extends AbstractValidatorsTest { + + private JQueryLocator input = pjq("input[id$=:min]"); + private JQueryLocator setCorrectValBtn = pjq("input[id$=setCorrectValuesButton]"); + private JQueryLocator a4jSubmitBtn = pjq("input[id$=a4jButton]"); + private JQueryLocator msg = pjq("span[id$=minMsg] span.rf-msg-err"); /** component page locator */ @Override @@ -48,16 +56,32 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11139") + @IssueTracking("https://issues.jboss.org/browse/RF-11576") public void testIntegerMin() { - selenium.click(pjq("input[id$=setCorrectValuesButton]")); + selenium.click(setCorrectValBtn); // integer input min - selenium.type(pjq("input[id$=:min]"), "-544"); - guardNoRequest(selenium).click(pjq("input[id$=a4jButton]")); + selenium.type(input, "1"); + guardNoRequest(selenium).click(a4jSubmitBtn); - waitGui.until(textEquals.locator(pjq("span[id$=minMsg] span.rf-msg-det")) - .text("must be greater than or equal to 2")); + waitGui.until(textEquals.locator(msg).text("must be greater than or equal to 2")); } + /** + * Check validation on input after blur event fired and no XHR request as well + * + */ + @Test + public void testValidateOnBlur() { + selenium.click(setCorrectValBtn); + + // integer input min + selenium.type(input , "1"); + + // no request (HTTP neither XHR) should be sent if validation fails + guardNoRequest(selenium).fireEvent(input, Event.BLUR); + + waitModel.until(textEquals.locator(msg).text("must be greater than or equal to 2")); + } + }