Author: jjamrich Date: 2011-09-06 17:01:19 -0400 (Tue, 06 Sep 2011) New Revision: 22688 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/AbstractDataTableTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java Log: RFPL-1439: Fix request typy for setting facet attributes (HTTP/XHR) Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/AbstractDataTableTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/AbstractDataTableTest.java 2011-09-06 21:00:55 UTC (rev 22687) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/AbstractDataTableTest.java 2011-09-06 21:01:19 UTC (rev 22688) @@ -61,7 +61,6 @@ protected DataTable model; protected EmployeeTableModel employees = new EmployeeTableModel(); - // protected DataTableFacets facets = new DataTableFacets(); protected DataScroller dataScroller1 = new AssertingDataScroller("outside-table", pjq("span.rf-ds[id$=scroller1]")); protected DataScroller dataScroller2 = new AssertingDataScroller("inside-table-footer", Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-06 21:00:55 UTC (rev 22687) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/attributes/AttributeList.java 2011-09-06 21:01:19 UTC (rev 22688) @@ -1,5 +1,6 @@ package org.richfaces.tests.metamer.ftest.attributes; +import org.jboss.test.selenium.request.RequestType; import org.richfaces.tests.metamer.ftest.a4jAttachQueue.AttachQueueAttributes; import org.richfaces.tests.metamer.ftest.a4jPoll.PollAttributes; import org.richfaces.tests.metamer.ftest.a4jQueue.QueueAttributes; @@ -20,6 +21,6 @@ public static Attributes<RepeatAttributes> repeatAttributes = new Attributes<RepeatAttributes>(); public static Attributes<StatusAttributes> statusAttributes = new Attributes<StatusAttributes>(); public static Attributes<DataTableAttributes> dataTableAttributes = new Attributes<DataTableAttributes>(); - public static Attributes<DataTableFacets> dataTableFacets = new Attributes<DataTableFacets>(); + public static Attributes<DataTableFacets> dataTableFacets = new Attributes<DataTableFacets>(RequestType.XHR); // for facets use XHR by default } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java 2011-09-06 21:00:55 UTC (rev 22687) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/AbstractCollapsibleSubTableTest.java 2011-09-06 21:01:19 UTC (rev 22688) @@ -31,7 +31,6 @@ import org.richfaces.ExpandMode; import org.richfaces.tests.metamer.bean.Model; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; -import org.richfaces.tests.metamer.ftest.abstractions.DataTableFacets; import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.Use; import org.richfaces.tests.metamer.ftest.attributes.Attributes; @@ -54,7 +53,6 @@ Attributes<CollapsibleSubTableAttributes> collapsibleSubTabAttributes = new Attributes<CollapsibleSubTableAttributes>(); DataTable dataTable = new DataTable(pjq("table[id$=richDataTable]"));; - Attributes<DataTableFacets> dataTableFacets = new Attributes<DataTableFacets>(RequestType.XHR); JQueryLocator showDataLocator = pjq("input[id$=noDataCheckbox]"); Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java 2011-09-06 21:00:55 UTC (rev 22687) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java 2011-09-06 21:01:19 UTC (rev 22688) @@ -26,6 +26,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.richfaces.tests.metamer.ftest.abstractions.DataTableFacets.*; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.dataTableFacets; import java.net.URL;