Author: ppitonak(a)redhat.com Date: 2011-03-11 08:27:41 -0500 (Fri, 11 Mar 2011) New Revision: 22161 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java Log: tests for rich:inplaceInput fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java 2011-03-11 12:39:15 UTC (rev 22160) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java 2011-03-11 13:27:41 UTC (rev 22161) @@ -55,7 +55,7 @@ private JQueryLocator inplaceInput = pjq("span[id$=inplaceInput]"); private JQueryLocator label = pjq("span.rf-ii-lbl"); private JQueryLocator input = pjq("input[id$=inplaceInputInput]"); - private JQueryLocator edit = pjq("span.rf-ii-edit"); + private JQueryLocator edit = pjq("span.rf-ii-fld-cntr"); private JQueryLocator okButton = pjq("input.rf-ii-btn[id$=Okbtn]"); private JQueryLocator cancelButton = pjq("input.rf-ii-btn[id$=Cancelbtn]"); private JQueryLocator output = pjq("span[id$=output]"); @@ -79,13 +79,13 @@ @Test public void testClick() { guardNoRequest(selenium).click(inplaceInput); - assertFalse(selenium.belongsClass(edit, "rf-ii-none"), "Edit should not contain class rf-is-none when popup is open."); + assertFalse(selenium.belongsClass(edit, "rf-ii-none"), "Edit should not contain class rf-ii-none when popup is open."); assertTrue(selenium.isDisplayed(input), "Input should be displayed."); selenium.type(input, "new value"); selenium.fireEvent(input, Event.BLUR); - assertTrue(selenium.belongsClass(inplaceInput, "rf-ii-c-s"), "New class should be added to inplace input."); - assertTrue(selenium.belongsClass(edit, "rf-ii-none"), "Edit should contain class rf-is-none when popup is closed."); + assertTrue(selenium.belongsClass(inplaceInput, "rf-ii-chng"), "New class should be added to inplace input."); + assertTrue(selenium.belongsClass(edit, "rf-ii-none"), "Edit should contain class rf-ii-none when popup is closed."); assertEquals(selenium.getText(label), "new value", "Label should contain selected value."); assertEquals(selenium.getText(output), "new value", "Output did not change."); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java 2011-03-11 12:39:15 UTC (rev 22160) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInputFAjax.java 2011-03-11 13:27:41 UTC (rev 22161) @@ -22,7 +22,6 @@ package org.richfaces.tests.metamer.ftest.richInplaceInput; 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; @@ -33,15 +32,9 @@ import javax.faces.event.PhaseId; -import org.jboss.test.selenium.css.CssProperty; import org.jboss.test.selenium.dom.Event; -import org.jboss.test.selenium.locator.Attribute; -import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.JQueryLocator; -import org.jboss.test.selenium.waiting.EventFiredCondition; 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.testng.annotations.Test; /** @@ -55,7 +48,7 @@ private JQueryLocator inplaceInput = pjq("span[id$=inplaceInput]"); private JQueryLocator label = pjq("span.rf-ii-lbl"); private JQueryLocator input = pjq("input[id$=inplaceInputInput]"); - private JQueryLocator edit = pjq("span.rf-ii-edit"); + private JQueryLocator edit = pjq("span.rf-ii-fld-cntr"); private JQueryLocator okButton = pjq("input.rf-ii-btn[id$=Okbtn]"); private JQueryLocator cancelButton = pjq("input.rf-ii-btn[id$=Cancelbtn]"); private JQueryLocator output = pjq("span[id$=output]"); @@ -68,13 +61,13 @@ @Test public void testClick() { guardNoRequest(selenium).click(inplaceInput); - assertFalse(selenium.belongsClass(edit, "rf-ii-none"), "Edit should not contain class rf-is-none when popup is open."); + assertFalse(selenium.belongsClass(edit, "rf-ii-none"), "Edit should not contain class rf-ii-none when popup is open."); assertTrue(selenium.isDisplayed(input), "Input should be displayed."); selenium.type(input, "new value"); selenium.fireEvent(input, Event.BLUR); - assertTrue(selenium.belongsClass(inplaceInput, "rf-ii-c-s"), "New class should be added to inplace input."); - assertTrue(selenium.belongsClass(edit, "rf-ii-none"), "Edit should contain class rf-is-none when popup is closed."); + assertTrue(selenium.belongsClass(inplaceInput, "rf-ii-chng"), "New class should be added to inplace input."); + assertTrue(selenium.belongsClass(edit, "rf-ii-none"), "Edit should contain class rf-ii-none when popup is closed."); assertEquals(selenium.getText(label), "new value", "Label should contain selected value."); assertEquals(selenium.getText(output), "new value", "Output did not change.");