Author: lfryc(a)redhat.com Date: 2011-01-13 09:44:20 -0500 (Thu, 13 Jan 2011) New Revision: 20990 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnModelTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnSortingTest.java 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/TestColumnSorting.java Log: rich:column - fixed propagation of @Test to MatrixConfigurator (RFPL-729) Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnModelTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnModelTest.java 2011-01-13 14:43:10 UTC (rev 20989) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnModelTest.java 2011-01-13 14:44:20 UTC (rev 20990) @@ -27,6 +27,7 @@ import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.model.Capital; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnSortingTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnSortingTest.java 2011-01-13 14:43:10 UTC (rev 20989) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnSortingTest.java 2011-01-13 14:44:20 UTC (rev 20990) @@ -31,7 +31,6 @@ import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.model.Capital; -import org.testng.annotations.Test; /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> @@ -42,8 +41,7 @@ @Inject @Use(enumeration = true) SortOrder sortOrder; - - @Test + public void testSortingWithSortOrder() { attributes.setRequestType(RequestType.XHR); attributes.setSortOrder(sortOrder); 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-01-13 14:43:10 UTC (rev 20989) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java 2011-01-13 14:44:20 UTC (rev 20990) @@ -38,4 +38,10 @@ public URL getTestUrl() { return buildUrl(contextPath, "faces/components/richColumn/comparator.xhtml"); } + + @Test + @Override + public void testSortingWithSortOrder() { + super.testSortingWithSortOrder(); + } } 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-01-13 14:43:10 UTC (rev 20989) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java 2011-01-13 14:44:20 UTC (rev 20990) @@ -38,4 +38,10 @@ public URL getTestUrl() { return buildUrl(contextPath, "faces/components/richColumn/sorting.xhtml"); } + + @Test + @Override + public void testSortingWithSortOrder() { + super.testSortingWithSortOrder(); + } }