[richfaces-svn-commits] JBoss Rich Faces SVN: r22970 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn.

Author: ppitonak(a)redhat.com Date: 2011-11-22 06:48:37 -0500 (Tue, 22 Nov 2011) New Revision: 22970 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnFiltering.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java Log: tests for rich:column fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java 2011-11-22 10:58:06 UTC (rev 22969) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java 2011-11-22 11:48:37 UTC (rev 22970) @@ -31,7 +31,6 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -@Test public class TestColumnComparator extends AbstractColumnSortingTest { @Override Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnFiltering.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnFiltering.java 2011-11-22 10:58:06 UTC (rev 22969) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnFiltering.java 2011-11-22 11:48:37 UTC (rev 22970) @@ -49,12 +49,12 @@ JQueryLocator tableWithFilter = pjq("table.rf-dt[id$=richDataTable1]"); JQueryLocator tableWithFilterExpression = pjq("table.rf-dt[id$=richDataTable2]"); RichColumnBean richColumnBean = new RichColumnBean(); - + @Override public URL getTestUrl() { return buildUrl(contextPath, "faces/components/richColumn/filtering.xhtml"); } - + @Test public void testFilterAttribute() { model.setRoot(tableWithFilter); @@ -88,7 +88,7 @@ assertEqualsCapitals(actualCapitals, expectedCapitals); } } - + private void assertEqualsCapitals(Collection<Capital> actualCapitals, Collection<Capital> expectedCapitals) { assertEquals(actualCapitals.size(), expectedCapitals.size()); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSimple.java 2011-11-22 10:58:06 UTC (rev 22969) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSimple.java 2011-11-22 11:48:37 UTC (rev 22970) @@ -31,6 +31,7 @@ import java.net.URL; import org.jboss.test.selenium.locator.JQueryLocator; +import org.jboss.test.selenium.request.RequestType; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -55,6 +56,8 @@ assertEquals(selenium.getAttribute(headerCell(1, 1).getAttribute(COLSPAN)), "2"); assertEquals(selenium.getAttribute(headerCell(2, 2).getAttribute(ROWSPAN)), "2"); + + columnAttributes.setRequestType(RequestType.HTTP); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java 2011-11-22 10:58:06 UTC (rev 22969) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java 2011-11-22 11:48:37 UTC (rev 22970) @@ -31,7 +31,6 @@ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> * @version $Revision$ */ -@Test public class TestColumnSorting extends AbstractColumnSortingTest { @Override