Author: nbelaevski Date: 2008-03-02 20:33:34 -0500 (Sun, 02 Mar 2008) New Revision: 6474 Added: trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractColumnComponentTest.java trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractDataTableComponentTest.java Modified: trunk/ui/componentControl/src/main/config/component/componentControl.xml trunk/ui/core/src/main/config/component/support.xml trunk/ui/dataTable/src/main/config/component/colgroup.xml trunk/ui/dataTable/src/main/config/component/column.xml trunk/ui/dataTable/src/main/config/component/dataGrid.xml trunk/ui/dataTable/src/main/config/component/dataList.xml trunk/ui/dataTable/src/main/config/component/dataTable.xml trunk/ui/dataTable/src/main/config/component/subTable.xml trunk/ui/drag-drop/src/main/config/component/dragSupport.xml trunk/ui/drag-drop/src/main/config/component/dropSupport.xml trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml trunk/ui/listShuttle/pom.xml trunk/ui/listShuttle/src/main/config/component/listShuttle.xml trunk/ui/menu-components/src/main/config/component/menucomponents.xml trunk/ui/orderingList/src/main/config/component/orderinglist.xml trunk/ui/panelmenu/src/main/config/component/panelMenu.xml trunk/ui/pickList/pom.xml trunk/ui/progressBAR/src/main/config/component/progressBar.xml trunk/ui/scrollableDataTable/pom.xml trunk/ui/scrollableDataTable/src/test/java/org/richfaces/component/AbstractScrollableDataTableTestCase.java Log: Test generation enabled Modified: trunk/ui/componentControl/src/main/config/component/componentControl.xml =================================================================== --- trunk/ui/componentControl/src/main/config/component/componentControl.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/componentControl/src/main/config/component/componentControl.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,9 +6,13 @@ <family>org.richfaces.ComponentControl</family> <classname>org.richfaces.component.html.HtmlComponentControl</classname> <superclass>org.richfaces.component.UIComponentControl</superclass> + <test> + <classname>org.richfaces.component.html.HtmlComponentControlTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ - ]]> + ]]> </description> <renderer generate="true" override="true"> <name>org.richfaces.ComponentControlRenderer</name> Modified: trunk/ui/core/src/main/config/component/support.xml =================================================================== --- trunk/ui/core/src/main/config/component/support.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/core/src/main/config/component/support.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -11,6 +11,10 @@ <family>org.ajax4jsf.AjaxSupport</family> <classname>org.ajax4jsf.component.html.HtmlAjaxSupport</classname> <superclass>org.ajax4jsf.component.UIAjaxSupport</superclass> + <test> + <classname>org.richfaces.component.html.HtmlAjaxSupportComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> Adds the AJAX functionality for those UIComponent-based component that have properties for JavaScript events. Modified: trunk/ui/dataTable/src/main/config/component/colgroup.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/colgroup.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/dataTable/src/main/config/component/colgroup.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.ColumnGroup</family> <classname>org.richfaces.component.html.HtmlColumnGroup</classname> <superclass>org.richfaces.component.UIColumnGroup</superclass> + <test> + <classname>org.richfaces.component.html.HtmlColumnGroupComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> Modified: trunk/ui/dataTable/src/main/config/component/column.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/column.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/dataTable/src/main/config/component/column.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.Column</family> <classname>org.richfaces.component.html.HtmlColumn</classname> <superclass>org.richfaces.component.UIColumn</superclass> + <test> + <classname>org.richfaces.component.html.HtmlColumnComponentTest</classname> + <superclassname>org.richfaces.component.AbstractColumnComponentTest</superclassname> + </test> <description> <![CDATA[ ]]> Modified: trunk/ui/dataTable/src/main/config/component/dataGrid.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/dataGrid.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/dataTable/src/main/config/component/dataGrid.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.DataGrid</family> <classname>org.richfaces.component.html.HtmlDataGrid</classname> <superclass>org.richfaces.component.UIDataGrid</superclass> + <test> + <classname>org.richfaces.component.html.HtmlDataGridComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> Modified: trunk/ui/dataTable/src/main/config/component/dataList.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/dataList.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/dataTable/src/main/config/component/dataList.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.DataList</family> <classname>org.richfaces.component.html.HtmlDataList</classname> <superclass>org.richfaces.component.UIDataList</superclass> + <test> + <classname>org.richfaces.component.html.HtmlDataListComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> @@ -85,6 +89,10 @@ <family>org.richfaces.DataOrderedList</family> <classname>org.richfaces.component.html.HtmlDataOrderedList</classname> <superclass>org.richfaces.component.UIDataList</superclass> + <test> + <classname>org.richfaces.component.html.HtmlDataOrderedListComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> @@ -152,6 +160,10 @@ <family>org.richfaces.DataDefinitionList</family> <classname>org.richfaces.component.html.HtmlDataDefinitionList</classname> <superclass>org.richfaces.component.UIDataDefinitionList</superclass> + <test> + <classname>org.richfaces.component.html.HtmlDataDefinitionListComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> Modified: trunk/ui/dataTable/src/main/config/component/dataTable.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/dataTable.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/dataTable/src/main/config/component/dataTable.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.DataTable</family> <classname>org.richfaces.component.html.HtmlDataTable</classname> <superclass>org.richfaces.component.UIDataTable</superclass> + <test> + <classname>org.richfaces.component.html.HtmlDataTableComponentTest</classname> + <superclassname>org.richfaces.component.AbstractDataTableComponentTest</superclassname> + </test> <description> <![CDATA[ ]]> Modified: trunk/ui/dataTable/src/main/config/component/subTable.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/subTable.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/dataTable/src/main/config/component/subTable.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.SubTable</family> <classname>org.richfaces.component.html.HtmlSubTable</classname> <superclass>org.richfaces.component.UISubTable</superclass> + <test> + <classname>org.richfaces.component.html.HtmlSubTableComponentTest</classname> + <superclassname>org.richfaces.component.AbstractDataTableComponentTest</superclassname> + </test> <description> <![CDATA[ ]]> Added: trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractColumnComponentTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractColumnComponentTest.java (rev 0) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractColumnComponentTest.java 2008-03-03 01:33:34 UTC (rev 6474) @@ -0,0 +1,66 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.component; + +import java.util.Comparator; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +/** + * Created 01.03.2008 + * @author Nick Belaevski + * @since 3.2 + */ + +public abstract class AbstractColumnComponentTest extends AbstractAjax4JsfTestCase { + + /** + * @param name + */ + public AbstractColumnComponentTest(String name) { + super(name); + } + + private Comparator comparator0 = new Comparator() { + + public int compare(Object o1, Object o2) { + throw new UnsupportedOperationException(); + } + + }; + + private Comparator comparator1 = new Comparator() { + + public int compare(Object o1, Object o2) { + throw new UnsupportedOperationException(); + } + + }; + + protected Comparator<Object> createTestData_0_comparator() { + return comparator0; + } + + protected Comparator<Object> createTestData_1_comparator() { + return comparator1; + } +} Added: trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractDataTableComponentTest.java =================================================================== --- trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractDataTableComponentTest.java (rev 0) +++ trunk/ui/dataTable/src/test/java/org/richfaces/component/AbstractDataTableComponentTest.java 2008-03-03 01:33:34 UTC (rev 6474) @@ -0,0 +1,77 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.component; + +import java.util.ArrayList; +import java.util.List; + +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; + +/** + * Created 01.03.2008 + * @author Nick Belaevski + * @since 3.2 + */ + +public abstract class AbstractDataTableComponentTest extends AbstractAjax4JsfTestCase { + + /** + * @param name + */ + public AbstractDataTableComponentTest(String name) { + super(name); + } + + protected List<Object> createTestData_0_sortFields() { + List<Object> list = new ArrayList<Object>(); + list.add("Column1"); + list.add("Column2"); + list.add("Column3"); + + return list; + } + + protected List<Object> createTestData_1_sortFields() { + List<Object> list = new ArrayList<Object>(); + list.add("NameA"); + list.add("NameB"); + + return list; + } + + protected List<Object> createTestData_0_filterFields() { + List<Object> list = new ArrayList<Object>(); + list.add("FColumn0"); + list.add("FColumn1"); + + return list; + } + + protected List<Object> createTestData_1_filterFields() { + List<Object> list = new ArrayList<Object>(); + list.add("FNameA"); + list.add("FNameB"); + list.add("FNameC"); + + return list; + } +} Modified: trunk/ui/drag-drop/src/main/config/component/dragSupport.xml =================================================================== --- trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -19,6 +19,7 @@ <classname>org.richfaces.renderkit.html.DragSupportRenderer</classname> </renderer> <tag> + <test /> <name>dragSupport</name> <classname>org.richfaces.taglib.DragSupportTag</classname> <superclass>org.ajax4jsf.webapp.taglib.HtmlComponentTagBase</superclass> Modified: trunk/ui/drag-drop/src/main/config/component/dropSupport.xml =================================================================== --- trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -20,6 +20,7 @@ <classname>org.richfaces.renderkit.html.DropSupportRenderer</classname> </renderer> <tag> + <test /> <name>dropSupport</name> <classname>org.richfaces.taglib.DropSupportTag</classname> <superclass>org.ajax4jsf.webapp.taglib.HtmlComponentTagBase</superclass> Modified: trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml =================================================================== --- trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.DropDownMenu</family> <classname>org.richfaces.component.html.HtmlDropDownMenu</classname> <superclass>org.richfaces.component.UIDropDownMenu</superclass> + <test> + <classname>org.richfaces.component.html.HtmlDropDownMenuComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> </description> Modified: trunk/ui/listShuttle/pom.xml =================================================================== --- trunk/ui/listShuttle/pom.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/listShuttle/pom.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -21,7 +21,14 @@ <goal>generate</goal> </goals> </execution> - </executions> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> + </executions> <configuration> <library> <prefix>org.richfaces</prefix> Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml =================================================================== --- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.ListShuttle</family> <classname>org.richfaces.component.html.HtmlListShuttle</classname> <superclass>org.richfaces.component.UIListShuttle</superclass> + <test> + <classname>org.richfaces.component.html.HtmlListShuttleComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> Modified: trunk/ui/menu-components/src/main/config/component/menucomponents.xml =================================================================== --- trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.DropDownMenu</family> <classname>org.richfaces.component.html.HtmlMenuGroup</classname> <superclass>org.richfaces.component.UIMenuGroup</superclass> + <test> + <classname>org.richfaces.component.html.HtmlMenuGroupComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ Defines expandable group of items inside popup list or another group. Should accept only "menuItem", "menuGroup" and "menuSeparator" components as children. @@ -155,6 +159,10 @@ <family>org.richfaces.DropDownMenu</family> <classname>org.richfaces.component.html.HtmlMenuItem</classname> <superclass>org.richfaces.component.UIMenuItem</superclass> + <test> + <classname>org.richfaces.component.html.HtmlMenuItemComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> </description> @@ -279,6 +287,10 @@ <family>org.richfaces.DropDownMenu</family> <classname>org.richfaces.component.html.HtmlMenuSeparator</classname> <superclass>org.richfaces.component.UIMenuSeparator</superclass> + <test> + <classname>org.richfaces.component.html.HtmlMenuSeparatorComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description><![CDATA[ A horizontal separator to use in the menu. ]]></description> Modified: trunk/ui/orderingList/src/main/config/component/orderinglist.xml =================================================================== --- trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.OrderingList</family> <classname>org.richfaces.component.html.HtmlOrderingList</classname> <superclass>org.richfaces.component.UIOrderingList</superclass> + <test> + <classname>org.richfaces.component.html.HtmlOrderingListComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> </description> Modified: trunk/ui/panelmenu/src/main/config/component/panelMenu.xml =================================================================== --- trunk/ui/panelmenu/src/main/config/component/panelMenu.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/panelmenu/src/main/config/component/panelMenu.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -4,6 +4,10 @@ <component> <name>org.richfaces.PanelMenu</name> <family>org.richfaces.PanelMenu</family> + <test> + <classname>org.richfaces.component.html.HtmlPanelMenuComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description>Defines the menu on the page and the set of the child elements properties in layout.</description> <superclass>org.richfaces.component.UIPanelMenu</superclass> @@ -366,6 +370,10 @@ <component> <name>org.richfaces.PanelMenuGroup</name> <family>org.richfaces.PanelMenuGroup</family> + <test> + <classname>org.richfaces.component.html.HtmlPanelMenuGroupComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description>Defines expandable group of items inside the panel menu or other group.</description> <superclass>org.richfaces.component.UIPanelMenuGroup</superclass> <classname>org.richfaces.component.html.HtmlPanelMenuGroup</classname> @@ -550,6 +558,10 @@ <component> <name>org.richfaces.PanelMenuItem</name> <family>org.richfaces.PanelMenuItem</family> + <test> + <classname>org.richfaces.component.html.HtmlPanelMenuItemComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description>Defines single Item inside popup list.</description> <superclass>org.richfaces.component.UIPanelMenuItem</superclass> <classname>org.richfaces.component.html.HtmlPanelMenuItem</classname> Modified: trunk/ui/pickList/pom.xml =================================================================== --- trunk/ui/pickList/pom.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/pickList/pom.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -22,6 +22,13 @@ <goal>generate</goal> </goals> </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-tests</goal> + </goals> + </execution> </executions> <configuration> <library> Modified: trunk/ui/progressBAR/src/main/config/component/progressBar.xml =================================================================== --- trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -6,6 +6,10 @@ <family>org.richfaces.ProgressBar</family> <classname>org.richfaces.component.html.HtmlProgressBar</classname> <superclass>org.richfaces.component.UIProgressBar</superclass> + <test> + <classname>org.richfaces.component.html.HtmlProgressBarComponentTest</classname> + <superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname> + </test> <description> <![CDATA[ ]]> Modified: trunk/ui/scrollableDataTable/pom.xml =================================================================== --- trunk/ui/scrollableDataTable/pom.xml 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/scrollableDataTable/pom.xml 2008-03-03 01:33:34 UTC (rev 6474) @@ -7,7 +7,6 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.ui</groupId> <artifactId>scrollableDataTable</artifactId> - <version>3.2.0-SNAPSHOT</version> <name>Scrollable Data Table</name> <build> <plugins> @@ -79,4 +78,4 @@ <version>3.2.0-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/ui/scrollableDataTable/src/test/java/org/richfaces/component/AbstractScrollableDataTableTestCase.java =================================================================== --- trunk/ui/scrollableDataTable/src/test/java/org/richfaces/component/AbstractScrollableDataTableTestCase.java 2008-03-03 01:22:24 UTC (rev 6473) +++ trunk/ui/scrollableDataTable/src/test/java/org/richfaces/component/AbstractScrollableDataTableTestCase.java 2008-03-03 01:33:34 UTC (rev 6474) @@ -41,8 +41,8 @@ import org.richfaces.event.sort.SortEvent; import org.richfaces.event.sort.SortListener; import org.richfaces.model.DataModelCache; +import org.richfaces.model.SortField; import org.richfaces.model.SortOrder; -import org.richfaces.model.internal.ComponentSortableDataModel; import org.richfaces.model.selection.Selection; import org.richfaces.model.selection.SimpleSelection; @@ -50,7 +50,7 @@ * @author Maksim Kaszynski * */ -public abstract class AbstractScrollableDataTableTestCase extends AbstractAjax4JsfTestCase { +public class AbstractScrollableDataTableTestCase extends AbstractAjax4JsfTestCase { private UIScrollableDataTable table; @@ -79,14 +79,6 @@ } - protected SortOrder createTestData_sortOrder() { - return new SortOrder(); - } - - protected Selection createTestData_selection() { - return new SimpleSelection(); - } - /* (non-Javadoc) * @see org.ajax4jsf.tests.AbstractAjax4JsfTestCase#tearDown() */ @@ -95,6 +87,37 @@ super.tearDown(); } + protected SortOrder createTestData_0_sortOrder() { + SortField[] fields = new SortField[] { + new SortField("aaa", 1, Boolean.TRUE), + new SortField("bb", 0, Boolean.FALSE) + }; + return new SortOrder(fields); + } + + protected Selection createTestData_0_selection() { + SimpleSelection selection = new SimpleSelection(); + selection.addKey(Integer.valueOf(5)); + return selection; + } + + protected SortOrder createTestData_1_sortOrder() { + SortField[] fields = new SortField[] { + new SortField("column3", 2, null), + new SortField("column1", 1, Boolean.TRUE), + new SortField("column2", 0, Boolean.FALSE) + }; + return new SortOrder(fields); + } + + protected Selection createTestData_1_selection() { + SimpleSelection selection = new SimpleSelection(); + selection.addKey(Integer.valueOf(9)); + selection.addKey(Integer.valueOf(8)); + selection.addKey(Integer.valueOf(10)); + return selection; + } + private class SortListener1 implements SortListener { private boolean triggered = false; public void processSort(SortEvent e) {