Author: ppitonak(a)redhat.com Date: 2011-02-03 11:13:39 -0500 (Thu, 03 Feb 2011) New Revision: 21423 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/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/richTab/TestRichTab.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java Log: * fixed sample for tab panel * tests fixed and refactored Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-03 15:23:20 UTC (rev 21422) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-03 16:13:39 UTC (rev 21423) @@ -71,11 +71,11 @@ style="#{richTabPanelBean.attributes['style'].value}" styleClass="#{richTabPanelBean.attributes['styleClass'].value}" switchType="#{richTabPanelBean.attributes['switchType'].value}" + tabActiveHeaderClass="#{richTabPanelBean.attributes['tabActiveHeaderClass'].value}" tabContentClass="#{richTabPanelBean.attributes['tabContentClass'].value}" + tabDisabledHeaderClass="#{richTabPanelBean.attributes['tabDisabledHeaderClass'].value}" tabHeaderClass="#{richTabPanelBean.attributes['tabHeaderClass'].value}" - tabHeaderClassActive="#{richTabPanelBean.attributes['tabHeaderClassActive'].value}" - tabHeaderClassDisabled="#{richTabPanelBean.attributes['tabHeaderClassDisabled'].value}" - tabHeaderClassInactive="#{richTabPanelBean.attributes['tabHeaderClassInactive'].value}" + tabInactiveHeaderClass="#{richTabPanelBean.attributes['tabInactiveHeaderClass'].value}" title="#{richTabPanelBean.attributes['title'].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-02-03 15:23:20 UTC (rev 21422) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-03 16:13:39 UTC (rev 21423) @@ -297,7 +297,7 @@ JQueryLocator input = pjq("select[id$=itemDisabledLeftIconInput]"); JQueryLocator image = leftIcon.format(4).getChild(jq("img")); - verifyStandardIcons(input, icon, image, "-dis"); + verifyStandardIcons(input, icon, image, "-hdr-dis"); } @Test 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-02-03 15:23:20 UTC (rev 21422) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-02-03 16:13:39 UTC (rev 21423) @@ -50,8 +50,8 @@ public class TestRichTab extends AbstractMetamerTest { private JQueryLocator panel = pjq("div[id$=tabPanel]"); - private JQueryLocator[] itemContents = {pjq("div[id$=tab1] > div.rf-tb-cnt"), pjq("div[id$=tab2] > div.rf-tb-cnt"), - pjq("div[id$=tab3] > div.rf-tb-cnt"), pjq("div[id$=tab4] > div.rf-tb-cnt"), pjq("div[id$=tab5] > div.rf-tb-cnt")}; + private JQueryLocator[] itemContents = {pjq("div[id$=tab1] > div.rf-tab-cnt"), pjq("div[id$=tab2] > div.rf-tab-cnt"), + pjq("div[id$=tab3] > div.rf-tab-cnt"), pjq("div[id$=tab4] > div.rf-tab-cnt"), pjq("div[id$=tab5] > div.rf-tab-cnt")}; private JQueryLocator[] activeHeaders = {pjq("td[id$=tab1:header:active]"), pjq("td[id$=tab2:header:active]"), pjq("td[id$=tab3:header:active]"), pjq("td[id$=tab4:header:active]"), pjq("td[id$=tab5:header:active]")}; private JQueryLocator[] inactiveHeaders = {pjq("td[id$=tab1:header:inactive]"), pjq("td[id$=tab2:header:inactive]"), 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-02-03 15:23:20 UTC (rev 21422) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-03 16:13:39 UTC (rev 21423) @@ -55,8 +55,8 @@ private JQueryLocator panel = pjq("div[id$=tabPanel]"); private JQueryLocator[] items = {pjq("div[id$=tab1]"), pjq("div[id$=tab2]"), pjq("div[id$=tab3]"), pjq("div[id$=tab4]"), pjq("div[id$=tab5]")}; - private JQueryLocator[] itemContents = {pjq("div[id$=tab1] > div.rf-tb-cnt"), pjq("div[id$=tab2] > div.rf-tb-cnt"), - pjq("div[id$=tab3] > div.rf-tb-cnt"), pjq("div[id$=tab4] > div.rf-tb-cnt"), pjq("div[id$=tab5] > div.rf-tb-cnt")}; + private JQueryLocator[] itemContents = {pjq("div[id$=tab1] > div.rf-tab-cnt"), pjq("div[id$=tab2] > div.rf-tab-cnt"), + pjq("div[id$=tab3] > div.rf-tab-cnt"), pjq("div[id$=tab4] > div.rf-tab-cnt"), pjq("div[id$=tab5] > div.rf-tab-cnt")}; private JQueryLocator[] activeHeaders = {pjq("td[id$=tab1:header:active]"), pjq("td[id$=tab2:header:active]"), pjq("td[id$=tab3:header:active]"), pjq("td[id$=tab4:header:active]"), pjq("td[id$=tab5:header:active]")}; private JQueryLocator[] inactiveHeaders = {pjq("td[id$=tab1:header:inactive]"), pjq("td[id$=tab2:header:inactive]"),