October 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r22773 - modules/tests/metamer/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-10 08:52:07 -0400 (Mon, 10 Oct 2011) New Revision: 22773 Modified: modules/tests/metamer/trunk/pom.xml Log: RichFaces version upgraded to 4.1.0.M3 Modified: modules/tests/metamer/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2011-10-10 12:43:08 UTC (rev 22772) +++ modules/tests/metamer/trunk/pom.xml 2011-10-10 12:52:07 UTC (rev 22773) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20111011-M3</version> </parent> <groupId>org.richfaces.tests</groupId> @@ -124,7 +124,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <richfaces.checkstyle.version>2</richfaces.checkstyle.version> - <version.richfaces>4.1.0-SNAPSHOT</version.richfaces> + <version.richfaces>4.1.0.20111011-M3</version.richfaces> </properties> <dependencyManagement>

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22772 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-10 08:43:08 -0400 (Mon, 10 Oct 2011) New Revision: 22772 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java Log: RFPL-1658: fix test for @readonly for rich:editor Since there is selenium test trying type into editor area while @readonly is set to true failing (it is possible to type text into are by selenium), but by hand is text refused, changing test code to verify apporpriate attributes in textarea and editor body only. Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-10-10 11:48:25 UTC (rev 22771) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-10-10 12:43:08 UTC (rev 22772) @@ -220,29 +220,16 @@ @IssueTracking("https://issues.jboss.org/browse/RFPL-1658") public void testReadonly() { - typeTextToEditor(text1); - - String currentText = getEditorText(); - assertTrue(currentText != null && currentText.contains(text1)); - editorAttributes.set(readonly, Boolean.TRUE); - // waitModel.until(elementPresent.locator(editor)); - typeTextToEditor("test"); - // assert that there is no "test" present in editor text area - currentText = getEditorText(); - assertFalse(currentText != null && currentText.contains("test")); + String readOnlyAttrVal = selenium.getAttribute( + editorTextArea.getAttribute(new Attribute("readonly"))); + assertTrue("readonly".equals(readOnlyAttrVal)); - // now set read-only back to false - editorAttributes.set(readonly, Boolean.FALSE); - // waitModel.until(elementPresent.locator(editor)); - - // and type another text - typeTextToEditor(text2); - - // now we should assert that only expected text are present - currentText = getEditorText(); - assertTrue(currentText != null && currentText.contains(text2)); + selenium.selectFrame(frameLocator); + String contentEditableVal = selenium.getAttribute( + editorArea.getAttribute(new Attribute("contenteditable"))); + assertTrue("false".equals(contentEditableVal)); } @Test

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22771 - modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-10 07:48:25 -0400 (Mon, 10 Oct 2011) New Revision: 22771 Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichComponentControlBean.properties Log: RFPL-1665: remove @operation=none from compoentControll. Since @operation is required attribute, removed option "none" with empty value Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichComponentControlBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichComponentControlBean.properties 2011-10-10 09:09:23 UTC (rev 22770) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichComponentControlBean.properties 2011-10-10 11:48:25 UTC (rev 22771) @@ -1,4 +1,3 @@ -attr.operation.none= attr.operation.first=first attr.operation.last=last attr.operation.previous=previous

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22770 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-10 05:09:23 -0400 (Mon, 10 Oct 2011) New Revision: 22770 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java Log: Fix problem with failing (skipping) tests on Tomcat There were full URL in second buildURL param instead of path to example page Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-10-10 02:04:36 UTC (rev 22769) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-10-10 09:09:23 UTC (rev 22770) @@ -59,7 +59,7 @@ private boolean recursiveLeafChildrenNullable; public URL getTestUrl() { - return buildUrl(contextPath, "http://localhost:8080/metamer/faces/components/richTree/treeAdaptors.xhtml"); + return buildUrl(contextPath, "/faces/components/richTree/treeAdaptors.xhtml"); } @BeforeMethod Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java 2011-10-10 02:04:36 UTC (rev 22769) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorToggling.java 2011-10-10 09:09:23 UTC (rev 22770) @@ -63,7 +63,7 @@ } public URL getTestUrl() { - return buildUrl(contextPath, "http://localhost:8080/metamer/faces/components/richTree/treeAdaptors.xhtml"); + return buildUrl(contextPath, "/faces/components/richTree/treeAdaptors.xhtml"); } @Test

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22769 - in modules/tests/metamer/trunk/application/src/main: webapp/components/a4jAjax and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-09 22:04:36 -0400 (Sun, 09 Oct 2011) New Revision: 22769 Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JAjaxBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml Log: RFPL-1424: add more components to check event handler Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JAjaxBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JAjaxBean.java 2011-10-06 20:38:24 UTC (rev 22768) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JAjaxBean.java 2011-10-10 02:04:36 UTC (rev 22769) @@ -53,6 +53,7 @@ private static Logger logger; private Attributes attributes; private String input; + private List<?> inputs; private List<String> cars; private String car; private boolean boolVal; @@ -199,4 +200,12 @@ public void causeErrorListener(AjaxBehaviorEvent event) { throw new FacesException("Ajax request caused an error. This is intentional behavior."); } + + public List<?> getInputs() { + return inputs; + } + + public void setInputs(List<?> inputs) { + this.inputs = inputs; + } } Added: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml 2011-10-10 02:04:36 UTC (rev 22769) @@ -0,0 +1,160 @@ +<?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:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> + +  + + <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:panelGrid columns="2"> + <h:column> + h:inputText: + </h:column> + <h:column> + <h:inputText id="simpleText1" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax listener="#{richBean.actionListener}" render="output" /> + </h:inputText> + </h:column> + + <h:column> + rich:accordion + </h:column> + <h:column> + <ui:remove> +  + </ui:remove> + </h:column> + + <h:column> + rich:autocomplete: + </h:column> + <h:column> + <rich:autocomplete id="autocomplete1" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax listener="#{richBean.actionListener}" render="output" /> + </rich:autocomplete> + </h:column> + + <h:column> + rich:calendar + </h:column> + <h:column> + <rich:calendar id="calendar" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax listener="#{richBean.actionListener}" render="output" /> + </rich:calendar> + </h:column> + + <h:column> + rich:editor + </h:column> + <h:column> + <ui:remove> +  + </ui:remove> + </h:column> + + <h:column> + rich:inplaceInput + </h:column> + <h:column> + <ui:remove> +  + </ui:remove> + </h:column> + + <h:column> + rich:inplaceSelect + </h:column> + <h:column> + <rich:inplaceSelect id="inplaceSelect" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <f:selectItem itemLabel="x" itemValue="x" /> + <f:selectItem itemLabel="y" itemValue="y" /> + <f:selectItem itemLabel="z" itemValue="z" /> + <a4j:ajax listener="#{richBean.actionListener}" render="output" /> + </rich:inplaceSelect> + </h:column> + + <h:column> + rich:inputNumberSlider + </h:column> + <h:column> + <rich:inputNumberSlider id="inputNumberSlider" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax listener="#{richBean.actionListener}" render="output" /> + </rich:inputNumberSlider> + </h:column> + + <h:column> + rich:inputNumberSpinner + </h:column> + <h:column> + <rich:inputNumberSpinner id="inputNumberSpinner" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax listener="#{richBean.actionListener}" render="output" /> + </rich:inputNumberSpinner> + </h:column> + + </h:panelGrid> + + <br/> + <a4j:outputPanel id="output" layout="block"> + Output: <h:outputText value="#{a4jAjaxBean.input}"/> + </a4j:outputPanel> + + </ui:define> + + <ui:define name="outOfTemplateAfter"> + + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml 2011-10-06 20:38:24 UTC (rev 22768) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml 2011-10-10 02:04:36 UTC (rev 22769) @@ -70,6 +70,21 @@ </h:column> <h:column> + rich:calendar + </h:column> + <h:column> + <rich:calendar id="calendar1" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:calendar> + </h:column> + <h:column> + <rich:calendar id="calendar2" value="#{a4jAjaxBean.input}" > + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:calendar> + </h:column> + + <h:column> rich:editor </h:column> <h:column> @@ -84,6 +99,73 @@ </rich:editor> </h:column> + <h:column> + rich:inplaceInput + </h:column> + <h:column> + <rich:inplaceInput id="inplaceInput1" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:inplaceInput> + </h:column> + <h:column> + <rich:inplaceInput id="inplaceInput2" value="#{a4jAjaxBean.input}" > + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:inplaceInput> + </h:column> + + <h:column> + rich:inplaceSelect + </h:column> + <h:column> + <rich:inplaceSelect id="inplaceSelect1" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <f:selectItem itemLabel="x" itemValue="x" /> + <f:selectItem itemLabel="y" itemValue="y" /> + <f:selectItem itemLabel="z" itemValue="z" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:inplaceSelect> + </h:column> + <h:column> + <rich:inplaceSelect id="inplaceSelect2" value="#{a4jAjaxBean.input}" > + <f:selectItem itemLabel="x" itemValue="x" /> + <f:selectItem itemLabel="y" itemValue="y" /> + <f:selectItem itemLabel="z" itemValue="z" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:inplaceSelect> + </h:column> + + <h:column> + rich:inputNumberSlider + </h:column> + <h:column> + <rich:inputNumberSlider id="inputNumberSlider1" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:inputNumberSlider> + </h:column> + <h:column> + <rich:inputNumberSlider id="inputNumberSlider2" value="#{a4jAjaxBean.input}"> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:inputNumberSlider> + </h:column> + + <h:column> + rich:inputNumberSpinner + </h:column> + <h:column> + <rich:inputNumberSpinner id="inputNumberSpinner1" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:inputNumberSpinner> + </h:column> + <h:column> + <rich:inputNumberSpinner id="inputNumberSpinner2" value="#{a4jAjaxBean.input}" + valueChangeListener="#{richBean.valueChangeListener}" > + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> + </rich:inputNumberSpinner> + </h:column> + </h:panelGrid> <br/> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml 2011-10-06 20:38:24 UTC (rev 22768) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/list.xhtml 2011-10-10 02:04:36 UTC (rev 22769) @@ -93,6 +93,10 @@ <metamer:testPageLink id="eventHandlers" outcome="eventHandlers" value="Event handlers for various components"> Simple page that contains <b>various components</b> with <b>a4j:ajax</b> with event handler to tests collisions on this attribute </metamer:testPageLink> + + <metamer:testPageLink id="defaultEventHandlers" outcome="defaultEventHandlers" value="Default event handlers for various components"> + Simple page that contains <b>various components</b> with <b>a4j:ajax</b> with default event handler + </metamer:testPageLink> </ui:define>

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22768 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richMenuItem and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-06 16:38:24 -0400 (Thu, 06 Oct 2011) New Revision: 22768 Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/MenuItemAttributes.java Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/Attributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java Log: RFPL-1656: update tests for rich:menuItem Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-10-06 12:19:09 UTC (rev 22767) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-10-06 20:38:24 UTC (rev 22768) @@ -24,6 +24,7 @@ import org.richfaces.tests.metamer.ftest.richGraphValidator.GraphValidatorAttributes; import org.richfaces.tests.metamer.ftest.richJQuery.RichJQueryAttributes; import org.richfaces.tests.metamer.ftest.richList.ListAttributes; +import org.richfaces.tests.metamer.ftest.richMenuItem.MenuItemAttributes; import org.richfaces.tests.metamer.ftest.richMessage.MessageAttributes; import org.richfaces.tests.metamer.ftest.richPanelMenu.PanelMenuAttributes; import org.richfaces.tests.metamer.ftest.richPanelMenuGroup.PanelMenuGroupAttributes; @@ -63,5 +64,6 @@ public static Attributes<PanelMenuItemAttributes> panelMenuItemAttributes = new Attributes<PanelMenuItemAttributes>(); public static Attributes<PickListAttributes> pickListAttributes = new Attributes<PickListAttributes>(); public static Attributes<TreeAttributes> treeAttributes = new Attributes<TreeAttributes>(jq("span[id*=attributes]")); + public static Attributes<MenuItemAttributes> menuItemAttributes = new Attributes<MenuItemAttributes>(); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/Attributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/Attributes.java 2011-10-06 12:19:09 UTC (rev 22767) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/Attributes.java 2011-10-06 20:38:24 UTC (rev 22768) @@ -18,6 +18,8 @@ import org.jboss.test.selenium.locator.ElementLocator; import org.jboss.test.selenium.locator.ExtendedLocator; import org.jboss.test.selenium.locator.JQueryLocator; +import org.jboss.test.selenium.locator.LocatorFactory; +import org.jboss.test.selenium.locator.option.OptionLabelLocator; import org.jboss.test.selenium.locator.option.OptionValueLocator; import org.jboss.test.selenium.locator.reference.LocatorReference; import org.jboss.test.selenium.locator.reference.ReferencedLocator; @@ -32,7 +34,7 @@ protected AjaxSelenium selenium = AjaxSeleniumProxy.getInstance(); LocatorReference<ExtendedLocator<JQueryLocator>> root = new LocatorReference<ExtendedLocator<JQueryLocator>>(pjq("")); - ReferencedLocator<JQueryLocator> propertyLocator = referenceInferred(root, ":input[id*=:{0}Input]{1}"); + ReferencedLocator<JQueryLocator> propertyLocator = referenceInferred(root, ":input[id*={0}Input]{1}"); RequestType requestType = RequestType.HTTP; @@ -127,10 +129,10 @@ if (value == null) { value = ""; } + + String valueAsString = value.toString(); + // System.out.println("\n ###setting following value as string: '" + valueAsString + "'"); - String valueAsString = value.toString(); - System.out.println("\n ###setting following value as string: '" + valueAsString + "'"); - if ("text".equals(inputType)) { applyText(locator, valueAsString); } else if ("checkbox".equals(inputType)) { @@ -139,7 +141,7 @@ } else if ("radio".equals(inputType)) { locator = propertyLocator.format(propertyName, "[value=" + ("".equals(valueAsString) ? "null" : valueAsString) + "]"); - + if (!selenium.isChecked(locator)) { applyRadio(locator); } @@ -177,7 +179,15 @@ protected void applySelect(ElementLocator<?> locator, String value) { OptionValueLocator optionLocator = new OptionValueLocator(value); - guard(selenium, requestType).select(locator, optionLocator); + + LocatorFactory.jq(locator.getRawLocator()); + JQueryLocator fullLocator = jq(locator.getRawLocator()).getChild(jq(optionLocator.getRawLocator())); + if (selenium.isElementPresent(fullLocator)) { + guard(selenium, requestType).select(locator, optionLocator); + } else { + OptionLabelLocator optionLabelLocator = new OptionLabelLocator(value); + guard(selenium, requestType).select(locator, optionLabelLocator); + } } private class RepeatForElementNotFound implements CommandInterceptor { Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/MenuItemAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/MenuItemAttributes.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/MenuItemAttributes.java 2011-10-06 20:38:24 UTC (rev 22768) @@ -0,0 +1,65 @@ +/******************************************************************************* + * 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.richMenuItem; + +import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum; + +/** + * Attributes for rich:menuItem component + * + * @author <a href="mailto:jjamrich@redhat.com">Jan Jamrich</a> + * + * @version $Revision$ + */ +public enum MenuItemAttributes implements AttributeEnum { + bypassUpdates, + data, + dir, + disabled, + execute, + icon, + iconDisabled, + immediate, + label, + lang, + limitRender, + mode, + onbeforedomupdate, + onbegin, + onclick, + oncomplete, + ondblclick, + onkeydown, + onkeypress, + onkeyup, + onmousedown, + onmousemove, + onmouseout, + onmouseover, + onmouseup, + render, + rendered, + status, + style, + styleClass, + title +} Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-10-06 12:19:09 UTC (rev 22767) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-10-06 20:38:24 UTC (rev 22768) @@ -32,6 +32,8 @@ import static org.testng.Assert.assertNotSame; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.menuItemAttributes; +import static org.richfaces.tests.metamer.ftest.richMenuItem.MenuItemAttributes.*; import java.net.URL; @@ -43,7 +45,6 @@ import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; -import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.testng.annotations.Test; /** @@ -123,9 +124,8 @@ @Test public void testBypassUpdates() { - selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); - selenium.waitForPageToLoad(); - + menuItemAttributes.set(bypassUpdates, Boolean.TRUE); + String reqTime = selenium.getText(time); selenium.mouseOver(fileMenuLabel); guardXhr(selenium).click(menuItem1); @@ -142,11 +142,9 @@ @Test public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); + menuItemAttributes.set(data, "RichFaces 4"); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); + menuItemAttributes.set(oncomplete, "data = event.data"); String reqTime = selenium.getText(time); selenium.mouseOver(fileMenuLabel); @@ -164,8 +162,7 @@ @Test public void testDisabled() { - selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); - selenium.waitForPageToLoad(); + menuItemAttributes.set(disabled, Boolean.TRUE); assertTrue(selenium.belongsClass(menuItem1, "rf-ddm-itm-dis"), "Menu item should have class \"rf-ddm-itm-dis\"."); @@ -176,8 +173,7 @@ @Test public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "@this executeChecker"); - selenium.waitForPageToLoad(); + menuItemAttributes.set(execute, "@this executeChecker"); String reqTime = selenium.getText(time); selenium.mouseOver(fileMenuLabel); @@ -198,18 +194,18 @@ public void testIcon() { AttributeLocator<?> attr = image.getAttribute(Attribute.SRC); - selenium.select(pjq("select[id$=iconInput]"), optionLabel("star")); - selenium.waitForPageToLoad(); + // selenium.select(pjq("select[id$=iconInput]"), optionLabel("star")); + menuItemAttributes.set(icon, "star"); assertTrue(selenium.getAttribute(attr).contains("star.png"), "Image's src attribute should contain \"star.png\"."); - selenium.select(pjq("select[id$=iconInput]"), optionLabel("nonexisting")); - selenium.waitForPageToLoad(); + // selenium.select(pjq("select[id$=iconInput]"), optionLabel("nonexisting")); + menuItemAttributes.set(icon, "nonexisting"); assertTrue(selenium.getAttribute(attr).contains("nonexisting"), "Image's src attribute should contain \"nonexisting\"."); - selenium.select(pjq("select[id$=iconInput]"), optionLabel("null")); - selenium.waitForPageToLoad(); + // selenium.select(pjq("select[id$=iconInput]"), optionLabel("null")); + menuItemAttributes.set(icon, "null"); assertFalse(selenium.isElementPresent(image), "Icon should not be present."); assertTrue(selenium.isElementPresent(menuItem1.getDescendant(jq("div.rf-ddm-emptyIcon"))), "Empty icon should be present."); @@ -217,8 +213,7 @@ @Test public void testIconDisabled() { - selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); - selenium.waitForPageToLoad(); + menuItemAttributes.set(disabled, Boolean.TRUE); AttributeLocator<?> attr = image.getAttribute(Attribute.SRC); @@ -226,21 +221,20 @@ assertTrue(selenium.isElementPresent(menuItem1.getDescendant(jq("div.rf-ddm-emptyIcon"))), "Empty icon should be present."); - selenium.select(pjq("select[id$=iconDisabledInput]"), optionLabel("star")); - selenium.waitForPageToLoad(); + // selenium.select(pjq("select[id$=iconDisabledInput]"), optionLabel("star")); + menuItemAttributes.set(iconDisabled, "star"); assertTrue(selenium.getAttribute(attr).contains("star.png"), "Image's src attribute should contain \"star.png\"."); - selenium.select(pjq("select[id$=iconDisabledInput]"), optionLabel("nonexisting")); - selenium.waitForPageToLoad(); + // selenium.select(pjq("select[id$=iconDisabledInput]"), optionLabel("nonexisting")); + menuItemAttributes.set(iconDisabled, "nonexisting"); assertTrue(selenium.getAttribute(attr).contains("nonexisting"), "Image's src attribute should contain \"nonexisting\"."); } @Test public void testImmediate() { - selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); - selenium.waitForPageToLoad(); + menuItemAttributes.set(immediate, Boolean.TRUE); String reqTime = selenium.getText(time); selenium.mouseOver(fileMenuLabel); @@ -257,8 +251,7 @@ @Test public void testLabel() { - selenium.type(pjq("input[type=text][id$=labelInput]"), "new label"); - selenium.waitForPageToLoad(); + menuItemAttributes.set(MenuItemAttributes.label, "new label"); assertEquals(selenium.getText(label), "new label", "New label of first menu item."); } @@ -270,8 +263,7 @@ @Test public void testLimitRender() { - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); + menuItemAttributes.set(limitRender, Boolean.TRUE); String reqTime = selenium.getText(time); selenium.mouseOver(fileMenu); @@ -283,6 +275,8 @@ @Test public void testMode() { String reqTime = selenium.getText(time); + + // test for @mode=ajax selenium.mouseOver(fileMenu); guardXhr(selenium).click(menuItem1); waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); @@ -295,8 +289,8 @@ listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(6)")); assertEquals(listenerOutput, "* action invoked", "Action's output"); - selenium.click(pjq("input[name$=modeInput][value=server]")); - selenium.waitForPageToLoad(); + // test for @mode=server + menuItemAttributes.set(mode, "server"); selenium.mouseOver(fileMenu); guardHttp(selenium).click(menuItem1); @@ -308,16 +302,14 @@ assertEquals(listenerOutput, "* action listener invoked", "Action listener's output"); listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(6)")); assertEquals(listenerOutput, "* action invoked", "Action's output"); + } @Test public void testEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); + menuItemAttributes.set(onbegin, "metamerEvents += \"begin \""); + menuItemAttributes.set(onbeforedomupdate, "metamerEvents += \"beforedomupdate \""); + menuItemAttributes.set(oncomplete, "metamerEvents += \"complete \""); selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); @@ -385,8 +377,7 @@ @Test public void testRendered() { - selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); - selenium.waitForPageToLoad(); + menuItemAttributes.set(rendered, Boolean.FALSE); assertFalse(selenium.isElementPresent(menuItem1), "Menu item should not be rendered when rendered=false."); assertTrue(selenium.isDisplayed(menuItem1), "Menu item should be displayed when item 1 is not rendered.");

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22767 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-06 08:19:09 -0400 (Thu, 06 Oct 2011) New Revision: 22767 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java Log: RF-10200: remove IssueTracking to resolved and closed JIRA Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-10-05 13:02:47 UTC (rev 22766) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-10-06 12:19:09 UTC (rev 22767) @@ -281,7 +281,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10200") public void testMode() { String reqTime = selenium.getText(time); selenium.mouseOver(fileMenu);

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22766 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich.

by richfaces-svn-commits＠lists.jboss.org

Author: jpapouse Date: 2011-10-05 09:02:47 -0400 (Wed, 05 Oct 2011) New Revision: 22766 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichNotifyBean.java Log: RF-11391: removed styleClass attribute from attributes for notifyStack Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichNotifyBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichNotifyBean.java 2011-10-05 09:47:50 UTC (rev 22765) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichNotifyBean.java 2011-10-05 13:02:47 UTC (rev 22766) @@ -85,13 +85,11 @@ attributesNotifyStackFirst.setAttribute("method", "first"); attributesNotifyStackFirst.setAttribute("position", "topRight"); attributesNotifyStackFirst.setAttribute("rendered", true); - attributesNotifyStackFirst.setAttribute("styleClass", "topRight"); attributesNotifyStackSecond.setAttribute("direction", "vertical"); attributesNotifyStackSecond.setAttribute("method", "first"); attributesNotifyStackSecond.setAttribute("position", "bottomRight"); attributesNotifyStackSecond.setAttribute("rendered", true); - attributesNotifyStackSecond.setAttribute("styleClass", "bottomRight"); attributesBean.setAttribute("messageCount", "1"); attributesBean.setAttribute("messageDetail", DEFAULT_DETAIL);

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22765 - modules/tests/metamer/trunk/application/src/main/webapp/templates.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-05 05:47:50 -0400 (Wed, 05 Oct 2011) New Revision: 22765 Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml Log: browser detection fixed Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml 2011-10-04 13:45:17 UTC (rev 22764) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml 2011-10-05 09:47:50 UTC (rev 22765) @@ -1,9 +1,9 @@ <?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:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:c="http://java.sun.com/jsp/jstl/core"> -  - <ui:composition> - <hr style="width: 1050px; margin-left: 0px;" /> +<ui:composition> + <hr style="width: 1050px; margin-left: 0px;" /> - <ul> - <li><h:outputText id="richfacesVersion" value="#{metamer.richFacesVersion}" /></li> - <li><h:outputText id="metamerVersion" value="#{metamer.shortVersion}" /></li> - <li><h:outputText id="jsfVersion" value="#{metamer.jsfVersion}" /></li> - <li><h:outputText id="serverVersion" value="#{metamer.serverVersion}" /></li> - <li><h:outputText id="javaVersion" value="#{metamer.javaVersion}" /> @ <h:outputText id="osVersion" - value="#{metamer.osVersion}" /></li> - <li><h:outputText id="browserVersion" value="#{metamer.browserVersion}" /></li> - </ul> + <ul> + <li><h:outputText id="richfacesVersion" value="#{metamer.richFacesVersion}" /></li> + <li><h:outputText id="metamerVersion" value="#{metamer.shortVersion}" /></li> + <li><h:outputText id="jsfVersion" value="#{metamer.jsfVersion}" /></li> + <li><h:outputText id="serverVersion" value="#{metamer.serverVersion}" /></li> + <li><h:outputText id="javaVersion" value="#{metamer.javaVersion}" /> @ <h:outputText id="osVersion" + value="#{metamer.osVersion}" /></li> + <li><h:outputText id="browserVersion" value="#{metamer.browserVersion}" /></li> + </ul> -  - <c:if test="#{metamer.projectStage != 'Production'}"> - <h:outputScript name="jquery.js" target="head"/> - <h:outputScript library="script" name="detect-browser.js" target="head"/> - <script type="text/javascript"> +  + + <h:outputScript name="jquery.js" target="head" /> + <h:outputScript library="script" name="detect-browser.js" target="head" /> + <script type="text/javascript"> jQuery("span[id$=browserVersion]").text(jQuery.browser.name + ' ' + jQuery.browser.version + ' @ ' + jQuery.browser.os); - </script> + </script> - </c:if> - - </ui:composition> +</ui:composition> </html> \ No newline at end of file

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22764 - modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-04 09:45:17 -0400 (Tue, 04 Oct 2011) New Revision: 22764 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml Log: RFPL-1424: Add rich:autocomplete and rich:editor example Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml 2011-10-03 12:24:59 UTC (rev 22763) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml 2011-10-04 13:45:17 UTC (rev 22764) @@ -62,12 +62,28 @@ valueChangeListener="#{richBean.valueChangeListener}" > <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> </rich:autocomplete> - </h:column> + </h:column> + <h:column> <rich:autocomplete id="autocomplete2" value="#{a4jAjaxBean.input}"> <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> </rich:autocomplete> + </h:column> + <h:column> + rich:editor </h:column> + <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" /> + </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" /> + </rich:editor> + </h:column> + </h:panelGrid> <br/>

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits October 2011