Author: ppitonak(a)redhat.com Date: 2011-01-31 08:42:56 -0500 (Mon, 31 Jan 2011) New Revision: 21322 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionBean.properties modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionItemBean.properties modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.properties modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 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/richTab/TestRichTab.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java Log: * tests and samples fixed because of renamed class and icon attributes Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichFileUploadBean.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -62,7 +62,6 @@ attributes = Attributes.getComponentAttributesFromFacesConfig(UIFileUpload.class, getClass()); - attributes.setAttribute("enabled", true); attributes.setAttribute("noDuplicate", false); attributes.setAttribute("rendered", true); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabBean.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -59,6 +59,9 @@ attributes.setAttribute("header", "tab1 header"); attributes.setAttribute("name", "tab1"); attributes.setAttribute("rendered", true); + + // will be tested in another way + attributes.remove("converter"); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionBean.properties 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionBean.properties 2011-01-31 13:42:56 UTC (rev 21322) @@ -7,75 +7,75 @@ attr.switchType.ajax=ajax attr.switchType.null= -attr.itemLeftIconActive.none=none -attr.itemLeftIconActive.grid=grid -attr.itemLeftIconActive.disc=disc -attr.itemLeftIconActive.chevronUp=chevronUp -attr.itemLeftIconActive.chevronDown=chevronDown -attr.itemLeftIconActive.triangle=triangle -attr.itemLeftIconActive.triangleUp=triangleUp -attr.itemLeftIconActive.triangleDown=triangleDown -attr.itemLeftIconActive.star=/resources/images/star.png -attr.itemLeftIconActive.nonexisting=nonexisting -attr.itemLeftIconActive.null= +attr.itemActiveLeftIcon.none=none +attr.itemActiveLeftIcon.grid=grid +attr.itemActiveLeftIcon.disc=disc +attr.itemActiveLeftIcon.chevronUp=chevronUp +attr.itemActiveLeftIcon.chevronDown=chevronDown +attr.itemActiveLeftIcon.triangle=triangle +attr.itemActiveLeftIcon.triangleUp=triangleUp +attr.itemActiveLeftIcon.triangleDown=triangleDown +attr.itemActiveLeftIcon.star=/resources/images/star.png +attr.itemActiveLeftIcon.nonexisting=nonexisting +attr.itemActiveLeftIcon.null= -attr.itemLeftIconDisabled.none=none -attr.itemLeftIconDisabled.grid=grid -attr.itemLeftIconDisabled.disc=disc -attr.itemLeftIconDisabled.chevronUp=chevronUp -attr.itemLeftIconDisabled.chevronDown=chevronDown -attr.itemLeftIconDisabled.triangle=triangle -attr.itemLeftIconDisabled.triangleUp=triangleUp -attr.itemLeftIconDisabled.triangleDown=triangleDown -attr.itemLeftIconDisabled.star=/resources/images/star.png -attr.itemLeftIconDisabled.nonexisting=nonexisting -attr.itemLeftIconDisabled.null= +attr.itemDisabledLeftIcon.none=none +attr.itemDisabledLeftIcon.grid=grid +attr.itemDisabledLeftIcon.disc=disc +attr.itemDisabledLeftIcon.chevronUp=chevronUp +attr.itemDisabledLeftIcon.chevronDown=chevronDown +attr.itemDisabledLeftIcon.triangle=triangle +attr.itemDisabledLeftIcon.triangleUp=triangleUp +attr.itemDisabledLeftIcon.triangleDown=triangleDown +attr.itemDisabledLeftIcon.star=/resources/images/star.png +attr.itemDisabledLeftIcon.nonexisting=nonexisting +attr.itemDisabledLeftIcon.null= -attr.itemLeftIconInactive.none=none -attr.itemLeftIconInactive.grid=grid -attr.itemLeftIconInactive.disc=disc -attr.itemLeftIconInactive.chevronUp=chevronUp -attr.itemLeftIconInactive.chevronDown=chevronDown -attr.itemLeftIconInactive.triangle=triangle -attr.itemLeftIconInactive.triangleUp=triangleUp -attr.itemLeftIconInactive.triangleDown=triangleDown -attr.itemLeftIconInactive.star=/resources/images/star.png -attr.itemLeftIconInactive.nonexisting=nonexisting -attr.itemLeftIconInactive.null= +attr.itemInactiveLeftIcon.none=none +attr.itemInactiveLeftIcon.grid=grid +attr.itemInactiveLeftIcon.disc=disc +attr.itemInactiveLeftIcon.chevronUp=chevronUp +attr.itemInactiveLeftIcon.chevronDown=chevronDown +attr.itemInactiveLeftIcon.triangle=triangle +attr.itemInactiveLeftIcon.triangleUp=triangleUp +attr.itemInactiveLeftIcon.triangleDown=triangleDown +attr.itemInactiveLeftIcon.star=/resources/images/star.png +attr.itemInactiveLeftIcon.nonexisting=nonexisting +attr.itemInactiveLeftIcon.null= -attr.itemRightIconActive.none=none -attr.itemRightIconActive.grid=grid -attr.itemRightIconActive.disc=disc -attr.itemRightIconActive.chevronUp=chevronUp -attr.itemRightIconActive.chevronDown=chevronDown -attr.itemRightIconActive.triangle=triangle -attr.itemRightIconActive.triangleUp=triangleUp -attr.itemRightIconActive.triangleDown=triangleDown -attr.itemRightIconActive.star=/resources/images/star.png -attr.itemRightIconActive.nonexisting=nonexisting -attr.itemRightIconActive.null= +attr.itemActiveRightIcon.none=none +attr.itemActiveRightIcon.grid=grid +attr.itemActiveRightIcon.disc=disc +attr.itemActiveRightIcon.chevronUp=chevronUp +attr.itemActiveRightIcon.chevronDown=chevronDown +attr.itemActiveRightIcon.triangle=triangle +attr.itemActiveRightIcon.triangleUp=triangleUp +attr.itemActiveRightIcon.triangleDown=triangleDown +attr.itemActiveRightIcon.star=/resources/images/star.png +attr.itemActiveRightIcon.nonexisting=nonexisting +attr.itemActiveRightIcon.null= -attr.itemRightIconDisabled.none=none -attr.itemRightIconDisabled.grid=grid -attr.itemRightIconDisabled.disc=disc -attr.itemRightIconDisabled.chevronUp=chevronUp -attr.itemRightIconDisabled.chevronDown=chevronDown -attr.itemRightIconDisabled.triangle=triangle -attr.itemRightIconDisabled.triangleUp=triangleUp -attr.itemRightIconDisabled.triangleDown=triangleDown -attr.itemRightIconDisabled.star=/resources/images/star.png -attr.itemRightIconDisabled.nonexisting=nonexisting -attr.itemRightIconDisabled.null= +attr.itemDisabledRightIcon.none=none +attr.itemDisabledRightIcon.grid=grid +attr.itemDisabledRightIcon.disc=disc +attr.itemDisabledRightIcon.chevronUp=chevronUp +attr.itemDisabledRightIcon.chevronDown=chevronDown +attr.itemDisabledRightIcon.triangle=triangle +attr.itemDisabledRightIcon.triangleUp=triangleUp +attr.itemDisabledRightIcon.triangleDown=triangleDown +attr.itemDisabledRightIcon.star=/resources/images/star.png +attr.itemDisabledRightIcon.nonexisting=nonexisting +attr.itemDisabledRightIcon.null= -attr.itemRightIconInactive.none=none -attr.itemRightIconInactive.grid=grid -attr.itemRightIconInactive.disc=disc -attr.itemRightIconInactive.chevronUp=chevronUp -attr.itemRightIconInactive.chevronDown=chevronDown -attr.itemRightIconInactive.triangle=triangle -attr.itemRightIconInactive.triangleUp=triangleUp -attr.itemRightIconInactive.triangleDown=triangleDown -attr.itemRightIconInactive.star=/resources/images/star.png -attr.itemRightIconInactive.nonexisting=nonexisting -attr.itemRightIconInactive.null= +attr.itemInactiveRightIcon.none=none +attr.itemInactiveRightIcon.grid=grid +attr.itemInactiveRightIcon.disc=disc +attr.itemInactiveRightIcon.chevronUp=chevronUp +attr.itemInactiveRightIcon.chevronDown=chevronDown +attr.itemInactiveRightIcon.triangle=triangle +attr.itemInactiveRightIcon.triangleUp=triangleUp +attr.itemInactiveRightIcon.triangleDown=triangleDown +attr.itemInactiveRightIcon.star=/resources/images/star.png +attr.itemInactiveRightIcon.nonexisting=nonexisting +attr.itemInactiveRightIcon.null= Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionItemBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionItemBean.properties 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichAccordionItemBean.properties 2011-01-31 13:42:56 UTC (rev 21322) @@ -7,74 +7,74 @@ attr.switchType.ajax=ajax attr.switchType.null= -attr.leftIconActive.none=none -attr.leftIconActive.grid=grid -attr.leftIconActive.disc=disc -attr.leftIconActive.chevronUp=chevronUp -attr.leftIconActive.chevronDown=chevronDown -attr.leftIconActive.triangle=triangle -attr.leftIconActive.triangleUp=triangleUp -attr.leftIconActive.triangleDown=triangleDown -attr.leftIconActive.star=/resources/images/star.png -attr.leftIconActive.nonexisting=nonexisting -attr.leftIconActive.null= +attr.leftActiveIcon.none=none +attr.leftActiveIcon.grid=grid +attr.leftActiveIcon.disc=disc +attr.leftActiveIcon.chevronUp=chevronUp +attr.leftActiveIcon.chevronDown=chevronDown +attr.leftActiveIcon.triangle=triangle +attr.leftActiveIcon.triangleUp=triangleUp +attr.leftActiveIcon.triangleDown=triangleDown +attr.leftActiveIcon.star=/resources/images/star.png +attr.leftActiveIcon.nonexisting=nonexisting +attr.leftActiveIcon.null= -attr.leftIconDisabled.none=none -attr.leftIconDisabled.grid=grid -attr.leftIconDisabled.disc=disc -attr.leftIconDisabled.chevronUp=chevronUp -attr.leftIconDisabled.chevronDown=chevronDown -attr.leftIconDisabled.triangle=triangle -attr.leftIconDisabled.triangleUp=triangleUp -attr.leftIconDisabled.triangleDown=triangleDown -attr.leftIconDisabled.star=/resources/images/star.png -attr.leftIconDisabled.nonexisting=nonexisting -attr.leftIconDisabled.null= +attr.leftDisabledIcon.none=none +attr.leftDisabledIcon.grid=grid +attr.leftDisabledIcon.disc=disc +attr.leftDisabledIcon.chevronUp=chevronUp +attr.leftDisabledIcon.chevronDown=chevronDown +attr.leftDisabledIcon.triangle=triangle +attr.leftDisabledIcon.triangleUp=triangleUp +attr.leftDisabledIcon.triangleDown=triangleDown +attr.leftDisabledIcon.star=/resources/images/star.png +attr.leftDisabledIcon.nonexisting=nonexisting +attr.leftDisabledIcon.null= -attr.leftIconInactive.none=none -attr.leftIconInactive.grid=grid -attr.leftIconInactive.disc=disc -attr.leftIconInactive.chevronUp=chevronUp -attr.leftIconInactive.chevronDown=chevronDown -attr.leftIconInactive.triangle=triangle -attr.leftIconInactive.triangleUp=triangleUp -attr.leftIconInactive.triangleDown=triangleDown -attr.leftIconInactive.star=/resources/images/star.png -attr.leftIconInactive.nonexisting=nonexisting -attr.leftIconInactive.null= +attr.leftInactiveIcon.none=none +attr.leftInactiveIcon.grid=grid +attr.leftInactiveIcon.disc=disc +attr.leftInactiveIcon.chevronUp=chevronUp +attr.leftInactiveIcon.chevronDown=chevronDown +attr.leftInactiveIcon.triangle=triangle +attr.leftInactiveIcon.triangleUp=triangleUp +attr.leftInactiveIcon.triangleDown=triangleDown +attr.leftInactiveIcon.star=/resources/images/star.png +attr.leftInactiveIcon.nonexisting=nonexisting +attr.leftInactiveIcon.null= -attr.rightIconActive.none=none -attr.rightIconActive.grid=grid -attr.rightIconActive.disc=disc -attr.rightIconActive.chevronUp=chevronUp -attr.rightIconActive.chevronDown=chevronDown -attr.rightIconActive.triangle=triangle -attr.rightIconActive.triangleUp=triangleUp -attr.rightIconActive.triangleDown=triangleDown -attr.rightIconActive.star=/resources/images/star.png -attr.rightIconActive.nonexisting=nonexisting -attr.rightIconActive.null= +attr.rightActiveIcon.none=none +attr.rightActiveIcon.grid=grid +attr.rightActiveIcon.disc=disc +attr.rightActiveIcon.chevronUp=chevronUp +attr.rightActiveIcon.chevronDown=chevronDown +attr.rightActiveIcon.triangle=triangle +attr.rightActiveIcon.triangleUp=triangleUp +attr.rightActiveIcon.triangleDown=triangleDown +attr.rightActiveIcon.star=/resources/images/star.png +attr.rightActiveIcon.nonexisting=nonexisting +attr.rightActiveIcon.null= -attr.rightIconDisabled.none=none -attr.rightIconDisabled.grid=grid -attr.rightIconDisabled.disc=disc -attr.rightIconDisabled.chevronUp=chevronUp -attr.rightIconDisabled.chevronDown=chevronDown -attr.rightIconDisabled.triangle=triangle -attr.rightIconDisabled.triangleUp=triangleUp -attr.rightIconDisabled.triangleDown=triangleDown -attr.rightIconDisabled.star=/resources/images/star.png -attr.rightIconDisabled.nonexisting=nonexisting -attr.rightIconDisabled.null= +attr.rightDisabledIcon.none=none +attr.rightDisabledIcon.grid=grid +attr.rightDisabledIcon.disc=disc +attr.rightDisabledIcon.chevronUp=chevronUp +attr.rightDisabledIcon.chevronDown=chevronDown +attr.rightDisabledIcon.triangle=triangle +attr.rightDisabledIcon.triangleUp=triangleUp +attr.rightDisabledIcon.triangleDown=triangleDown +attr.rightDisabledIcon.star=/resources/images/star.png +attr.rightDisabledIcon.nonexisting=nonexisting +attr.rightDisabledIcon.null= -attr.rightIconInactive.none=none -attr.rightIconInactive.grid=grid -attr.rightIconInactive.disc=disc -attr.rightIconInactive.chevronUp=chevronUp -attr.rightIconInactive.chevronDown=chevronDown -attr.rightIconInactive.triangle=triangle -attr.rightIconInactive.triangleUp=triangleUp -attr.rightIconInactive.triangleDown=triangleDown -attr.rightIconInactive.star=/resources/images/star.png -attr.rightIconInactive.nonexisting=nonexisting -attr.rightIconInactive.null= +attr.rightInactiveIcon.none=none +attr.rightInactiveIcon.grid=grid +attr.rightInactiveIcon.disc=disc +attr.rightInactiveIcon.chevronUp=chevronUp +attr.rightInactiveIcon.chevronDown=chevronDown +attr.rightInactiveIcon.triangle=triangle +attr.rightInactiveIcon.triangleUp=triangleUp +attr.rightInactiveIcon.triangleDown=triangleDown +attr.rightInactiveIcon.star=/resources/images/star.png +attr.rightInactiveIcon.nonexisting=nonexisting +attr.rightInactiveIcon.null= Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.properties 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.properties 2011-01-31 13:42:56 UTC (rev 21322) @@ -2,55 +2,55 @@ attr.dir.rtl=rtl attr.dir.null= -attr.leftIconCollapsed.none=none -attr.leftIconCollapsed.grid=grid -attr.leftIconCollapsed.disc=disc -attr.leftIconCollapsed.chevronUp=chevronUp -attr.leftIconCollapsed.chevronDown=chevronDown -attr.leftIconCollapsed.triangle=triangle -attr.leftIconCollapsed.triangleUp=triangleUp -attr.leftIconCollapsed.triangleDown=triangleDown -attr.leftIconCollapsed.star=/resources/images/star.png -attr.leftIconCollapsed.nonexisting=nonexisting -attr.leftIconCollapsed.null= +attr.leftCollapsedIcon.none=none +attr.leftCollapsedIcon.grid=grid +attr.leftCollapsedIcon.disc=disc +attr.leftCollapsedIcon.chevronUp=chevronUp +attr.leftCollapsedIcon.chevronDown=chevronDown +attr.leftCollapsedIcon.triangle=triangle +attr.leftCollapsedIcon.triangleUp=triangleUp +attr.leftCollapsedIcon.triangleDown=triangleDown +attr.leftCollapsedIcon.star=/resources/images/star.png +attr.leftCollapsedIcon.nonexisting=nonexisting +attr.leftCollapsedIcon.null= -attr.leftIconExpanded.none=none -attr.leftIconExpanded.grid=grid -attr.leftIconExpanded.disc=disc -attr.leftIconExpanded.chevronUp=chevronUp -attr.leftIconExpanded.chevronDown=chevronDown -attr.leftIconExpanded.triangle=triangle -attr.leftIconExpanded.triangleUp=triangleUp -attr.leftIconExpanded.triangleDown=triangleDown -attr.leftIconExpanded.star=/resources/images/star.png -attr.leftIconExpanded.nonexisting=nonexisting -attr.leftIconExpanded.null= +attr.leftExpandedIcon.none=none +attr.leftExpandedIcon.grid=grid +attr.leftExpandedIcon.disc=disc +attr.leftExpandedIcon.chevronUp=chevronUp +attr.leftExpandedIcon.chevronDown=chevronDown +attr.leftExpandedIcon.triangle=triangle +attr.leftExpandedIcon.triangleUp=triangleUp +attr.leftExpandedIcon.triangleDown=triangleDown +attr.leftExpandedIcon.star=/resources/images/star.png +attr.leftExpandedIcon.nonexisting=nonexisting +attr.leftExpandedIcon.null= -attr.rightIconCollapsed.none=none -attr.rightIconCollapsed.grid=grid -attr.rightIconCollapsed.disc=disc -attr.rightIconCollapsed.chevronUp=chevronUp -attr.rightIconCollapsed.chevronDown=chevronDown -attr.rightIconCollapsed.triangle=triangle -attr.rightIconCollapsed.triangleUp=triangleUp -attr.rightIconCollapsed.triangleDown=triangleDown -attr.rightIconCollapsed.star=/resources/images/star.png -attr.rightIconCollapsed.nonexisting=nonexisting -attr.rightIconCollapsed.null= +attr.rightCollapsedIcon.none=none +attr.rightCollapsedIcon.grid=grid +attr.rightCollapsedIcon.disc=disc +attr.rightCollapsedIcon.chevronUp=chevronUp +attr.rightCollapsedIcon.chevronDown=chevronDown +attr.rightCollapsedIcon.triangle=triangle +attr.rightCollapsedIcon.triangleUp=triangleUp +attr.rightCollapsedIcon.triangleDown=triangleDown +attr.rightCollapsedIcon.star=/resources/images/star.png +attr.rightCollapsedIcon.nonexisting=nonexisting +attr.rightCollapsedIcon.null= -attr.rightIconExpanded.none=none -attr.rightIconExpanded.grid=grid -attr.rightIconExpanded.disc=disc -attr.rightIconExpanded.chevronUp=chevronUp -attr.rightIconExpanded.chevronDown=chevronDown -attr.rightIconExpanded.triangle=triangle -attr.rightIconExpanded.triangleUp=triangleUp -attr.rightIconExpanded.triangleDown=triangleDown -attr.rightIconExpanded.star=/resources/images/star.png -attr.rightIconExpanded.nonexisting=nonexisting -attr.rightIconExpanded.null= +attr.rightExpandedIcon.none=none +attr.rightExpandedIcon.grid=grid +attr.rightExpandedIcon.disc=disc +attr.rightExpandedIcon.chevronUp=chevronUp +attr.rightExpandedIcon.chevronDown=chevronDown +attr.rightExpandedIcon.triangle=triangle +attr.rightExpandedIcon.triangleUp=triangleUp +attr.rightExpandedIcon.triangleDown=triangleDown +attr.rightExpandedIcon.star=/resources/images/star.png +attr.rightExpandedIcon.nonexisting=nonexisting +attr.rightExpandedIcon.null= attr.switchType.client=client attr.switchType.server=server attr.switchType.ajax=ajax -attr.switchType.none= \ No newline at end of file +attr.switchType.none= Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -50,17 +50,17 @@ height="#{richAccordionBean.attributes['height'].value}" immediate="#{richAccordionBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" + itemActiveHeaderClass="#{richAccordionBean.attributes['itemActiveHeaderClass'].value}" + itemActiveLeftIcon="#{richAccordionBean.attributes['itemActiveLeftIcon'].value}" + itemActiveRightIcon="#{richAccordionBean.attributes['itemActiveRightIcon'].value}" itemContentClass="#{richAccordionBean.attributes['itemContentClass'].value}" + itemDisabledHeaderClass="#{richAccordionBean.attributes['itemDisabledHeaderClass'].value}" + itemDisabledLeftIcon="#{richAccordionBean.attributes['itemDisabledLeftIcon'].value}" + itemDisabledRightIcon="#{richAccordionBean.attributes['itemDisabledRightIcon'].value}" itemHeaderClass="#{richAccordionBean.attributes['itemHeaderClass'].value}" - itemHeaderClassActive="#{richAccordionBean.attributes['itemHeaderClassActive'].value}" - itemHeaderClassDisabled="#{richAccordionBean.attributes['itemHeaderClassDisabled'].value}" - itemHeaderClassInactive="#{richAccordionBean.attributes['itemHeaderClassInactive'].value}" - itemLeftIconActive="#{richAccordionBean.attributes['itemLeftIconActive'].value}" - itemLeftIconDisabled="#{richAccordionBean.attributes['itemLeftIconDisabled'].value}" - itemLeftIconInactive="#{richAccordionBean.attributes['itemLeftIconInactive'].value}" - itemRightIconActive="#{richAccordionBean.attributes['itemRightIconActive'].value}" - itemRightIconDisabled="#{richAccordionBean.attributes['itemRightIconDisabled'].value}" - itemRightIconInactive="#{richAccordionBean.attributes['itemRightIconInactive'].value}" + itemInactiveHeaderClass="#{richAccordionBean.attributes['itemInactiveHeaderClass'].value}" + itemInactiveLeftIcon="#{richAccordionBean.attributes['itemInactiveLeftIcon'].value}" + itemInactiveRightIcon="#{richAccordionBean.attributes['itemInactiveRightIcon'].value}" lang="#{richAccordionBean.attributes['lang'].value}" limitRender="#{richAccordionBean.attributes['limitRender'].value}" onbeforedomupdate="#{richAccordionBean.attributes['onbeforedomupdate'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordionItem/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -46,15 +46,15 @@ dir="#{richAccordionItemBean.attributes['dir'].value}" disabled="#{richAccordionItemBean.attributes['disabled'].value}" header="#{richAccordionItemBean.attributes['header'].value}" + headerActiveClass="#{richAccordionItemBean.attributes['headerActiveClass'].value}" headerClass="#{richAccordionItemBean.attributes['headerClass'].value}" - headerClassActive="#{richAccordionItemBean.attributes['headerClassActive'].value}" - headerClassDisabled="#{richAccordionItemBean.attributes['headerClassDisabled'].value}" - headerClassInactive="#{richAccordionItemBean.attributes['headerClassInactive'].value}" + headerDisabledClass="#{richAccordionItemBean.attributes['headerDisabledClass'].value}" + headerInactiveClass="#{richAccordionItemBean.attributes['headerInactiveClass'].value}" headerStyle="#{richAccordionItemBean.attributes['headerStyle'].value}" lang="#{richAccordionItemBean.attributes['lang'].value}" - leftIconActive="#{richAccordionItemBean.attributes['leftIconActive'].value}" - leftIconDisabled="#{richAccordionItemBean.attributes['leftIconDisabled'].value}" - leftIconInactive="#{richAccordionItemBean.attributes['leftIconInactive'].value}" + leftActiveIcon="#{richAccordionItemBean.attributes['leftActiveIcon'].value}" + leftDisabledIcon="#{richAccordionItemBean.attributes['leftDisabledIcon'].value}" + leftInactiveIcon="#{richAccordionItemBean.attributes['leftInactiveIcon'].value}" name="#{richAccordionItemBean.attributes['name'].value}" onclick="#{richAccordionItemBean.attributes['onclick'].value}" ondblclick="#{richAccordionItemBean.attributes['ondblclick'].value}" @@ -71,9 +71,9 @@ onmouseover="#{richAccordionItemBean.attributes['onmouseover'].value}" onmouseup="#{richAccordionItemBean.attributes['onmouseup'].value}" rendered="#{richAccordionItemBean.attributes['rendered'].value}" - rightIconActive="#{richAccordionItemBean.attributes['rightIconActive'].value}" - rightIconDisabled="#{richAccordionItemBean.attributes['rightIconDisabled'].value}" - rightIconInactive="#{richAccordionItemBean.attributes['rightIconInactive'].value}" + rightActiveIcon="#{richAccordionItemBean.attributes['rightActiveIcon'].value}" + rightDisabledIcon="#{richAccordionItemBean.attributes['rightDisabledIcon'].value}" + rightInactiveIcon="#{richAccordionItemBean.attributes['rightInactiveIcon'].value}" style="#{richAccordionItemBean.attributes['style'].value}" styleClass="#{richAccordionItemBean.attributes['styleClass'].value}" switchType="#{richAccordionItemBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -51,11 +51,10 @@ expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}" - headerControlClass="#{richCollapsiblePanelBean.attributes['headerControlClass'].value}" immediate="#{richCollapsiblePanelBean.attributes['immediate'].value}" lang="#{richCollapsiblePanelBean.attributes['lang'].value}" - leftIconCollapsed="#{richCollapsiblePanelBean.attributes['leftIconCollapsed'].value}" - leftIconExpanded="#{richCollapsiblePanelBean.attributes['leftIconExpanded'].value}" + leftCollapsedIcon="#{richCollapsiblePanelBean.attributes['leftCollapsedIcon'].value}" + leftExpandedIcon="#{richCollapsiblePanelBean.attributes['leftExpandedIcon'].value}" limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}" onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}" @@ -71,8 +70,8 @@ onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}" render="#{richCollapsiblePanelBean.attributes['render'].value}" rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}" - rightIconCollapsed="#{richCollapsiblePanelBean.attributes['rightIconCollapsed'].value}" - rightIconExpanded="#{richCollapsiblePanelBean.attributes['rightIconExpanded'].value}" + rightCollapsedIcon="#{richCollapsiblePanelBean.attributes['rightCollapsedIcon'].value}" + rightExpandedIcon="#{richCollapsiblePanelBean.attributes['rightExpandedIcon'].value}" status="#{richCollapsiblePanelBean.attributes['status'].value}" style="#{richCollapsiblePanelBean.attributes['style'].value}" styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -50,11 +50,10 @@ expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}" - headerControlClass="#{richCollapsiblePanelBean.attributes['headerControlClass'].value}" immediate="#{richCollapsiblePanelBean.attributes['immediate'].value}" lang="#{richCollapsiblePanelBean.attributes['lang'].value}" - leftIconCollapsed="#{richCollapsiblePanelBean.attributes['leftIconCollapsed'].value}" - leftIconExpanded="#{richCollapsiblePanelBean.attributes['leftIconExpanded'].value}" + leftCollapsedIcon="#{richCollapsiblePanelBean.attributes['leftCollapsedIcon'].value}" + leftExpandedIcon="#{richCollapsiblePanelBean.attributes['leftExpandedIcon'].value}" limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}" onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}" @@ -70,8 +69,8 @@ onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}" render="#{richCollapsiblePanelBean.attributes['render'].value}" rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}" - rightIconCollapsed="#{richCollapsiblePanelBean.attributes['rightIconCollapsed'].value}" - rightIconExpanded="#{richCollapsiblePanelBean.attributes['rightIconExpanded'].value}" + rightCollapsedIcon="#{richCollapsiblePanelBean.attributes['rightCollapsedIcon'].value}" + rightExpandedIcon="#{richCollapsiblePanelBean.attributes['rightExpandedIcon'].value}" status="#{richCollapsiblePanelBean.attributes['status'].value}" style="#{richCollapsiblePanelBean.attributes['style'].value}" styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -43,7 +43,7 @@ <rich:fileUpload id="fileUpload" acceptedTypes="#{richFileUploadBean.attributes['acceptedTypes'].value}" dir="#{richFileUploadBean.attributes['dir'].value}" - enabled="#{richFileUploadBean.attributes['enabled'].value}" + disabled="#{richFileUploadBean.attributes['disabled'].value}" fileUploadListener="#{richFileUploadBean.listener}" lang="#{richFileUploadBean.attributes['lang'].value}" noDuplicate="#{richFileUploadBean.attributes['noDuplicate'].value}" @@ -74,7 +74,7 @@ <li>#{item.name}</li> </a4j:repeat> </ul> - + <br/> <a4j:commandButton id="clearUploadedDataButton" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTab/simple.xhtml 2011-01-31 13:42:56 UTC (rev 21322) @@ -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" > <!-- JBoss, Home of Professional Open Source @@ -47,9 +47,9 @@ disabled="#{richTabBean.attributes['disabled'].value}" header="#{richTabBean.attributes['header'].value}" headerClass="#{richTabBean.attributes['headerClass'].value}" - headerClassActive="#{richTabBean.attributes['headerClassActive'].value}" - headerClassDisabled="#{richTabBean.attributes['headerClassDisabled'].value}" - headerClassInactive="#{richTabBean.attributes['headerClassInactive'].value}" + headerActiveClass="#{richTabBean.attributes['headerActiveClass'].value}" + headerDisabledClass="#{richTabBean.attributes['headerDisabledClass'].value}" + headerInactiveClass="#{richTabBean.attributes['headerInactiveClass'].value}" headerStyle="#{richTabBean.attributes['headerStyle'].value}" lang="#{richTabBean.attributes['lang'].value}" name="#{richTabBean.attributes['name'].value}" Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -249,35 +249,15 @@ } @Test - public void testItemContentClass() { - testStyleClass(itemContents[2], "itemContentClass"); + public void testItemActiveHeaderClass() { + testStyleClass(activeHeaders[0], "itemActiveHeaderClass"); } @Test - public void testItemHeaderClass() { - testStyleClass(itemHeaders[2], "itemHeaderClass"); - } - - @Test - public void testItemHeaderClassActive() { - testStyleClass(activeHeaders[0], "itemHeaderClassActive"); - } - - @Test - public void testItemHeaderClassDisabled() { - testStyleClass(disabledHeaders[3], "itemHeaderClassDisabled"); - } - - @Test - public void testItemHeaderClassInactive() { - testStyleClass(inactiveHeaders[1], "itemHeaderClassInactive"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10352") - public void testItemLeftIconActive() { + public void testItemActiveLeftIcon() { JQueryLocator icon = leftIcon.format(1).getDescendant(jq("div.rf-ac-itm-ico-act")); - JQueryLocator input = pjq("select[id$=itemLeftIconActiveInput]"); + JQueryLocator input = pjq("select[id$=itemActiveLeftIconInput]"); JQueryLocator image = leftIcon.format(1).getChild(jq("img")); // icon=null @@ -289,28 +269,9 @@ } @Test - public void testItemLeftIconDisabled() { - JQueryLocator icon = leftIcon.format(4).getDescendant(jq("div.rf-ac-itm-ico-inact")); - JQueryLocator input = pjq("select[id$=itemLeftIconDisabledInput]"); - JQueryLocator image = leftIcon.format(4).getChild(jq("img")); - - verifyStandardIcons(input, icon, image, "-dis"); - } - - @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10352") - public void testItemLeftIconInactive() { - JQueryLocator icon = leftIcon.format(3).getDescendant(jq("div.rf-ac-itm-ico-inact")); - JQueryLocator input = pjq("select[id$=itemLeftIconInactiveInput]"); - JQueryLocator image = leftIcon.format(3).getChild(jq("img")); - - verifyStandardIcons(input, icon, image, ""); - } - - @Test - public void testItemRightIconActive() { + public void testItemActiveRightIcon() { JQueryLocator icon = rightIcon.format(1).getDescendant(jq("div.rf-ac-itm-ico-act")); - JQueryLocator input = pjq("select[id$=itemRightIconActiveInput]"); + JQueryLocator input = pjq("select[id$=itemActiveRightIconInput]"); JQueryLocator image = rightIcon.format(1).getChild(jq("img")); // icon=null @@ -322,18 +283,57 @@ } @Test - public void testItemRightIconDisabled() { + public void testItemContentClass() { + testStyleClass(itemContents[2], "itemContentClass"); + } + + @Test + public void testItemDisabledHeaderClass() { + testStyleClass(disabledHeaders[3], "itemDisabledHeaderClass"); + } + + @Test + public void testItemDisabledLeftIcon() { + JQueryLocator icon = leftIcon.format(4).getDescendant(jq("div.rf-ac-itm-ico-inact")); + JQueryLocator input = pjq("select[id$=itemDisabledLeftIconInput]"); + JQueryLocator image = leftIcon.format(4).getChild(jq("img")); + + verifyStandardIcons(input, icon, image, "-dis"); + } + + @Test + public void testItemDisabledRightIcon() { JQueryLocator icon = rightIcon.format(4).getDescendant(jq("div.rf-ac-itm-ico-inact")); - JQueryLocator input = pjq("select[id$=itemRightIconDisabledInput]"); + JQueryLocator input = pjq("select[id$=itemDisabledRightIconInput]"); JQueryLocator image = rightIcon.format(4).getChild(jq("img")); verifyStandardIcons(input, icon, image, "-hdr-dis"); } @Test - public void testItemRightIconInactive() { + public void testItemHeaderClass() { + testStyleClass(itemHeaders[2], "itemHeaderClass"); + } + + @Test + public void testItemInactiveHeaderClass() { + testStyleClass(inactiveHeaders[1], "itemInactiveHeaderClass"); + } + + @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10352") + public void testItemInactiveLeftIcon() { + JQueryLocator icon = leftIcon.format(3).getDescendant(jq("div.rf-ac-itm-ico-inact")); + JQueryLocator input = pjq("select[id$=itemInactiveLeftIconInput]"); + JQueryLocator image = leftIcon.format(3).getChild(jq("img")); + + verifyStandardIcons(input, icon, image, ""); + } + + @Test + public void testItemInactiveRightIcon() { JQueryLocator icon = rightIcon.format(3).getDescendant(jq("div.rf-ac-itm-ico-inact")); - JQueryLocator input = pjq("select[id$=itemRightIconInactiveInput]"); + JQueryLocator input = pjq("select[id$=itemInactiveRightIconInput]"); JQueryLocator image = rightIcon.format(3).getChild(jq("img")); verifyStandardIcons(input, icon, image, "-hdr"); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * 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. * @@ -24,7 +24,6 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; -import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -114,6 +113,14 @@ } @Test + public void testHeaderActiveClass() { + testStyleClass(activeHeaders[0], "headerActiveClass"); + assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); + assertFalse(selenium.belongsClass(activeHeaders[2], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); + assertFalse(selenium.belongsClass(activeHeaders[3], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); + } + + @Test public void testHeaderClass() { testStyleClass(itemHeaders[0], "headerClass"); assertFalse(selenium.belongsClass(itemHeaders[1], "metamer-ftest-class"), "headerClass should be set only on first item"); @@ -122,27 +129,19 @@ } @Test - public void testHeaderClassActive() { - testStyleClass(activeHeaders[0], "headerClassActive"); - assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerClassActive should be set only on first item"); - assertFalse(selenium.belongsClass(activeHeaders[2], "metamer-ftest-class"), "headerClassActive should be set only on first item"); - assertFalse(selenium.belongsClass(activeHeaders[3], "metamer-ftest-class"), "headerClassActive should be set only on first item"); - } - - @Test - public void testHeaderClassDisabled() { + public void testHeaderDisabledClass() { selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - testStyleClass(disabledHeaders[0], "headerClassDisabled"); + testStyleClass(disabledHeaders[0], "headerDisabledClass"); } @Test - public void testHeaderClassInactive() { - testStyleClass(inactiveHeaders[0], "headerClassInactive"); - assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerClassInactive should be set only on first item"); - assertFalse(selenium.belongsClass(inactiveHeaders[2], "metamer-ftest-class"), "headerClassInactive should be set only on first item"); - assertFalse(selenium.belongsClass(inactiveHeaders[3], "metamer-ftest-class"), "headerClassInactive should be set only on first item"); + public void testHeaderInactiveClass() { + testStyleClass(inactiveHeaders[0], "headerInactiveClass"); + assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); + assertFalse(selenium.belongsClass(inactiveHeaders[2], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); + assertFalse(selenium.belongsClass(inactiveHeaders[3], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); } @Test 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-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -165,12 +165,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10331") - public void testHeaderControlClass() { - testStyleClass(header.getDescendant(jq("td.rf-cp-ico")), "headerControlClass"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10054") public void testImmediate() { selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -190,9 +184,9 @@ } @Test - public void testLeftIconCollapsed() { + public void testLeftCollapsedIcon() { JQueryLocator icon = leftIcon.getDescendant(jq("div.rf-cp-ico-colps")); - JQueryLocator input = pjq("select[id$=leftIconCollapsedInput]"); + JQueryLocator input = pjq("select[id$=leftCollapsedIconInput]"); JQueryLocator image = leftIcon.getChild(jq("img:nth-child(1)")); // icon=null @@ -203,9 +197,9 @@ } @Test - public void testLeftIconExpanded() { + public void testLeftExpandedIcon() { JQueryLocator icon = leftIcon.getDescendant(jq("div.rf-cp-ico-exp")); - JQueryLocator input = pjq("select[id$=leftIconExpandedInput]"); + JQueryLocator input = pjq("select[id$=leftExpandedIconInput]"); JQueryLocator image = leftIcon.getChild(jq("img:nth-child(2)")); // icon=null @@ -329,9 +323,9 @@ } @Test - public void testRightIconCollapsed() { + public void testRightCollapsedIcon() { JQueryLocator icon = rightIcon.getDescendant(jq("div.rf-cp-ico-colps")); - JQueryLocator input = pjq("select[id$=rightIconCollapsedInput]"); + JQueryLocator input = pjq("select[id$=rightCollapsedIconInput]"); JQueryLocator image = rightIcon.getChild(jq("img:nth-child(1)")); // icon=null @@ -341,9 +335,9 @@ } @Test - public void testRightIconExpanded() { + public void testRightExpandedIcon() { JQueryLocator icon = rightIcon.getDescendant(jq("div.rf-cp-ico-exp")); - JQueryLocator input = pjq("select[id$=rightIconExpandedInput]"); + JQueryLocator input = pjq("select[id$=rightExpandedIconInput]"); JQueryLocator image = rightIcon.getChild(jq("img:nth-child(1)")); // icon=null Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc. and individual contributors + * 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. * @@ -90,13 +90,10 @@ @Test public void testContentClass() { - ElementLocator<?> classInput = pjq("input[id$=contentClassInput]"); - final String value = "metamer-ftest-class"; - - selenium.type(classInput, value); + selenium.type(pjq("input[id$=contentClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(itemContents[0], value), "contentClass does not work"); + assertTrue(selenium.belongsClass(itemContents[0], "metamer-ftest-class"), "contentClass does not work"); } @Test @@ -149,6 +146,20 @@ } @Test + public void testHeaderActiveClass() { + selenium.type(pjq("input[id$=headerActiveClassInput]"), "metamer-ftest-class"); + selenium.waitForPageToLoad(); + + assertTrue(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "headerActiveClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "headerActiveClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "headerActiveClass does not work"); + + assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerActiveClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerActiveClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "headerActiveClass does not work"); + } + + @Test public void testHeaderClass() { selenium.type(pjq("input[id$=headerClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); @@ -163,48 +174,34 @@ } @Test - public void testheaderClassActive() { - selenium.type(pjq("input[id$=headerClassActiveInput]"), "metamer-ftest-class"); + public void testHeaderDisabledClass() { + selenium.type(pjq("input[id$=headerDisabledClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "tabHeaderClassActive does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "tabHeaderClassActive does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertFalse(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "headerDisabledClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "headerDisabledClass does not work"); + assertTrue(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "headerDisabledClass does not work"); - assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "tabHeaderClassActive does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "tabHeaderClassActive does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerDisabledClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerDisabledClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "headerDisabledClass does not work"); } @Test - public void testTabHeaderClassDisabled() { - selenium.type(pjq("input[id$=headerClassDisabledInput]"), "metamer-ftest-class"); + public void testHeaderInactiveClass() { + selenium.type(pjq("input[id$=headerInactiveClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); - assertFalse(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); - assertTrue(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertFalse(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "headerInactiveClass does not work"); + assertTrue(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "headerInactiveClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "headerInactiveClass does not work"); - assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerInactiveClass does not work"); + assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerInactiveClass does not work"); + assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "headerInactiveClass does not work"); } @Test - public void testTabHeaderClassInactive() { - selenium.type(pjq("input[id$=headerClassInactiveInput]"), "metamer-ftest-class"); - selenium.waitForPageToLoad(); - - assertFalse(selenium.belongsClass(activeHeaders[0], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - assertTrue(selenium.belongsClass(inactiveHeaders[0], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[0], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - - assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - assertFalse(selenium.belongsClass(disabledHeaders[1], "metamer-ftest-class"), "tabHeaderClassInactive does not work"); - } - - @Test public void testHeaderStyle() { ElementLocator<?> styleInput = pjq("input[id$=headerStyleInput]"); final String value = "background-color: yellow; font-size: 1.5em;"; Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-01-31 13:40:36 UTC (rev 21321) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-01-31 13:42:56 UTC (rev 21322) @@ -103,6 +103,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10351") public void testActiveItem() { selenium.type(pjq("input[type=text][id$=activeItemInput]"), "tab5"); selenium.waitForPageToLoad(); @@ -442,88 +443,88 @@ } @Test - public void testTabContentClass() { - final String value = "metamer-ftest-class"; - - selenium.type(pjq("input[id$=tabContentClassInput]"), value); - selenium.waitForPageToLoad(); - - assertTrue(selenium.belongsClass(itemContents[0], value), "tabContentClass does not work"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-9309") - public void testTabHeaderClass() { - selenium.type(pjq("input[id$=tabHeaderClassInput]"), "metamer-ftest-class"); + public void testTabActiveHeaderClass() { + selenium.type(pjq("input[id$=tabActiveHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); for (JQueryLocator loc : activeHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabActiveHeaderClass does not work"); } for (JQueryLocator loc : inactiveHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabActiveHeaderClass does not work"); } for (JQueryLocator loc : disabledHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabActiveHeaderClass does not work"); } } @Test + public void testTabContentClass() { + final String value = "metamer-ftest-class"; + + selenium.type(pjq("input[id$=tabContentClassInput]"), value); + selenium.waitForPageToLoad(); + + assertTrue(selenium.belongsClass(itemContents[0], value), "tabContentClass does not work"); + } + + @Test @IssueTracking("https://issues.jboss.org/browse/RF-9309") - public void testTabHeaderClassActive() { - selenium.type(pjq("input[id$=tabHeaderClassActiveInput]"), "metamer-ftest-class"); + public void testTabDisabledHeaderClass() { + selenium.type(pjq("input[id$=tabDisabledHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); for (JQueryLocator loc : activeHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabDisabledHeaderClass does not work"); } for (JQueryLocator loc : inactiveHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabDisabledHeaderClass does not work"); } for (JQueryLocator loc : disabledHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassActive does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabDisabledHeaderClass does not work"); } } @Test @IssueTracking("https://issues.jboss.org/browse/RF-9309") - public void testTabHeaderClassDisabled() { - selenium.type(pjq("input[id$=tabHeaderClassDisabledInput]"), "metamer-ftest-class"); + public void testTabHeaderClass() { + selenium.type(pjq("input[id$=tabHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); for (JQueryLocator loc : activeHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); } for (JQueryLocator loc : inactiveHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); } for (JQueryLocator loc : disabledHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassDisabled does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClass does not work"); } } @Test @IssueTracking("https://issues.jboss.org/browse/RF-9309") - public void testTabHeaderClassInactive() { - selenium.type(pjq("input[id$=tabHeaderClassInactiveInput]"), "metamer-ftest-class"); + public void testTabInactiveHeaderClass() { + selenium.type(pjq("input[id$=tabInactiveHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); for (JQueryLocator loc : activeHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassInactive does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabInactiveHeaderClass does not work"); } for (JQueryLocator loc : inactiveHeaders) { - assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassInactive does not work"); + assertTrue(selenium.belongsClass(loc, "metamer-ftest-class"), "tabInactiveHeaderClass does not work"); } for (JQueryLocator loc : disabledHeaders) { - assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabHeaderClassInactive does not work"); + assertFalse(selenium.belongsClass(loc, "metamer-ftest-class"), "tabInactiveHeaderClass does not work"); } }