Author: jpapouse Date: 2011-10-14 10:03:29 -0400 (Fri, 14 Oct 2011) New Revision: 22806 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/moreStacks.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/validation.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyStackAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java Log: notify: fixing tests and issue tracking Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/moreStacks.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/moreStacks.xhtml 2011-10-14 13:59:38 UTC (rev 22805) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/moreStacks.xhtml 2011-10-14 14:03:29 UTC (rev 22806) @@ -28,6 +28,14 @@ <ui:composition template="/templates/template.xhtml"> + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + <ui:define name="component"> <h:form> <rich:notifyMessages ajaxRendered="true" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/simple.xhtml 2011-10-14 13:59:38 UTC (rev 22805) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/simple.xhtml 2011-10-14 14:03:29 UTC (rev 22806) @@ -29,6 +29,14 @@ <ui:composition template="/templates/template.xhtml"> + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + <ui:define name="component"> <h:form> <a4j:outputPanel ajaxRendered="true"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/validation.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/validation.xhtml 2011-10-14 13:59:38 UTC (rev 22805) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richNotify/validation.xhtml 2011-10-14 14:03:29 UTC (rev 22806) @@ -28,6 +28,14 @@ <ui:composition template="/templates/template.xhtml"> + <ui:define name="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + <ui:define name="component"> <h:form> <rich:notifyMessages ajaxRendered="true" Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyStackAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyStackAttributes.java 2011-10-14 13:59:38 UTC (rev 22805) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyStackAttributes.java 2011-10-14 14:03:29 UTC (rev 22806) @@ -28,7 +28,9 @@ */ public enum NotifyStackAttributes implements AttributeEnum { - rendered, - styleClass - + direction, + method, + position, + rendered + } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java 2011-10-14 13:59:38 UTC (rev 22805) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java 2011-10-14 14:03:29 UTC (rev 22806) @@ -37,6 +37,7 @@ import org.jboss.test.selenium.waiting.NegationCondition; import org.jboss.test.selenium.waiting.selenium.SeleniumCondition; import org.richfaces.tests.metamer.bean.rich.RichNotifyBean; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -72,13 +73,13 @@ @Test public void testAttributeDelay() { - // set the delay to <1000> - attributesNotify.set(NotifyAttributes.delay, 1000); - // wait for <500> - delay(500); - assertFalse(selenium.isElementPresent(notify), "The delay is set to 1000 and after some little waiting the notify shouldn't be present."); + // set the delay to <2000> + attributesNotify.set(NotifyAttributes.delay, 2000); // wait for <1000> delay(1000); + assertFalse(selenium.isElementPresent(notify), "The delay is set to 1000 and after some little waiting the notify shouldn't be present."); + // wait for <1500> + delay(1500); assertTrue(selenium.isElementPresent(notify), "The delay is set to 1000 and after some waiting the notify should be present."); } @@ -149,6 +150,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-11433") public void testAttributeSticky() { // set the stayTime to <0> attributesNotify.set(NotifyAttributes.stayTime, 0); @@ -323,17 +325,16 @@ // set the sticky to <true> selenium.click(pjq("input[type=radio][name*='attributesNotifyMessages:sticky'][value=true]")); selenium.waitForPageToLoad(); - // produce messages for(String type : messages.keySet()) { + // produce message produceMessage(messages.get(type), type, 1); - } - // check whether the messages are still present - delay(500); - for(String type : messages.keySet()) { + delay(500); + // check whether the messages are still present waitGui .failWith("The stayTime is set to <0> and sticky to <true>, so the " + type + " message should be present.") - .until(elementPresent.locator(messages.get(type))); - } + .until(elementPresent.locator(messages.get(type))); + closeAll(notify); + } } @Test @@ -353,12 +354,6 @@ } @Test - public void testAttributeStackStyleClass() { - attributesStack.set(NotifyStackAttributes.styleClass, "someNiceStyleClass"); - assertTrue(selenium.belongsClass(notifyStack, "someNiceStyleClass")); - } - - @Test public void testInit() { assertTrue(selenium.isElementPresent(notify), "There is no notify message after page is loaded."); assertEquals(selenium.getText(getDetail(notify)), RichNotifyBean.DEFAULT_DETAIL, "The notify detail doesn't match."); @@ -366,6 +361,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-11433") public void testCloseAndProduceNotify() { // check closing the notify close(notify); @@ -391,6 +387,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-11433") public void testProduceMoreMessages() { // set the messageCount to <testedNumber> int testedNumber = 3;