Author: konstantin.mishin Date: 2008-11-28 12:25:57 -0500 (Fri, 28 Nov 2008) New Revision: 11447 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/MessageBean2.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/message.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java Log: RF-5114 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/MessageBean2.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/MessageBean2.java 2008-11-28 17:00:50 UTC (rev 11446) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/MessageBean2.java 2008-11-28 17:25:57 UTC (rev 11447) @@ -8,20 +8,27 @@ import javax.faces.validator.ValidatorException; public class MessageBean2 implements Validator{ - - static public final String MESSAGE = "Validation is failed"; private String string; private Boolean rendered; + private Boolean showDetail; + + private Boolean showSummary; + + private Boolean ajaxRendered; + public MessageBean2() { - + init(); } public void init() { string = "something"; rendered = true; + showDetail = true; + showSummary = false; + ajaxRendered = false; } public void validate(FacesContext context, UIComponent component, @@ -37,9 +44,8 @@ severity = FacesMessage.SEVERITY_INFO; } if (severity != null) { - FacesMessage message = new FacesMessage(MESSAGE); - message.setSeverity(severity); - throw new ValidatorException(message); + throw new ValidatorException(new FacesMessage(severity, + "messageSummary", "messageDetail")); } } @@ -58,5 +64,29 @@ public Boolean getRendered() { return rendered; } + + public void setShowDetail(Boolean showDetail) { + this.showDetail = showDetail; + } + + public Boolean getShowDetail() { + return showDetail; + } + + public void setShowSummary(Boolean showSummary) { + this.showSummary = showSummary; + } + + public Boolean getShowSummary() { + return showSummary; + } + + public void setAjaxRendered(Boolean ajaxRendered) { + this.ajaxRendered = ajaxRendered; + } + + public Boolean getAjaxRendered() { + return ajaxRendered; + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/message.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/message.xhtml 2008-11-28 17:00:50 UTC (rev 11446) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/message/message.xhtml 2008-11-28 17:25:57 UTC (rev 11447) @@ -16,11 +16,26 @@ <h:selectBooleanCheckbox id="rendered" value="#{messageBean.rendered}"> <a4j:support event="onchange" /> </h:selectBooleanCheckbox> + <h:outputText value="showSummary" /> + <h:selectBooleanCheckbox id="showSummary" value="#{messageBean.showSummary}"> + <a4j:support event="onchange" /> + </h:selectBooleanCheckbox> + <h:outputText value="showDetail" /> + <h:selectBooleanCheckbox id="showDetail" value="#{messageBean.showDetail}"> + <a4j:support event="onchange" /> + </h:selectBooleanCheckbox> + <h:outputText value="ajaxRendered" /> + <h:selectBooleanCheckbox id="ajaxRendered" value="#{messageBean.ajaxRendered}"> + <a4j:support event="onchange" /> + </h:selectBooleanCheckbox> </h:form> <h:form id="mainForm"> <h:panelGroup id="panel"> <h:inputText id="inputText" value="#{messageBean.string}" validator="#{messageBean.validate}"></h:inputText> <rich:message id="message" for="inputText" + ajaxRendered="false" + showSummary="#{messageBean.showSummary}" + showDetail="#{messageBean.showDetail}" rendered="#{messageBean.rendered}" <f:facet name="fatalMarker"> Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java 2008-11-28 17:00:50 UTC (rev 11446) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java 2008-11-28 17:25:57 UTC (rev 11447) @@ -17,7 +17,13 @@ private String rendered; - private void init(Template template) { + private String showDetail; + + private String showSummary; + + private String ajaxRendered; + + private void init(Template template) { renderPage(template, "#{messageBean.init}"); mainForm = getParentId() + "mainForm"; inputText = mainForm + ":inputText"; @@ -25,9 +31,34 @@ submit = mainForm + ":submit"; String attrForm = getParentId() + "attrForm"; rendered = attrForm + ":rendered"; + showDetail = attrForm + ":showDetail"; + showSummary = attrForm + ":showSummary"; + ajaxRendered = attrForm + ":ajaxRendered"; } /** + * showDetail and showSummary attributes work + */ + @Test + public void testShowDetailAndShowSummary(Template template) { + init(template); + String locator = "xpath=id('" + message + "')/span[2]"; + Assert.assertTrue(selenium.getText(locator).length() == 0); + selenium.type(inputText, "fatal"); + clickAjaxCommandAndWait(submit); + Assert.assertTrue("messageDetail".equals(selenium.getText(locator))); + clickAjaxCommandAndWait(showSummary); + selenium.type(inputText, "fatal"); + clickAjaxCommandAndWait(submit); + Assert.assertTrue("messageSummarymessageDetail".equals(selenium.getText(locator))); + clickAjaxCommandAndWait(showDetail); + selenium.type(inputText, "fatal"); + clickAjaxCommandAndWait(submit); + Assert.assertTrue("messageSummary".equals(selenium.getText(locator))); + + } + + /** * level selects message of respective level */ @Test @@ -45,6 +76,9 @@ Assert.assertTrue(selenium.isElementPresent(mainForm + ":passedMarker")); selenium.type(inputText, "fatal"); clickAjaxCommandAndWait(mainForm + ":submitWithoutReRender"); + Assert.assertTrue(selenium.isElementPresent(mainForm + ":passedMarker")); + clickAjaxCommandAndWait(ajaxRendered); + clickAjaxCommandAndWait(mainForm + ":submitWithoutReRender"); Assert.assertTrue(selenium.isElementPresent(mainForm + ":fatalMarker")); }