Author: lfryc(a)redhat.com Date: 2011-03-01 03:58:44 -0500 (Tue, 01 Mar 2011) New Revision: 21996 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/richTooltip/TestTooltipSimple.java Log: fixed rich:tabPanel testItemChangeListener + removed issue tracking for RF-10523, RF-10522 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-03-01 06:06:08 UTC (rev 21995) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-03-01 08:58:44 UTC (rev 21996) @@ -24,7 +24,6 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; -import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -181,13 +180,11 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10523") + @RegressionTest("https://issues.jboss.org/browse/RF-10523") public void testItemChangeListener() { selenium.click(inactiveHeaders[2]); waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - String listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(5)")); - assertEquals(listenerOutput, "* item changed: tab1 -> tab3", "Item change listener's output"); + phaseInfo.assertListener(PhaseId.UPDATE_MODEL_VALUES, "item changed: tab1 -> tab3"); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-03-01 06:06:08 UTC (rev 21995) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-03-01 08:58:44 UTC (rev 21996) @@ -50,7 +50,7 @@ import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.DelayTester; import org.richfaces.tests.metamer.ftest.annotations.Inject; -import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.annotations.Uses; import org.testng.annotations.Test; @@ -303,7 +303,7 @@ @Test @Use(field = "presetDelay", ints = { 0, 1000, 5000 }) - @IssueTracking("https://issues.jboss.org/browse/RF-10522") + @RegressionTest("https://issues.jboss.org/browse/RF-10522") public void testShowDelay() { attributes.setMode(TooltipMode.client);