[richfaces-svn-commits] JBoss Rich Faces SVN: r20933 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel and 1 other directory.

Author: ppitonak(a)redhat.com Date: 2011-01-10 09:45:29 -0500 (Mon, 10 Jan 2011) New Revision: 20933 Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java Log: * fixed tests for rich:tabPanel * executeChecker moved into a form Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2011-01-10 14:34:39 UTC (rev 20932) +++ modules/tests/metamer/trunk/application/src/main/webapp/templates/template.xhtml 2011-01-10 14:45:29 UTC (rev 20933) @@ -38,18 +38,20 @@ </h:head> <h:body> - <h:selectBooleanCheckbox id="executeChecker" value="#{richBean.executeChecker}" style="display: none" /> - + <h:form id="executeCheckerForm"> + <h:selectBooleanCheckbox id="executeChecker" value="#{richBean.executeChecker}" style="display: none" /> + </h:form> + <div class="header"><ui:decorate template="/templates/header.xhtml" /></div> <div class="content"> <div class="messages"><h:messages /></div> <h:panelGroup id="commonGrid" layout="block" rendered="#{richBean.reComponent}"> - - <c:set var="nestedPrefix" value="#{templateBean.componentPrefix}" /> - <c:set var="nestedComponentId" value="#{templateBean.componentPrefix}#{componentId}" /> - + + <c:set var="nestedPrefix" value="#{templateBean.componentPrefix}" /> + <c:set var="nestedComponentId" value="#{templateBean.componentPrefix}#{componentId}" /> + <c:choose> <c:when test="#{dontRenderForm}"> <div style="margin-bottom: 20px;"><ui:insert name="outOfTemplateBefore" /></div> 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-10 14:34:39 UTC (rev 20932) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-01-10 14:45:29 UTC (rev 20933) @@ -313,6 +313,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-10165") public void testItemchangeEvents() { selenium.type(pjq("input[type=text][id$=onbeforeitemchangeInput]"), "metamerEvents += \"beforeitemchange \""); selenium.waitForPageToLoad(); @@ -327,8 +328,9 @@ String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); + assertEquals(events.length, 2, "Two events should be fired - beforeitemchange and itemchange."); assertEquals(events[0], "beforeitemchange", "Attribute onbeforeitemchange doesn't work"); - assertEquals(events[1], "itemchange", "Attribute onbeforeitemchange doesn't work"); + assertEquals(events[1], "itemchange", "Attribute onitemchange doesn't work"); } @Test @@ -408,6 +410,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-9309") public void testTabHeaderClass() { selenium.type(pjq("input[id$=tabHeaderClassInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); @@ -426,6 +429,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-9309") public void testTabHeaderClassActive() { selenium.type(pjq("input[id$=tabHeaderClassActiveInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); @@ -444,6 +448,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-9309") public void testTabHeaderClassDisabled() { selenium.type(pjq("input[id$=tabHeaderClassDisabledInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad(); @@ -462,6 +467,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-9309") public void testTabHeaderClassInactive() { selenium.type(pjq("input[id$=tabHeaderClassInactiveInput]"), "metamer-ftest-class"); selenium.waitForPageToLoad();