Author: lfryc(a)redhat.com Date: 2011-02-18 06:31:15 -0500 (Fri, 18 Feb 2011) New Revision: 21755 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java Log: richAccordion - fixed itemChangeListener which changed the expected output of UIComponent.toString() Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-02-18 11:30:20 UTC (rev 21754) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-02-18 11:31:15 UTC (rev 21755) @@ -405,7 +405,7 @@ * an event representing the activation of a user interface component */ public void itemChangeListener(ItemChangeEvent event) { - logToPage("* item changed: " + event.getOldItem() + " -> " + event.getNewItem()); + logToPage("* item changed: " + event.getOldItem().getId() + " -> " + event.getNewItem().getId()); } /** Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-18 11:30:20 UTC (rev 21754) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-18 11:31:15 UTC (rev 21755) @@ -29,9 +29,7 @@ import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotSame; import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; import java.net.URL; @@ -58,19 +56,19 @@ public class TestRichAccordion extends AbstractMetamerTest { private JQueryLocator accordion = pjq("div[id$=accordion]"); - private JQueryLocator[] itemHeaders = {pjq("div[id$=item1:header]"), pjq("div[id$=item2:header]"), - pjq("div[id$=item3:header]"), pjq("div[id$=item4:header]"), pjq("div[id$=item5:header]")}; - private JQueryLocator[] itemContents = {pjq("div[id$=item1:content]"), pjq("div[id$=item2:content]"), - pjq("div[id$=item3:content]"), pjq("div[id$=item4:content]"), pjq("div[id$=item5:content]")}; - private JQueryLocator[] activeHeaders = {pjq("div[id$=item1:header] div.rf-ac-itm-lbl-act"), + private JQueryLocator[] itemHeaders = { pjq("div[id$=item1:header]"), pjq("div[id$=item2:header]"), + pjq("div[id$=item3:header]"), pjq("div[id$=item4:header]"), pjq("div[id$=item5:header]") }; + private JQueryLocator[] itemContents = { pjq("div[id$=item1:content]"), pjq("div[id$=item2:content]"), + pjq("div[id$=item3:content]"), pjq("div[id$=item4:content]"), pjq("div[id$=item5:content]") }; + private JQueryLocator[] activeHeaders = { pjq("div[id$=item1:header] div.rf-ac-itm-lbl-act"), pjq("div[id$=item2:header] div.rf-ac-itm-lbl-act"), pjq("div[id$=item3:header] div.rf-ac-itm-lbl-act"), - pjq("div[id$=item4:header] div.rf-ac-itm-lbl-act"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-act")}; - private JQueryLocator[] inactiveHeaders = {pjq("div[id$=item1:header] div.rf-ac-itm-lbl-inact"), + pjq("div[id$=item4:header] div.rf-ac-itm-lbl-act"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-act") }; + private JQueryLocator[] inactiveHeaders = { pjq("div[id$=item1:header] div.rf-ac-itm-lbl-inact"), pjq("div[id$=item2:header] div.rf-ac-itm-lbl-inact"), pjq("div[id$=item3:header] div.rf-ac-itm-lbl-inact"), - pjq("div[id$=item4:header] div.rf-ac-itm-lbl-inact"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-inact")}; - private JQueryLocator[] disabledHeaders = {pjq("div[id$=item1:header] div.rf-ac-itm-lbl-dis"), + pjq("div[id$=item4:header] div.rf-ac-itm-lbl-inact"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-inact") }; + private JQueryLocator[] disabledHeaders = { pjq("div[id$=item1:header] div.rf-ac-itm-lbl-dis"), pjq("div[id$=item2:header] div.rf-ac-itm-lbl-dis"), pjq("div[id$=item3:header] div.rf-ac-itm-lbl-dis"), - pjq("div[id$=item4:header] div.rf-ac-itm-lbl-dis"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-dis")}; + pjq("div[id$=item4:header] div.rf-ac-itm-lbl-dis"), pjq("div[id$=item5:header] div.rf-ac-itm-lbl-dis") }; private JQueryLocator leftIcon = pjq("div[id$=item{0}] td.rf-ac-itm-ico"); private JQueryLocator rightIcon = pjq("div[id$=item{0}] td.rf-ac-itm-exp-ico"); @@ -134,7 +132,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10054") + @RegressionTest("https://issues.jboss.org/browse/RF-10054") public void testBypassUpdates() { selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -143,7 +141,7 @@ waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, - PhaseId.RENDER_RESPONSE); + PhaseId.RENDER_RESPONSE); phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "item changed: item1 -> item3"); } @@ -228,7 +226,8 @@ // icon=null for (int i = 1; i < 6; i++) { - assertFalse(selenium.isElementPresent(leftIcon.format(i)), "Left icon of item" + i + " should not be present on the page."); + assertFalse(selenium.isElementPresent(leftIcon.format(i)), "Left icon of item" + i + + " should not be present on the page."); } verifyStandardIcons(input, icon, image, "-hdr"); @@ -242,7 +241,8 @@ // icon=null for (int i = 1; i < 6; i++) { - assertFalse(selenium.isElementPresent(rightIcon.format(i)), "Right icon of item" + i + " should not be present on the page."); + assertFalse(selenium.isElementPresent(rightIcon.format(i)), "Right icon of item" + i + + " should not be present on the page."); } verifyStandardIcons(input, icon, image, "-hdr"); @@ -337,7 +337,8 @@ guardXhr(selenium).click(itemHeaders[1]); waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(itemContents[1])); - waitGui.failWith("onbeforeitemchange attribute does not work correctly").until(new EventFiredCondition(new Event("beforeitemchange"))); + waitGui.failWith("onbeforeitemchange attribute does not work correctly").until( + new EventFiredCondition(new Event("beforeitemchange"))); } @Test @@ -358,7 +359,8 @@ guardXhr(selenium).click(itemHeaders[1]); waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(itemContents[1])); - waitGui.failWith("onitemchange attribute does not work correctly").until(new EventFiredCondition(new Event("itemchange"))); + waitGui.failWith("onitemchange attribute does not work correctly").until( + new EventFiredCondition(new Event("itemchange"))); } @Test @@ -475,38 +477,56 @@ selenium.select(input, optionLabel("chevronDown")); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down" + classSuffix), "Div should have set class rf-ico-chevron-down" + classSuffix + "."); - assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronDown" + imageNameSuffix + ".png"), "Icon should contain a chevron down."); + assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-down" + classSuffix), + "Div should have set class rf-ico-chevron-down" + classSuffix + "."); + assertTrue( + selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronDown" + imageNameSuffix + ".png"), + "Icon should contain a chevron down."); selenium.select(input, optionLabel("chevronUp")); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up" + classSuffix), "Div should have set class rf-ico-chevron-up" + classSuffix + "."); - assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronUp" + imageNameSuffix + ".png"), "Icon should contain a chevron up."); + assertTrue(selenium.belongsClass(icon, "rf-ico-chevron-up" + classSuffix), + "Div should have set class rf-ico-chevron-up" + classSuffix + "."); + assertTrue( + selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("ChevronUp" + imageNameSuffix + ".png"), + "Icon should contain a chevron up."); selenium.select(input, optionLabel("disc")); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(icon, "rf-ico-disc" + classSuffix), "Div should have set class rf-ico-disc" + classSuffix + "."); - assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Disc" + imageNameSuffix + ".png"), "Icon should contain a disc."); + assertTrue(selenium.belongsClass(icon, "rf-ico-disc" + classSuffix), "Div should have set class rf-ico-disc" + + classSuffix + "."); + assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Disc" + imageNameSuffix + ".png"), + "Icon should contain a disc."); selenium.select(input, optionLabel("grid")); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(icon, "rf-ico-grid" + classSuffix), "Div should have set class rf-ico-grid" + classSuffix + "."); - assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Grid" + imageNameSuffix + ".png"), "Icon should contain a grid."); + assertTrue(selenium.belongsClass(icon, "rf-ico-grid" + classSuffix), "Div should have set class rf-ico-grid" + + classSuffix + "."); + assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Grid" + imageNameSuffix + ".png"), + "Icon should contain a grid."); selenium.select(input, optionLabel("triangle")); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(icon, "rf-ico-triangle" + classSuffix), "Div should have set class rf-ico-triangle" + classSuffix + "."); - assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("Triangle" + imageNameSuffix + ".png"), "Icon should contain a triangle."); + assertTrue(selenium.belongsClass(icon, "rf-ico-triangle" + classSuffix), + "Div should have set class rf-ico-triangle" + classSuffix + "."); + assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE) + .contains("Triangle" + imageNameSuffix + ".png"), "Icon should contain a triangle."); selenium.select(input, optionLabel("triangleDown")); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-down" + classSuffix), "Div should have set class rf-ico-triangle-down" + classSuffix + "."); - assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleDown" + imageNameSuffix + ".png"), "Icon should contain a triangle down."); + assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-down" + classSuffix), + "Div should have set class rf-ico-triangle-down" + classSuffix + "."); + assertTrue( + selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleDown" + imageNameSuffix + ".png"), + "Icon should contain a triangle down."); selenium.select(input, optionLabel("triangleUp")); selenium.waitForPageToLoad(); - assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-up" + classSuffix), "Div should have set class rf-ico-triangle-up" + classSuffix + "."); - assertTrue(selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleUp" + imageNameSuffix + ".png"), "Icon should contain a triangle up."); + assertTrue(selenium.belongsClass(icon, "rf-ico-triangle-up" + classSuffix), + "Div should have set class rf-ico-triangle-up" + classSuffix + "."); + assertTrue( + selenium.getStyle(icon, CssProperty.BACKGROUND_IMAGE).contains("TriangleUp" + imageNameSuffix + ".png"), + "Icon should contain a triangle up."); selenium.select(input, optionLabel("none")); selenium.waitForPageToLoad(); @@ -516,12 +536,14 @@ selenium.waitForPageToLoad(); assertFalse(selenium.isElementPresent(icon), "Icon's div should not be present when icon=star."); assertTrue(selenium.isElementPresent(image), "Icon's image should be rendered."); - assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("star.png"), "Icon's src attribute should contain star.png."); + assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("star.png"), + "Icon's src attribute should contain star.png."); selenium.select(input, optionLabel("nonexisting")); selenium.waitForPageToLoad(); assertFalse(selenium.isElementPresent(icon), "Icon's div should not be present when icon=nonexisting."); assertTrue(selenium.isElementPresent(image), "Icon's image should be rendered."); - assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("nonexisting"), "Icon's src attribute should contain nonexisting."); + assertTrue(selenium.getAttribute(image.getAttribute(Attribute.SRC)).contains("nonexisting"), + "Icon's src attribute should contain nonexisting."); } }