Author: lfryc(a)redhat.com Date: 2011-02-24 09:13:46 -0500 (Thu, 24 Feb 2011) New Revision: 21916 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFacetsTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableFacets.java Log: EDT - Mojarra-MyFaces test compatibility issue - added issue tracking for RFPL-1193 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableAttributes.java 2011-02-24 14:12:55 UTC (rev 21915) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableAttributes.java 2011-02-24 14:13:46 UTC (rev 21916) @@ -21,7 +21,6 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.abstractions; -import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq; import java.util.Arrays; @@ -29,8 +28,10 @@ import java.util.LinkedList; import org.apache.commons.lang.StringUtils; +import org.jboss.test.selenium.GuardRequest; import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.JQueryLocator; +import org.jboss.test.selenium.request.RequestType; import org.richfaces.model.SortMode; import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes; @@ -42,9 +43,14 @@ JQueryLocator showDataLocator = pjq("input[id$=noDataCheckbox]"); - public void setShowData(boolean showData) { - selenium.check(showDataLocator, showData); - guardXhr(selenium).fireEvent(showDataLocator, Event.CLICK); + public void setShowData(final boolean showData) { + new GuardRequest(RequestType.XHR) { + public void command() { + selenium.check(showDataLocator, showData); + selenium.fireEvent(showDataLocator, Event.CLICK); + selenium.fireEvent(showDataLocator, Event.CHANGE); + } + }.waitRequest(); } public void setFirst(Integer first) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFacetsTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFacetsTest.java 2011-02-24 14:12:55 UTC (rev 21915) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFacetsTest.java 2011-02-24 14:13:46 UTC (rev 21916) @@ -22,7 +22,6 @@ package org.richfaces.tests.metamer.ftest.abstractions; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> @@ -59,7 +58,13 @@ public void testHeaderEmpty() { facets.setHeader(EMPTY_STRING); - assertEquals(selenium.getText(model.getHeader()), EMPTY_STRING); + + if (selenium.isElementPresent(model.getHeader())) { + assertEquals(selenium.getText(model.getHeader()), EMPTY_STRING); + } else { + facets.setHeader(SAMPLE_STRING); + assertEquals(selenium.getText(model.getHeader()), SAMPLE_STRING); + } } public void testStateHeaderInstantChange() { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableFacets.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableFacets.java 2011-02-24 14:12:55 UTC (rev 21915) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableFacets.java 2011-02-24 14:13:46 UTC (rev 21916) @@ -26,6 +26,7 @@ import java.net.URL; import org.richfaces.tests.metamer.ftest.abstractions.DataTableFacetsTest; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.model.ExtendedDataTable; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -47,16 +48,19 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RFPL-1193") public void testNoDataInstantChange() { super.testNoDataInstantChange(); } @Test + @IssueTracking("https://issues.jboss.org/browse/RFPL-1193") public void testNoDataEmpty() { super.testNoDataEmpty(); } @Test + @IssueTracking("https://issues.jboss.org/browse/RFPL-1193") public void testNoDataLabelWithEmptyNoDataFacet() { super.testNoDataLabelWithEmptyNoDataFacet(); }