Author: ppitonak(a)redhat.com Date: 2011-01-10 09:13:39 -0500 (Mon, 10 Jan 2011) New Revision: 20930 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestFacets.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java Log: * fixed tests for rich:collapsiblePanel Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestFacets.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestFacets.java 2011-01-10 13:38:07 UTC (rev 20929) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestFacets.java 2011-01-10 14:13:39 UTC (rev 20930) @@ -45,8 +45,8 @@ private JQueryLocator panel = pjq("div[id$=collapsiblePanel]"); private JQueryLocator header = pjq("div[id$=collapsiblePanel:header]"); - private JQueryLocator headerExp = pjq("div[id$=collapsiblePanel:header] div.rf-cp-hdr-exp"); - private JQueryLocator headerColps = pjq("div[id$=collapsiblePanel:header] div.rf-cp-hdr-colps"); + private JQueryLocator headerExp = pjq("div[id$=collapsiblePanel:header] div.rf-cp-lbl-exp"); + private JQueryLocator headerColps = pjq("div[id$=collapsiblePanel:header] div.rf-cp-lbl-colps"); private JQueryLocator content = pjq("div[id$=collapsiblePanel:content]"); @Override @@ -131,7 +131,7 @@ displayed = selenium.isDisplayed(content); assertTrue(displayed, "Panel's content should be visible."); - String text = selenium.getText(header); + String text = selenium.getText(headerExp); assertEquals(text, "header expanded", "Header of the panel."); text = selenium.getText(content); @@ -153,7 +153,7 @@ assertFalse(displayed, "Panel's content should not be visible."); } - String text = selenium.getText(header); + String text = selenium.getText(headerColps); assertEquals(text, "header collapsed", "Header of the panel."); } } 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 2011-01-10 13:38:07 UTC (rev 20929) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-01-10 14:13:39 UTC (rev 20930) @@ -47,9 +47,9 @@ public class TestRichCollapsiblePanel extends AbstractMetamerTest { private JQueryLocator panel = pjq("div[id$=collapsiblePanel]"); - private JQueryLocator header = pjq("div[id$=collapsiblePanel:header]"); - private JQueryLocator headerExp = pjq("div[id$=collapsiblePanel:header] div.rf-cp-hdr-exp"); - private JQueryLocator headerColps = pjq("div[id$=collapsiblePanel:header] div.rf-cp-hdr-colps"); + private JQueryLocator header = pjq("div[id$=collapsiblePanel:header] div.rf-cp-lbl-exp"); + private JQueryLocator headerExp = pjq("div[id$=collapsiblePanel:header] div.rf-cp-lbl-exp"); + private JQueryLocator headerColps = pjq("div[id$=collapsiblePanel:header] div.rf-cp-lbl-colps"); private JQueryLocator content = pjq("div[id$=collapsiblePanel:content]"); @Override @@ -119,7 +119,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9421") + @IssueTracking("https://issues.jboss.org/browse/RF-10054") public void testBypassUpdates() { selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); @@ -146,7 +146,7 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9421") + @IssueTracking("https://issues.jboss.org/browse/RF-10054") public void testImmediate() { selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad();