September 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r22700 - modules/tests/metamer/tags.

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

Author: ppitonak(a)redhat.com Date: 2011-09-10 17:04:11 -0400 (Sat, 10 Sep 2011) New Revision: 22700 Added: modules/tests/metamer/tags/metamer-4.1.0.20110910-M2/ Log: [maven-release-plugin] copy for tag metamer-4.1.0.20110910-M2

12 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r22699 - in modules/tests/metamer/trunk: application and 2 other directories.

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

Author: ppitonak(a)redhat.com Date: 2011-09-10 17:03:44 -0400 (Sat, 10 Sep 2011) New Revision: 22699 Modified: modules/tests/metamer/trunk/application/pom.xml modules/tests/metamer/trunk/ftest-source/pom.xml modules/tests/metamer/trunk/ftest/pom.xml modules/tests/metamer/trunk/pom.xml Log: [maven-release-plugin] prepare release metamer-4.1.0.20110910-M2 Modified: modules/tests/metamer/trunk/application/pom.xml =================================================================== --- modules/tests/metamer/trunk/application/pom.xml 2011-09-10 20:59:40 UTC (rev 22698) +++ modules/tests/metamer/trunk/application/pom.xml 2011-09-10 21:03:44 UTC (rev 22699) @@ -19,7 +19,7 @@ <parent> <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20110910-M2</version> </parent> <groupId>org.richfaces.tests</groupId> Modified: modules/tests/metamer/trunk/ftest/pom.xml =================================================================== --- modules/tests/metamer/trunk/ftest/pom.xml 2011-09-10 20:59:40 UTC (rev 22698) +++ modules/tests/metamer/trunk/ftest/pom.xml 2011-09-10 21:03:44 UTC (rev 22699) @@ -19,8 +19,7 @@ USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -31,14 +30,14 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-ftest</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20110910-M2</version> <name>Metamer: RichFaces Testing Application - Functional Test</name> <packaging>pom</packaging> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection> - <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection> + <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url> </scm> <licenses> @@ -81,8 +80,8 @@ <properties> <context.path>/metamer/</context.path> <deployable.classifier>mojarra</deployable.classifier> - <deployable.version>4.1.0-SNAPSHOT</deployable.version> - <ftest.source.version>4.1.0-SNAPSHOT</ftest.source.version> + <deployable.version>4.1.0.20110910-M2</deployable.version> + <ftest.source.version>4.1.0.20110910-M2</ftest.source.version> <testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml> <container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home> <jsf.config>Mojarra-2.0</jsf.config> Modified: modules/tests/metamer/trunk/ftest-source/pom.xml =================================================================== --- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-09-10 20:59:40 UTC (rev 22698) +++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-09-10 21:03:44 UTC (rev 22699) @@ -25,7 +25,7 @@ <parent> <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20110910-M2</version> </parent> <groupId>org.richfaces.tests</groupId> Modified: modules/tests/metamer/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2011-09-10 20:59:40 UTC (rev 22698) +++ modules/tests/metamer/trunk/pom.xml 2011-09-10 21:03:44 UTC (rev 22699) @@ -31,7 +31,7 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20110910-M2</version> <packaging>pom</packaging> <name>Metamer: RichFaces Testing Application - Project Root</name> @@ -50,9 +50,9 @@ </licenses> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection> + <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url> </scm> <distributionManagement>

12 years, 7 months

1
0
0 / 0

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

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

Author: ppitonak(a)redhat.com Date: 2011-09-10 16:59:40 -0400 (Sat, 10 Sep 2011) New Revision: 22698 Modified: modules/tests/metamer/trunk/pom.xml Log: RichFaces version upgraded Modified: modules/tests/metamer/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2011-09-10 20:57:48 UTC (rev 22697) +++ modules/tests/metamer/trunk/pom.xml 2011-09-10 20:59:40 UTC (rev 22698) @@ -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.20110910-M2</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.20110910-M2</version.richfaces> </properties> <dependencyManagement>

12 years, 7 months

1
0
0 / 0

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

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

Author: ppitonak(a)redhat.com Date: 2011-09-10 16:57:48 -0400 (Sat, 10 Sep 2011) New Revision: 22697 Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichCollapsiblePanelBean.properties modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java Log: added transparent icon Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichCollapsiblePanelBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichCollapsiblePanelBean.properties 2011-09-09 14:58:26 UTC (rev 22696) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichCollapsiblePanelBean.properties 2011-09-10 20:57:48 UTC (rev 22697) @@ -8,6 +8,7 @@ attr.leftCollapsedIcon.chevron=chevron attr.leftCollapsedIcon.chevronUp=chevronUp attr.leftCollapsedIcon.chevronDown=chevronDown +attr.leftCollapsedIcon.transparent=transparent attr.leftCollapsedIcon.triangle=triangle attr.leftCollapsedIcon.triangleUp=triangleUp attr.leftCollapsedIcon.triangleDown=triangleDown @@ -21,6 +22,7 @@ attr.leftExpandedIcon.chevron=chevron attr.leftExpandedIcon.chevronUp=chevronUp attr.leftExpandedIcon.chevronDown=chevronDown +attr.leftExpandedIcon.transparent=transparent attr.leftExpandedIcon.triangle=triangle attr.leftExpandedIcon.triangleUp=triangleUp attr.leftExpandedIcon.triangleDown=triangleDown @@ -34,6 +36,7 @@ attr.rightCollapsedIcon.chevron=chevron attr.rightCollapsedIcon.chevronUp=chevronUp attr.rightCollapsedIcon.chevronDown=chevronDown +attr.rightCollapsedIcon.transparent=transparent attr.rightCollapsedIcon.triangle=triangle attr.rightCollapsedIcon.triangleUp=triangleUp attr.rightCollapsedIcon.triangleDown=triangleDown @@ -47,6 +50,7 @@ attr.rightExpandedIcon.chevron=chevron attr.rightExpandedIcon.chevronUp=chevronUp attr.rightExpandedIcon.chevronDown=chevronDown +attr.rightExpandedIcon.transparent=transparent attr.rightExpandedIcon.triangle=triangle attr.rightExpandedIcon.triangleUp=triangleUp attr.rightExpandedIcon.triangleDown=triangleDown Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-09-09 14:58:26 UTC (rev 22696) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-09-10 20:57:48 UTC (rev 22697) @@ -140,9 +140,9 @@ // icon=null assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up-hdr"), - "Div should have set class rf-ico-chevron-up-hdr."); + "Div should have set class rf-ico-chevron-up-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("chevronUp.png"), - "Icon should contain a chevron up."); + "Icon should contain a chevron up."); verifyStandardIcons(input, icon, image); } @@ -155,9 +155,9 @@ // icon=null assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down-hdr"), - "Div should have set class rf-ico-chevron-down-hdr."); + "Div should have set class rf-ico-chevron-down-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("chevronDown.png"), - "Icon should contain a chevron down."); + "Icon should contain a chevron down."); verifyStandardIcons(input, icon, image); } @@ -372,56 +372,62 @@ private void verifyStandardIcons(JQueryLocator input, JQueryLocator icon, JQueryLocator image) { selenium.select(input, optionLabel("chevron")); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-hdr"), - "Div should have set class rf-ico-chevron-hdr."); + assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-hdr"), "Div should have set class rf-ico-chevron-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("chevron.png"), - "Icon should contain a chevron."); + "Icon should contain a chevron."); selenium.select(input, optionLabel("chevronDown")); selenium.waitForPageToLoad(); assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down-hdr"), - "Div should have set class rf-ico-chevron-down-hdr."); + "Div should have set class rf-ico-chevron-down-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("chevronDown.png"), - "Icon should contain a chevron down."); + "Icon should contain a chevron down."); selenium.select(input, optionLabel("chevronUp")); selenium.waitForPageToLoad(); assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up-hdr"), - "Div should have set class rf-ico-chevron-up-hdr."); + "Div should have set class rf-ico-chevron-up-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("chevronUp.png"), - "Icon should contain a chevron up."); + "Icon should contain a chevron up."); + selenium.select(input, optionLabel("transparent")); + selenium.waitForPageToLoad(); + assertTrue(selenium.belongsClass(icon, "rf-ico-transparent-hdr"), + "Div should have set class rf-ico-transparent-hdr."); + assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).equals("none"), + "Icon should not contain any image."); + selenium.select(input, optionLabel("disc")); selenium.waitForPageToLoad(); assertTrue(selenium.belongsClass(icon, "rf-ico-disc-hdr"), "Div should have set class rf-ico-disc-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("disc.png"), - "Icon should contain a disc."); + "Icon should contain a disc."); selenium.select(input, optionLabel("grid")); selenium.waitForPageToLoad(); assertTrue(selenium.belongsClass(icon, "rf-ico-grid-hdr"), "Div should have set class rf-ico-grid-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("grid.png"), - "Icon should contain a grid."); + "Icon should contain a grid."); selenium.select(input, optionLabel("triangle")); selenium.waitForPageToLoad(); assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-hdr"), "Div should have set class rf-ico-triangle-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("triangle.png"), - "Icon should contain a triangle."); + "Icon should contain a triangle."); selenium.select(input, optionLabel("triangleDown")); selenium.waitForPageToLoad(); assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-down-hdr"), - "Div should have set class rf-ico-triangle-down-hdr."); + "Div should have set class rf-ico-triangle-down-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("triangleDown.png"), - "Icon should contain a triangle down."); + "Icon should contain a triangle down."); selenium.select(input, optionLabel("triangleUp")); selenium.waitForPageToLoad(); assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-up-hdr"), - "Div should have set class rf-ico-triangle-up-hdr."); + "Div should have set class rf-ico-triangle-up-hdr."); assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("triangleUp.png"), - "Icon should contain a triangle up."); + "Icon should contain a triangle up."); selenium.select(input, optionLabel("none")); selenium.waitForPageToLoad(); @@ -432,13 +438,13 @@ assertFalse(selenium.isElementPresent(icon), "Icon's div should not be present when icon=star."); assertTrue(selenium.isElementPresent(image), "Icon's image should be rendered."); assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("star.png"), - "Icon's src attribute should contain star.png."); + "Icon's src attribute should contain star.png."); selenium.select(input, optionLabel("nonexisting")); selenium.waitForPageToLoad(); assertFalse(selenium.isElementPresent(icon), "Icon's div should not be present when icon=nonexisting."); assertTrue(selenium.isElementPresent(image), "Icon's image should be rendered."); assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("nonexisting"), - "Icon's src attribute should contain nonexisting."); + "Icon's src attribute should contain nonexisting."); } }

12 years, 7 months

1
0
0 / 0

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

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

Author: jjamrich Date: 2011-09-09 10:58:26 -0400 (Fri, 09 Sep 2011) New Revision: 22696 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml Log: rfpl-1621: Change columnVar attribute to var according to RF-11208 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml 2011-09-09 10:50:55 UTC (rev 22695) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml 2011-09-09 14:58:26 UTC (rev 22696) @@ -42,7 +42,6 @@ addAllText="#{richPickListBean.attributes['addAllText'].value}" addText="#{richPickListBean.attributes['addText'].value}" columnClasses="#{richPickListBean.attributes['columnClasses'].value}" - columnVar="tmp" disabled="#{richPickListBean.attributes['disabled'].value}" disabledClass="#{richPickListBean.attributes['disabledClass'].value}" downBottomText="#{richPickListBean.attributes['downBottomText'].value}" @@ -118,7 +117,8 @@ upTopText="#{richPickListBean.attributes['upTopText'].value}" validator="#{richPickListBean.validatePickListValue}" value="#{richPickListBean.value}" - valueChangeListener="#{richBean.valueChangeListenerImproved}"> + valueChangeListener="#{richBean.valueChangeListenerImproved}" + var="tmp"> <f:selectItems value="#{richPickListBean.capitals}" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml 2011-09-09 10:50:55 UTC (rev 22695) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/simple.xhtml 2011-09-09 14:58:26 UTC (rev 22696) @@ -40,8 +40,7 @@ <rich:pickList id="pickList" addAllText="#{richPickListBean.attributes['addAllText'].value}" addText="#{richPickListBean.attributes['addText'].value}" - columnClasses="#{richPickListBean.attributes['columnClasses'].value}" - columnVar="#{richPickListBean.attributes['columnVar'].value}" + columnClasses="#{richPickListBean.attributes['columnClasses'].value}" disabled="#{richPickListBean.attributes['disabled'].value}" disabledClass="#{richPickListBean.attributes['disabledClass'].value}" downBottomText="#{richPickListBean.attributes['downBottomText'].value}" @@ -110,8 +109,11 @@ styleClass="#{richPickListBean.attributes['styleClass'].value}" targetCaption="#{richPickListBean.attributes['targetCaption'].value}" upText="#{richPickListBean.attributes['upText'].value}" - upTopText="#{richPickListBean.attributes['upTopText'].value}" validator="#{richPickListBean.validatePickListValue}" - value="#{richPickListBean.value}" valueChangeListener="#{richBean.valueChangeListenerImproved}"> + upTopText="#{richPickListBean.attributes['upTopText'].value}" + validator="#{richPickListBean.validatePickListValue}" + value="#{richPickListBean.value}" + valueChangeListener="#{richBean.valueChangeListenerImproved}" + var="#{richPickListBean.attributes['var'].value}"> <f:selectItems value="#{richPickListBean.validationOptions}" />

12 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r22695 - 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-09-09 06:50:55 -0400 (Fri, 09 Sep 2011) New Revision: 22695 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/RichEditorComponentAttribute.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java Log: RFPL-1637: add tests for new attributes and fix some locator changed when refactored editor component Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/RichEditorComponentAttribute.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/RichEditorComponentAttribute.java 2011-09-08 21:55:07 UTC (rev 22694) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/RichEditorComponentAttribute.java 2011-09-09 10:50:55 UTC (rev 22695) @@ -36,6 +36,10 @@ setProperty("immediate", immediate); } + public void setLang(String lang) { + setProperty("lang", lang); + } + public void setHeight(String height) { setProperty("height", height); } 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-09-08 21:55:07 UTC (rev 22694) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-09-09 10:50:55 UTC (rev 22695) @@ -34,8 +34,8 @@ private static final Logger LOG = LoggerFactory.getLogger(TestRichEditor.class); - private JQueryLocator editor = pjq("span[id$=:editor]"); - private JQueryLocator editorTextArea = pjq("textarea[id$=:editor]"); + private JQueryLocator editor = pjq("span[id$=editor:inp]"); + private JQueryLocator editorTextArea = pjq("textarea[id$=editor:inp]"); private JQueryLocator editorArea = jq("body"); private JQueryLocator phaseListenerFormat = jq("div#phasesPanel li:eq({0})"); private FrameLocator frameLocator = new FrameLocator("jquery=iframe"); @@ -46,6 +46,7 @@ private JQueryLocator editorToolbarGroup = jq("span.cke_toolbar"); private Attribute styleAttribute = new Attribute("style"); + private Attribute langAttribute = new Attribute("lang"); public enum toolbarGroup { FILE_SAVE(7), @@ -188,6 +189,16 @@ } @Test + public void testLang() { + String langVal = "xyz"; + attributes.setLang(langVal); + + // there is lang attribute present in 2 editor's elements + assertTrue(langVal.equals(selenium.getAttribute(editorTextArea.getAttribute(langAttribute)))); + assertTrue(langVal.equals(selenium.getAttribute(editor.getAttribute(langAttribute)))); + } + + @Test public void testOnBlur() { testFireEvent(Event.BLUR, editorTextArea); } @@ -327,6 +338,10 @@ attributes.setToolbar("full"); assertEquals(selenium.getCount(editorToolbarGroup), 11); + + // since config facet has been introduced... + attributes.setToolbar("custom"); + assertEquals(selenium.getCount(editorToolbarGroup), 9); } @Test

12 years, 7 months

1
0
0 / 0

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

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

Author: jjamrich Date: 2011-09-08 17:55:07 -0400 (Thu, 08 Sep 2011) New Revision: 22694 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richEditor/simple.xhtml Log: RFPL-1637: add new rich:editor attributes to Metamer Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richEditor/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richEditor/simple.xhtml 2011-09-08 13:58:56 UTC (rev 22693) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richEditor/simple.xhtml 2011-09-08 21:55:07 UTC (rev 22694) @@ -2,7 +2,7 @@ <!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:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" xmlns:c="http://java.sun.com/jsp/jstl/core"> <!-- JBoss, Home of Professional Open Source @@ -38,12 +38,14 @@ <ui:define name="component"> - <rich:messages globalOnly="true" /> + <rich:messages globalOnly="true" /> <rich:messages for="editor" /> <rich:editor id="editor" height="#{richEditorBean.attributes['height'].value}" immediate="#{richEditorBean.attributes['immediate'].value}" + lang="#{richEditorBean.attributes['lang'].value}" onblur="#{richEditorBean.attributes['onblur'].value}" + ondirty="document.title = parseInt(document.title) + 1" onchange="#{richEditorBean.attributes['onchange'].value}" onfocus="#{richEditorBean.attributes['onfocus'].value}" oninit="#{richEditorBean.attributes['oninit'].value}" @@ -51,6 +53,7 @@ rendered="#{richEditorBean.attributes['rendered'].value}" required="#{richEditorBean.attributes['required'].value}" requiredMessage="#{richEditorBean.attributes['requiredMessage'].value}" + skin="#{richEditorBean.attributes['skin'].value}" style="#{richEditorBean.attributes['style'].value}" styleClass="#{richEditorBean.attributes['styleClass'].value}" title="#{richEditorBean.attributes['title'].value}" @@ -58,7 +61,27 @@ validator="#{richEditorBean.validateEditorValue}" value="#{richEditorBean.attributes['value'].value}" valueChangeListener="#{richBean.valueChangeListenerImproved}" - width="#{richEditorBean.attributes['width'].value}" /> + width="#{richEditorBean.attributes['width'].value}" > + <c:if test="#{richEditorBean.attributes['toolbar'].value=='custom'}" > + <f:facet name="config" > + toolbar: "MyToolbar", + toolbar_MyToolbar: + [ + { name: 'document', items : [ 'NewPage','Preview' ] }, + { name: 'clipboard', items : [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ] }, + { name: 'editing', items : [ 'Find','Replace','-','SelectAll','-','Scayt' ] }, + { name: 'insert', items : [ 'Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak' + ,'Iframe' ] }, + '/', + { name: 'styles', items : [ 'Styles','Format' ] }, + { name: 'basicstyles', items : [ 'Bold','Italic','Strike','-','RemoveFormat' ] }, + { name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote' ] }, + { name: 'links', items : [ 'Link','Unlink','Anchor' ] }, + { name: 'tools', items : [ 'Maximize','-','About' ] } + ] + </f:facet> + </c:if> + </rich:editor> <br/> <h:commandButton id="hButton" value="[h] Submit" />

12 years, 7 months

1
0
0 / 0

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

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

Author: jjamrich Date: 2011-09-08 09:58:56 -0400 (Thu, 08 Sep 2011) New Revision: 22693 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Capital.java modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml Log: RFPL-1612: Fix problem in pickList with submit value Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Capital.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Capital.java 2011-09-07 21:34:20 UTC (rev 22692) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Capital.java 2011-09-08 13:58:56 UTC (rev 22693) @@ -81,4 +81,8 @@ public void setTimeZone(String timeZone) { this.timeZone = timeZone; } + + public String toString() { + return name + " (" + state + ")"; + } } Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml 2011-09-07 21:34:20 UTC (rev 22692) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml 2011-09-08 13:58:56 UTC (rev 22693) @@ -58,7 +58,8 @@ maxListHeight="#{richPickListBean.attributes['maxListHeight'].value}" minListHeight="#{richPickListBean.attributes['minListHeight'].value}" onadditems="#{richPickListBean.attributes['onadditems'].value}" - onblur="#{richPickListBean.attributes['onblur'].value}" onchange="#{richPickListBean.attributes['onchange'].value}" + onblur="#{richPickListBean.attributes['onblur'].value}" + onchange="#{richPickListBean.attributes['onchange'].value}" onclick="#{richPickListBean.attributes['onclick'].value}" ondblclick="#{richPickListBean.attributes['ondblclick'].value}" onfocus="#{richPickListBean.attributes['onfocus'].value}" @@ -118,32 +119,17 @@ validator="#{richPickListBean.validatePickListValue}" value="#{richPickListBean.value}" valueChangeListener="#{richBean.valueChangeListenerImproved}"> - - <f:selectItems value="#{richPickListBean.capitals}" /> - <f:facet name="header"> - <h:outputText value="Header Facet" /> - </f:facet> - - <f:facet name="caption"> - <h:outputText id="captionFacet" value="Caption Facet" /> - </f:facet> - - <f:facet name="label"> - <h:outputText id="labelFacet" value="Label Facet" /> - </f:facet> + <f:selectItems value="#{richPickListBean.capitals}" /> <h:column id="columnFlag"> - <h:graphicImage name="#{tmp.stateFlag}" /> + <h:graphicImage name="#{tmp.stateFlag}" /> </h:column> <h:column id="columnCapital"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="Capital Header" /> </f:facet> - <f:facet name="label"> - <h:outputText id="columnLabelCapital" value="Label Facet" /> - </f:facet> <h:outputText value="#{tmp.name}" /> </h:column> @@ -151,9 +137,6 @@ <f:facet name="header"> <h:outputText id="columnHeaderState" value="State Header" /> </f:facet> - <f:facet name="label"> - <h:outputText id="columnLabelState" value="Label Facet" /> - </f:facet> <h:outputText value="#{tmp.state}" /> </h:column>

12 years, 7 months

1
0
0 / 0

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

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

Author: jjamrich Date: 2011-09-07 17:34:20 -0400 (Wed, 07 Sep 2011) New Revision: 22692 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java Log: RFPL-1612: fix test for rich:pickList: for onSource|TargetMouseOver attribute These event handlers are working on pickList: onAddItem, onSource|TargetMouseOver and onListMouseOver. Fix tests for these attributes by fixing locators to fire event Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-09-07 21:25:59 UTC (rev 22691) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-09-07 21:34:20 UTC (rev 22692) @@ -22,7 +22,6 @@ package org.richfaces.tests.metamer.ftest.richPickList; import static java.text.MessageFormat.format; -import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -32,7 +31,6 @@ import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.Attribute; -import org.jboss.test.selenium.locator.ElementLocator; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.utils.URLUtils; import org.jboss.test.selenium.waiting.EventFiredCondition; @@ -57,6 +55,8 @@ private JQueryLocator a4jSubmit = pjq("input[id$=a4jButton]"); private JQueryLocator pickListTop = pjq("div.rf-pick[id$=pickList]"); + private JQueryLocator pickListSource = pjq("div.rf-pick-source div.rf-pick-lst-dcrtn"); // this locator works for sourcemouseover event + private JQueryLocator pickListTarget = pjq("div.rf-pick-target div.rf-pick-lst-dcrtn"); private JQueryLocator output = pjq("span[id$=output]"); private JQueryLocator pickListMsgBox = pjq("span.rf-msg > span[id$=msg:form:pickList] > span.rf-msg-det"); private JQueryLocator targetCaptionLocator = pjq("div[id$=pickListTargetList] > div.rf-pick-target-caption"); @@ -442,7 +442,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11322") public void testOnmouseover() { testFireEvent(Event.MOUSEOVER, pickListTop); } @@ -514,9 +513,8 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11322") public void testOnsourcemouseover() { - testFireEvent(Event.MOUSEOVER, pickListTop, "sourcemouseover"); + testFireEvent(Event.MOUSEOVER, pickListSource, "sourcemouseover"); } @Test @@ -574,9 +572,8 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11322") public void testOntargetmouseover() { - testFireEvent(Event.MOUSEOVER, pickListTop, "targetmouseover"); + testFireEvent(Event.MOUSEOVER, pickListTarget, "targetmouseover"); } @Test

12 years, 7 months

1
0
0 / 0

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

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

Author: jjamrich Date: 2011-09-07 17:25:59 -0400 (Wed, 07 Sep 2011) New Revision: 22691 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestRegionSimple.java Log: RFPL-1439: removed unused import of AbstractComponentAttribute in a4j:status test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestRegionSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestRegionSimple.java 2011-09-07 21:25:37 UTC (rev 22690) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestRegionSimple.java 2011-09-07 21:25:59 UTC (rev 22691) @@ -30,7 +30,6 @@ import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.waiting.retrievers.TextRetriever; -import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum; import org.richfaces.tests.metamer.ftest.attributes.Attributes;

12 years, 7 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 September 2011