Author: ppitonak(a)redhat.com Date: 2012-01-11 08:51:19 -0500 (Wed, 11 Jan 2012) New Revision: 23138 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessageBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessagesBean.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/richMessages/TestRichMessagesCSV.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSFValidator.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java Log: tests marked to be fixed in 4.Future refactored Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessageBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessageBean.java 2012-01-10 10:57:10 UTC (rev 23137) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessageBean.java 2012-01-11 13:51:19 UTC (rev 23138) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * Copyright 2010-2012, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -52,7 +52,7 @@ @PostConstruct public void init() { logger = LoggerFactory.getLogger(getClass()); - logger.info("initializing bean " + getClass().getName()); + logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getComponentAttributesFromFacesConfig(UIRichMessage.class, getClass()); // setting up incorrect values to fire-up validator Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessagesBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessagesBean.java 2012-01-10 10:57:10 UTC (rev 23137) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichMessagesBean.java 2012-01-11 13:51:19 UTC (rev 23138) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * Copyright 2010-2012, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -58,7 +58,7 @@ @PostConstruct public void init() { logger = LoggerFactory.getLogger(getClass()); - logger.info("initializing bean " + getClass().getName()); + logger.debug("initializing bean " + getClass().getName()); attributes = Attributes.getComponentAttributesFromFacesConfig(UIRichMessages.class, getClass()); simpleInput1 = "10"; 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 2012-01-10 10:57:10 UTC (rev 23137) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2012-01-11 13:51:19 UTC (rev 23138) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * Copyright 2010-2012, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -44,6 +44,7 @@ import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; +import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.testng.annotations.Test; /** @@ -318,8 +319,9 @@ testTitle(panel); } - @Test(groups = { "4.Future" }) - @IssueTracking("https://issues.jboss.org/browse/RF-11568") + @Test + @Templates(exclude = { "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", + "richList", "a4jRepeat" }) public void testToggleListener() { String reqTime = selenium.getText(time); guardXhr(selenium).click(header); @@ -332,6 +334,14 @@ phaseInfo.assertListener(PhaseId.INVOKE_APPLICATION, "panel expanded"); } + @Test(groups = { "4.Future" }) + @IssueTracking("https://issues.jboss.org/browse/RF-11568") + @Templates(value = { "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", + "richList", "a4jRepeat" }) + public void testToggleListenerInIterationComponents() { + testToggleListener(); + } + private void verifyBeforeClick() { boolean displayed = selenium.isDisplayed(panel); assertTrue(displayed, "Collapsible panel is not present on the page."); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesCSV.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesCSV.java 2012-01-10 10:57:10 UTC (rev 23137) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesCSV.java 2012-01-11 13:51:19 UTC (rev 23138) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * Copyright 2010-2012, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -27,6 +27,7 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.testng.annotations.Test; /** @@ -58,9 +59,18 @@ } // list of called test methods + @Test + @Templates(exclude = { "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", + "richList", "a4jRepeat", "hDataTable", "uiRepeat" }) + public void testFor() { + super.testFor(); + } + @Test(groups = { "4.Future" }) @IssueTracking("https://issues.jboss.org/browse/RF-11298") - public void testFor() { + @Templates(value = { "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", + "richList", "a4jRepeat", "hDataTable", "uiRepeat" }) + public void testForInIterationComponents() { super.testFor(); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSFValidator.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSFValidator.java 2012-01-10 10:57:10 UTC (rev 23137) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSFValidator.java 2012-01-11 13:51:19 UTC (rev 23138) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * Copyright 2010-2012, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -27,6 +27,8 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; +import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.testng.annotations.Test; /** @@ -58,14 +60,23 @@ } // list of called test methods + @Test + @Templates(exclude = { "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", + "richList", "a4jRepeat", "hDataTable", "uiRepeat" }) + public void testFor() { + super.testFor(); + } + @Test(groups = { "4.Future" }) @IssueTracking("https://issues.jboss.org/browse/RF-11298") - public void testFor() { + @Templates(value = { "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", + "richList", "a4jRepeat", "hDataTable", "uiRepeat" }) + public void testForInIterationComponents() { super.testFor(); } - @Test(groups = { "4.Future" }) - @IssueTracking("https://issues.jboss.org/browse/RF-11415") + @Test + @RegressionTest("https://issues.jboss.org/browse/RF-11415") public void testGlobalOnly() { super.testGlobalOnly(); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSR303.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSR303.java 2012-01-10 10:57:10 UTC (rev 23137) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessages/TestRichMessagesJSR303.java 2012-01-11 13:51:19 UTC (rev 23138) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * Copyright 2010-2012, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -27,6 +27,8 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; +import org.richfaces.tests.metamer.ftest.annotations.Templates; import org.testng.annotations.Test; /** @@ -58,14 +60,23 @@ } // list of called test methods + @Test + @Templates(exclude = { "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", + "richList", "a4jRepeat", "hDataTable", "uiRepeat" }) + public void testFor() { + super.testFor(); + } + @Test(groups = { "4.Future" }) @IssueTracking("https://issues.jboss.org/browse/RF-11298") - public void testFor() { + @Templates(value = { "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable", "richDataGrid", + "richList", "a4jRepeat", "hDataTable", "uiRepeat" }) + public void testForInIterationComponents() { super.testFor(); } - @Test(groups = { "4.Future" }) - @IssueTracking("https://issues.jboss.org/browse/RF-11415") + @Test + @RegressionTest("https://issues.jboss.org/browse/RF-11415") public void testGlobalOnly() { super.testGlobalOnly(); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2012-01-10 10:57:10 UTC (rev 23137) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupClientSideHandlers.java 2012-01-11 13:51:19 UTC (rev 23138) @@ -1,6 +1,6 @@ /******************************************************************************* * JBoss, Home of Professional Open Source - * Copyright 2010-2011, Red Hat, Inc. and individual contributors + * Copyright 2010-2012, Red Hat, Inc. and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -41,6 +41,7 @@ /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> * @version $Revision$ */ public class TestPanelMenuGroupClientSideHandlers extends AbstractPanelMenuGroupTest { @@ -90,12 +91,21 @@ super.testRequestEventsAfter(event); } + @Test + @Use(field = "event", strings = { "beforeselect", "beforeswitch", "begin", "beforedomupdate", "select", "switch", + "complete" }) + @Templates(value = { "a4jRepeat", "richCollapsibleSubTable", "richDataGrid", "richDataTable", + "richExtendedDataTable", "richList" }) + public void testClientSideExpansionEventInIterationComponents() { + testClientSideExpansionEvent(); + } + @Test(groups = "4.Future") @IssueTracking("https://issues.jboss.org/browse/RF-11547") - @Use(field = "event", value = "ajaxExpansionEvents") + @Use(field = "event", strings = { "beforeexpand", "expand" }) @Templates(value = { "a4jRepeat", "richCollapsibleSubTable", "richDataGrid", "richDataTable", "richExtendedDataTable", "richList" }) - public void testClientSideExpansionEventInIterationComponents() { + public void testClientSideExpansionEventInIterationComponentsExpand() { testClientSideExpansionEvent(); }