Author: lfryc(a)redhat.com Date: 2011-02-10 06:37:49 -0500 (Thu, 10 Feb 2011) New Revision: 21591 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTableToggler.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/CollapsibleSubTableTogglerAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/TestCollapsibleSubTableToggler.java Log: fixed collapsibleSubtable tests Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTableToggler.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTableToggler.java 2011-02-10 11:36:56 UTC (rev 21590) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/CollapsibleSubTableToggler.java 2011-02-10 11:37:49 UTC (rev 21591) @@ -12,8 +12,8 @@ super(root); } - ReferencedLocator<JQueryLocator> collapsedTogglers = ref(root, "> span[id$=expand]"); - ReferencedLocator<JQueryLocator> expandedTogglers = ref(root, "> span[id$=collapse]"); + ReferencedLocator<JQueryLocator> collapsedTogglers = ref(root, "> span[id$=collapsed]"); + ReferencedLocator<JQueryLocator> expandedTogglers = ref(root, "> span[id$=expanded]"); public ExtendedLocator<JQueryLocator> getCollapsed() { return collapsedTogglers; Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/CollapsibleSubTableTogglerAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/CollapsibleSubTableTogglerAttributes.java 2011-02-10 11:36:56 UTC (rev 21590) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/CollapsibleSubTableTogglerAttributes.java 2011-02-10 11:37:49 UTC (rev 21591) @@ -29,24 +29,24 @@ * @version $Revision$ */ public class CollapsibleSubTableTogglerAttributes extends AbstractComponentAttributes { - public void setCollapseIcon(String collapseIcon) { - setProperty("collapseIcon", collapseIcon); + public void setCollapsedIcon(String collapsedIcon) { + setProperty("collapsedIcon", collapsedIcon); } - public void setCollapseLabel(String collapseLabel) { - setProperty("collapseLabel", collapseLabel); + public void setCollapsedLabel(String collapsedLabel) { + setProperty("collapsedLabel", collapsedLabel); } public void setEvent(Event event) { setProperty("event", event); } - public void setExpandIcon(String expandIcon) { - setProperty("expandIcon", expandIcon); + public void setExpandedIcon(String expandedIcon) { + setProperty("expandedIcon", expandedIcon); } - public void setExpandLabel(String expandLabel) { - setProperty("expandLabel", expandLabel); + public void setExpandedLabel(String expandedLabel) { + setProperty("expandedLabel", expandedLabel); } public void setRendered(Boolean rendered) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/TestCollapsibleSubTableToggler.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/TestCollapsibleSubTableToggler.java 2011-02-10 11:36:56 UTC (rev 21590) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTableToggler/TestCollapsibleSubTableToggler.java 2011-02-10 11:37:49 UTC (rev 21591) @@ -41,7 +41,6 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; -import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.model.CollapsibleSubTable; import org.richfaces.tests.metamer.ftest.model.CollapsibleSubTableToggler; @@ -89,65 +88,67 @@ @Test public void testCollapsedLabel() { - attributes.setCollapseLabel(LABEL); + attributes.setCollapsedIcon("none"); + attributes.setCollapsedLabel(LABEL); - new TogglerTester(link, image) { + new TogglerTester(image, link) { + String expandedImageUrl; @Override public void verifyBefore() { - assertEquals(selenium.getText(togglerExpanded), LABEL); + assertTrue(selenium.isVisible(togglerExpanded)); + assertFalse(selenium.isVisible(togglerCollapsed)); + expandedImageUrl = selenium.getAttribute(togglerExpanded.getAttribute(SRC)); + } @Override public void verifyMiddle() { assertFalse(selenium.isVisible(togglerExpanded)); assertTrue(selenium.isVisible(togglerCollapsed)); + assertEquals(selenium.getText(togglerCollapsed), LABEL); } @Override public void verifyAfter() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - assertEquals(selenium.getText(togglerExpanded), LABEL); + assertEquals(selenium.getAttribute(togglerExpanded.getAttribute(SRC)), expandedImageUrl); } }.testToggler(); } @Test public void testExpandedLabel() { - attributes.setExpandLabel(LABEL); + attributes.setExpandedLabel(LABEL); - new TogglerTester(image, link) { - String imageUrl; + new TogglerTester(link, image) { @Override public void verifyBefore() { - selenium.getAttribute(togglerExpanded.getAttribute(SRC)); assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - imageUrl = selenium.getAttribute(togglerExpanded.getAttribute(SRC)); + assertEquals(selenium.getText(togglerExpanded), LABEL); } @Override - public void verifyAfter() { - assertTrue(selenium.isVisible(togglerExpanded)); - assertFalse(selenium.isVisible(togglerCollapsed)); - assertEquals(selenium.getAttribute(togglerExpanded.getAttribute(SRC)), imageUrl); - } - - @Override public void verifyMiddle() { assertFalse(selenium.isVisible(togglerExpanded)); assertTrue(selenium.isVisible(togglerCollapsed)); - assertEquals(selenium.getText(togglerCollapsed), LABEL); } + + @Override + public void verifyAfter() { + assertTrue(selenium.isVisible(togglerExpanded)); + assertFalse(selenium.isVisible(togglerCollapsed)); + assertEquals(selenium.getText(togglerExpanded), LABEL); + } }.testToggler(); } - @IssueTracking("https://issues.jboss.org/browse/RF-9725") @Test public void testExpandedIcon() { - attributes.setExpandIcon(IMAGE_URL); + attributes.setExpandedIcon(IMAGE_URL); new TogglerTester(image, image) { @@ -155,40 +156,37 @@ public void verifyBefore() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - assertTrue(selenium.getAttribute(togglerCollapsed.getAttribute(SRC)).contains(IMAGE_URL)); - + assertTrue(selenium.getAttribute(togglerExpanded.getAttribute(SRC)).contains(IMAGE_URL)); } @Override public void verifyMiddle() { assertFalse(selenium.isVisible(togglerExpanded)); assertTrue(selenium.isVisible(togglerCollapsed)); - assertFalse(selenium.getAttribute(togglerCollapsed.getAttribute(SRC)).contains(IMAGE_URL)); } @Override public void verifyAfter() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - assertTrue(selenium.getAttribute(togglerCollapsed.getAttribute(SRC)).contains(IMAGE_URL)); + assertTrue(selenium.getAttribute(togglerExpanded.getAttribute(SRC)).contains(IMAGE_URL)); } }.testToggler(); } - @IssueTracking("https://issues.jboss.org/browse/RF-9725") @Test public void testCollapsedIcon() { - attributes.setCollapseIcon(IMAGE_URL); + attributes.setCollapsedIcon(IMAGE_URL); new TogglerTester(image, image) { - String imageUrl; + String expandedImageUrl; @Override public void verifyBefore() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - imageUrl = selenium.getAttribute(togglerExpanded.getAttribute(SRC)); + expandedImageUrl = selenium.getAttribute(togglerExpanded.getAttribute(SRC)); } @Override @@ -202,7 +200,7 @@ public void verifyAfter() { assertTrue(selenium.isVisible(togglerExpanded)); assertFalse(selenium.isVisible(togglerCollapsed)); - assertEquals(selenium.getAttribute(togglerExpanded.getAttribute(SRC)), imageUrl); + assertEquals(selenium.getAttribute(togglerExpanded.getAttribute(SRC)), expandedImageUrl); } }.testToggler(); }