Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java Mon Feb 14 10:05:13 2005 @@ -27,11 +27,12 @@ import org.apache.beehive.netui.test.servlet.HttpServletRequestHandler; import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet; import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel; +import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel; /** * */ -public class DataGridTestUtil { +class DataGridTestUtil { public static final String DEFAULT_DATA_GRID_NAME = "testgrid"; @@ -39,34 +40,34 @@ private DataGridTestUtil() { } - public static final void initQueryString(ServletRequest request, String queryString) { + static final void initQueryString(ServletRequest request, String queryString) { assert Proxy.getInvocationHandler(request) instanceof HttpServletRequestHandler; HttpServletRequestHandler handler = (HttpServletRequestHandler)Proxy.getInvocationHandler(request); handler.setQueryString(queryString); } - public static final void initQueryString(JspContext jspContext, String queryString) { + static final void initQueryString(JspContext jspContext, String queryString) { initQueryString(((PageContext)jspContext).getRequest(), queryString); } - public static final DataGridModel getDataGridModel(JspContext jspContext) { + static final DataGridModel getDataGridModel(JspContext jspContext) { return buildDataGridModel(jspContext, DEFAULT_DATA_GRID_NAME, getPagedDataSet()); } - public static final DataGridModel getDataGridModel(JspContext jspContext, String name) { + static final DataGridModel getDataGridModel(JspContext jspContext, String name) { return buildDataGridModel(jspContext, name, getPagedDataSet()); } - public static final DataGridModel getEmptyDataGridModel(JspContext jspContext) { + static final DataGridModel getEmptyDataGridModel(JspContext jspContext) { return buildDataGridModel(jspContext, DEFAULT_DATA_GRID_NAME, getEmptyPagedDataSet()); } - public static final PagedDataSet getEmptyPagedDataSet() { + static final PagedDataSet getEmptyPagedDataSet() { return new PagedDataSet("${actionForm.emptyDataSource}", Collections.EMPTY_LIST.iterator()); } - public static final PagedDataSet getPagedDataSet() { + static final PagedDataSet getPagedDataSet() { ArrayList<String> list = new ArrayList<String>(); list.add("abc"); list.add("def"); @@ -85,8 +86,12 @@ private static final DataGridModel buildDataGridModel(JspContext jspContext, String name, PagedDataSet dataSet) { DataGridModel dgm = new DataGridModel(jspContext, name, dataSet); - dgm.getPagerModel().setPageAction("fauxPageAction.do"); + dgm.getDataGridState().getPagerModel().setPageAction("fauxPageAction.do"); return dgm; + } + + static final PagerModel getPagerModel(DataGridModel dgm) { + return dgm.getDataGridState().getPagerModel(); } }
Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java Mon Feb 14 10:05:13 2005 @@ -17,35 +17,34 @@ */ package org.apache.beehive.netui.test.datagrid; -import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort; -import org.apache.beehive.netui.databinding.datagrid.model.sort.DefaultSort; -import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort.SortDirection; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection; +import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort; + /** * */ public class DefaultSortTest extends TestCase { - private ISort createSort() { - return new DefaultSort(); + private Sort createSort() { + return new Sort(); } public void testChangeSortDirection() { - ISort sort = createSort(); + Sort sort = createSort(); sort.setDirection(SortDirection.ASCENDING); sort.setSortExpression("customername"); assertTrue(sort.getDirection() == SortDirection.ASCENDING); - ((DefaultSort)sort).changeSortDirection(); + sort.changeSortDirection(); assertTrue(sort.getDirection() == SortDirection.DESCENDING); - ((DefaultSort)sort).changeSortDirection(); + sort.changeSortDirection(); assertTrue(sort.getDirection() == SortDirection.ASCENDING); } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterCodecTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterCodecTest.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterCodecTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterCodecTest.java Mon Feb 14 10:05:13 2005 @@ -19,17 +19,17 @@ import java.util.List; import java.util.Map; - import javax.servlet.ServletRequest; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.beehive.netui.databinding.datagrid.services.filter.FilterCodec; -import org.apache.beehive.netui.databinding.datagrid.services.DataGridStateService; -import org.apache.beehive.netui.databinding.datagrid.model.filter.IFilter; import org.apache.beehive.netui.test.servlet.ServletFactory; +import org.apache.beehive.netui.databinding.datagrid.runtime.codec.FilterCodec; +import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridURLService; +import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter; +import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperationHint; /** * @@ -44,12 +44,12 @@ DataGridTestUtil.initQueryString(_request, "netui_filter=" + _namespace + ";CUSTOMERNAME~eq~homer"); FilterCodec codec = new FilterCodec(); - Map<String, List<IFilter>> allFilters = codec.decode(_request.getParameterMap()); - List<IFilter> filters = allFilters.get(_namespace); + Map<String, List<Filter>> allFilters = codec.decode(_request.getParameterMap()); + List<Filter> filters = allFilters.get(_namespace); assertTrue(filters != null); assertEquals(1, filters.size()); - assertEquals(IFilter.FilterOperation.EQUAL, filters.get(0).getOperation()); + assertEquals(FilterOperationHint.EQUAL, filters.get(0).getOperation().getOperationHint()); assertEquals("homer", filters.get(0).getValue()); assertEquals("CUSTOMERNAME", filters.get(0).getFilterExpression()); } @@ -58,19 +58,19 @@ DataGridTestUtil.initQueryString(_request, "netui_filter=" + _namespace + ";CUSTOMERNAME~eq~homer&netui_filter=products;ID~ne~1234"); FilterCodec codec = new FilterCodec(); - Map<String, List<IFilter>> allFilters = codec.decode(_request.getParameterMap()); - List<IFilter> filters = allFilters.get(_namespace); + Map<String, List<Filter>> allFilters = codec.decode(_request.getParameterMap()); + List<Filter> filters = allFilters.get(_namespace); assertTrue(filters != null); assertEquals(1, filters.size()); - assertEquals(IFilter.FilterOperation.EQUAL, filters.get(0).getOperation()); + assertEquals(FilterOperationHint.EQUAL, filters.get(0).getOperation().getOperationHint()); assertEquals("homer", filters.get(0).getValue()); assertEquals("CUSTOMERNAME", filters.get(0).getFilterExpression()); filters = allFilters.get("products"); assertTrue(filters != null); assertEquals(1, filters.size()); - assertEquals(IFilter.FilterOperation.NOT_EQUAL, filters.get(0).getOperation()); + assertEquals(FilterOperationHint.NOT_EQUAL, filters.get(0).getOperation().getOperationHint()); assertEquals("1234", filters.get(0).getValue()); assertEquals("ID", filters.get(0).getFilterExpression()); } @@ -78,7 +78,7 @@ public void testDataGridStateService1() { DataGridTestUtil.initQueryString(_request, "netui_filter=" + _namespace + ";ZIP~eq~12345,CUSTOMERNAME~eq~homer&netui_filter=products;ID~ne~1234"); - DataGridStateService dgss = DataGridStateService.getInstance(_request); + DataGridURLService dgss = DataGridURLService.getInstance(_request); Map queryParams = null; String[] qp = null; @@ -98,7 +98,7 @@ public void testDataGridStateService2() { DataGridTestUtil.initQueryString(_request, "netui_filter=" + _namespace + ";ZIP~eq~12345,CUSTOMERNAME~eq~homer&netui_filter=products;ID~ne~1234"); - DataGridStateService dgss = DataGridStateService.getInstance(_request); + DataGridURLService dgss = DataGridURLService.getInstance(_request); Map queryParams = null; String[] qp = null; @@ -122,8 +122,8 @@ DataGridTestUtil.initQueryString(_request, "netui_filter=" + customerNameParam + "&netui_filter=products;ID~ne~1234"); FilterCodec codec = new FilterCodec(); - Map<String, List<IFilter>> allFilters = codec.decode(_request.getParameterMap()); - List<IFilter> gridFilters = allFilters.get(_namespace); + Map<String, List<Filter>> allFilters = codec.decode(_request.getParameterMap()); + List<Filter> gridFilters = allFilters.get(_namespace); String filterQueryValue = codec.encode(_namespace, gridFilters); Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java Mon Feb 14 10:05:13 2005 @@ -26,12 +26,11 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.beehive.netui.databinding.datagrid.services.DataGridStateService; -import org.apache.beehive.netui.databinding.datagrid.model.sort.SortModel; -import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort; -import org.apache.beehive.netui.databinding.datagrid.model.filter.FilterModel; -import org.apache.beehive.netui.databinding.datagrid.model.filter.IFilter.FilterOperation; import org.apache.beehive.netui.test.servlet.ServletFactory; +import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridURLService; +import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterModel; +import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperation; +import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperationHint; /** * @@ -44,19 +43,19 @@ public void testSortModelSimple() { DataGridTestUtil.initQueryString(_request, "netui_filter=" + _namespace + ";CUSTOMERNAME~eq~homer&netui_filter=products;ID~ne~1234"); - DataGridStateService dgss = DataGridStateService.getInstance(_request); - FilterModel fm = dgss.getFilterModel(_namespace); + DataGridURLService dgss = DataGridURLService.getInstance(_request); + FilterModel fm = dgss.getDataGridState(_namespace).getFilterModel(); assertNotNull(fm); assertNotNull(fm.getFilters("CUSTOMERNAME")); assertTrue(fm.isFiltered("CUSTOMERNAME")); - assertEquals(FilterOperation.EQUAL, fm.getFilters("CUSTOMERNAME").get(0).getOperation()); + assertEquals(FilterOperationHint.EQUAL, fm.getFilters("CUSTOMERNAME").get(0).getOperation().getOperationHint()); - fm = dgss.getFilterModel("products"); + fm = dgss.getDataGridState("products").getFilterModel(); assertNotNull(fm); assertNotNull(fm.getFilters("ID")); assertTrue(fm.isFiltered("ID")); - assertEquals(FilterOperation.NOT_EQUAL, fm.getFilters("ID").get(0).getOperation()); + assertEquals(FilterOperationHint.NOT_EQUAL, fm.getFilters("ID").get(0).getOperation().getOperationHint()); } public void testSortModelSimple2() { Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerCodecTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerCodecTest.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerCodecTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerCodecTest.java Mon Feb 14 10:05:13 2005 @@ -25,8 +25,8 @@ import junit.framework.TestSuite; import org.apache.beehive.netui.test.servlet.ServletFactory; -import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerCodec; -import org.apache.beehive.netui.databinding.datagrid.model.PagerModel; +import org.apache.beehive.netui.databinding.datagrid.runtime.codec.PagerCodec; +import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel; /** * Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java Mon Feb 14 10:05:13 2005 @@ -26,8 +26,9 @@ import org.apache.beehive.netui.test.servlet.ServletFactory; import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel; -import org.apache.beehive.netui.databinding.datagrid.model.PagerModel; -import org.apache.beehive.netui.databinding.datagrid.services.DataGridStateService; +import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel; +import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridState; +import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridURLService; /** * @@ -39,7 +40,7 @@ public void testEmptyPagerModel() { DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); - PagerModel pm = dgm.getPagerModel(); + PagerModel pm = DataGridTestUtil.getPagerModel(dgm); assertEquals("Invalid page", PagerModel.DEFAULT_PAGE, pm.getPage()); assertEquals("Invalid page size", PagerModel.DEFAULT_PAGE_SIZE, pm.getPageSize()); @@ -55,7 +56,7 @@ String name = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~4&netui_pagesize=bugs~2"); DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext, name); - PagerModel pm = dgm.getPagerModel(); + PagerModel pm = DataGridTestUtil.getPagerModel(dgm); assertEquals("Invalid page", 2, pm.getPage()); assertEquals("Invalid page size", 2, pm.getPageSize()); @@ -71,7 +72,7 @@ String name = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~7&netui_pagesize=bugs~3"); DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext, name); - PagerModel pm = dgm.getPagerModel(); + PagerModel pm = DataGridTestUtil.getPagerModel(dgm); assertEquals("Invalid page", 2, pm.getPage()); assertEquals("Invalid page size", 3, pm.getPageSize()); @@ -87,8 +88,8 @@ */ DataGridTestUtil.initQueryString(_jspContext, "netui_row=" + DataGridTestUtil.DEFAULT_DATA_GRID_NAME + "~9"); DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); - dgm.getPagerModel().setPageSize(5); - PagerModel pm = dgm.getPagerModel(); + PagerModel pm = DataGridTestUtil.getPagerModel(dgm); + pm.setPageSize(5); assertEquals("Invalid page", 1, pm.getPage()); assertEquals("Invalid page size", 5, pm.getPageSize()); @@ -116,7 +117,7 @@ String name = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_pagesize=bugs~2"); DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext, name); - PagerModel pm = dgm.getPagerModel(); + PagerModel pm = DataGridTestUtil.getPagerModel(dgm); assertEquals("Invalid page", 0, pm.getPage()); assertEquals("Invalid page size", 2, pm.getPageSize()); @@ -129,8 +130,9 @@ public void testPagerModel_emptyURL() { String namespace = "bugs"; - DataGridStateService dgss = DataGridStateService.getInstance(_jspContext); - PagerModel pm = dgss.getPagerModel(namespace); + DataGridURLService dgss = DataGridURLService.getInstance(_jspContext); + DataGridState dgs = dgss.getDataGridState(namespace); + PagerModel pm = dgs.getPagerModel(); assertNotNull("Expected non-null PagerModel", pm); assertEquals("Invalid current row", PagerModel.DEFAULT_ROW, pm.getRow()); @@ -157,8 +159,9 @@ String namespace = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21"); - DataGridStateService dgss = DataGridStateService.getInstance(_jspContext); - PagerModel pm = dgss.getPagerModel(namespace); + DataGridURLService dgss = DataGridURLService.getInstance(_jspContext); + DataGridState dgs = dgss.getDataGridState(namespace); + PagerModel pm = dgs.getPagerModel(); assertEquals("Invalid current row", 21, pm.getRow()); assertEquals("Invalid current page", 2, pm.getPage()); @@ -171,8 +174,8 @@ String namespace = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21&netui_pagesize=bugs~6"); - DataGridStateService dgss = DataGridStateService.getInstance(_jspContext); - PagerModel pm = dgss.getPagerModel(namespace); + DataGridURLService dgss = DataGridURLService.getInstance(_jspContext); + PagerModel pm = dgss.getDataGridState(namespace).getPagerModel(); assertEquals("Invalid current row", 21, pm.getRow()); assertEquals("Invalid current page", 3, pm.getPage()); @@ -182,13 +185,13 @@ String namespace = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21&netui_pagesize=bugs~6&netui_row=issues~39"); - DataGridStateService dgss = DataGridStateService.getInstance(_jspContext); - PagerModel pm = dgss.getPagerModel(namespace); + DataGridURLService dgss = DataGridURLService.getInstance(_jspContext); + PagerModel pm = dgss.getDataGridState(namespace).getPagerModel(); assertEquals("Invalid current row", 21, pm.getRow()); assertEquals("Invalid current page", 3, pm.getPage()); - pm = dgss.getPagerModel("issues"); + pm = dgss.getDataGridState("issues").getPagerModel(); assertEquals("Invalid current row", 39, pm.getRow()); assertEquals("Invalid current page size", 10, pm.getPageSize()); assertEquals("Invalid current page", 3, pm.getPage()); Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java Mon Feb 14 10:05:13 2005 @@ -48,7 +48,7 @@ public void testFPNL2() { DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); - dgm.getPagerModel().setPageSize(5); + DataGridTestUtil.getPagerModel(dgm).setPageSize(5); FirstPreviousNextLastPagerRenderer fpnl = new FirstPreviousNextLastPagerRenderer(); fpnl.setDataGridModel(dgm); @@ -60,7 +60,7 @@ public void testFPNL3() { DataGridTestUtil.initQueryString(_jspContext, "netui_row=" + DataGridTestUtil.DEFAULT_DATA_GRID_NAME + "~9"); DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); - dgm.getPagerModel().setPageSize(5); + DataGridTestUtil.getPagerModel(dgm).setPageSize(5); FirstPreviousNextLastPagerRenderer fpnl = new FirstPreviousNextLastPagerRenderer(); fpnl.setDataGridModel(dgm); Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortCodecTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortCodecTest.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortCodecTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortCodecTest.java Mon Feb 14 10:05:13 2005 @@ -22,10 +22,10 @@ import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; -import org.apache.beehive.netui.databinding.datagrid.services.sort.SortCodec; -import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort; -import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort.SortDirection; import org.apache.beehive.netui.test.servlet.ServletFactory; +import org.apache.beehive.netui.databinding.datagrid.runtime.codec.SortCodec; +import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection; +import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort; import junit.framework.Test; import junit.framework.TestCase; @@ -46,16 +46,16 @@ public void testEmptySortService() { SortCodec codec = new SortCodec(); - Map<String, List<ISort>> allSorts = codec.decode(_request.getParameterMap()); + Map<String, List<Sort>> allSorts = codec.decode(_request.getParameterMap()); assert allSorts == null; } public void testSingleAscendingSort() { DataGridTestUtil.initQueryString(_request, "netui_sort=" + _namespace + "~CUSTOMERNAME"); SortCodec codec = new SortCodec(); - Map<String, List<ISort>> allSorts = codec.decode(_request.getParameterMap()); + Map<String, List<Sort>> allSorts = codec.decode(_request.getParameterMap()); - List<ISort> sorts = allSorts.get(_namespace); + List<Sort> sorts = allSorts.get(_namespace); assert sorts != null; assert sorts.size() == 1; assert sorts.get(0).getDirection() == SortDirection.ASCENDING; @@ -67,8 +67,8 @@ "netui_sort=" + _namespace + "~CUSTOMERNAME,-UNITPRICE" + "&netui_sort=productGrid~QUANTITY"); SortCodec codec = new SortCodec(); - Map<String, List<ISort>> allSorts = codec.decode(_request.getParameterMap()); - List<ISort> sorts = allSorts.get(_namespace); + Map<String, List<Sort>> allSorts = codec.decode(_request.getParameterMap()); + List<Sort> sorts = allSorts.get(_namespace); assert sorts != null; assert sorts.size() == 2; @@ -87,8 +87,8 @@ public void testSingleDescendingSort() { DataGridTestUtil.initQueryString(_request, "netui_sort=" + _namespace + "~-CUSTOMERNAME"); SortCodec codec = new SortCodec(); - Map<String, List<ISort>> allSorts = codec.decode(_request.getParameterMap()); - List<ISort> sorts = allSorts.get(_namespace); + Map<String, List<Sort>> allSorts = codec.decode(_request.getParameterMap()); + List<Sort> sorts = allSorts.get(_namespace); assert sorts != null; assert sorts.size() == 1; @@ -99,8 +99,8 @@ public void testTwoDescendingSorts() { DataGridTestUtil.initQueryString(_request, "netui_sort=" + _namespace + "~-CUSTOMERNAME,-CUSTOMERID"); SortCodec codec = new SortCodec(); - Map<String, List<ISort>> allSorts = codec.decode(_request.getParameterMap()); - List<ISort> sorts = allSorts.get(_namespace); + Map<String, List<Sort>> allSorts = codec.decode(_request.getParameterMap()); + List<Sort> sorts = allSorts.get(_namespace); assert sorts != null; assert sorts.size() == 2; Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java Mon Feb 14 10:05:13 2005 @@ -25,11 +25,11 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.beehive.netui.databinding.datagrid.model.sort.SortModel; -import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort; -import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort.SortDirection; -import org.apache.beehive.netui.databinding.datagrid.services.DataGridStateService; import org.apache.beehive.netui.test.servlet.ServletFactory; +import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel; +import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection; +import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort; +import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridURLService; /** * @@ -42,19 +42,19 @@ private HttpServletRequest _servletRequest; public void testSortModelSimple() { - DataGridStateService dgss = DataGridStateService.getInstance(_servletRequest); - SortModel sortModel = dgss.getSortModel(GRID_NAME); + DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); - List<ISort> sorts = sortModel.getSorts(); + List<Sort> sorts = sortModel.getSorts(); assert sorts == null; } public void testSortModelSimple2() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar"); - DataGridStateService dgss = DataGridStateService.getInstance(_servletRequest); - SortModel sortModel = dgss.getSortModel(GRID_NAME); + DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); - List<ISort> sorts = sortModel.getSorts(); + List<Sort> sorts = sortModel.getSorts(); assert sorts == null; Map queryParams = dgss.buildSortQueryParamsMap(GRID_NAME); @@ -66,10 +66,10 @@ public void testSortModelSimple3() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id"); - DataGridStateService dgss = DataGridStateService.getInstance(_servletRequest); - SortModel sortModel = dgss.getSortModel(GRID_NAME); + DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); - List<ISort> sorts = sortModel.getSorts(); + List<Sort> sorts = sortModel.getSorts(); assert sorts != null; assert sorts.size() == 1; assert sorts.get(0).getDirection() == SortDirection.ASCENDING; @@ -88,10 +88,10 @@ public void testSortModelSimple4() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name"); - DataGridStateService dgss = DataGridStateService.getInstance(_servletRequest); - SortModel sortModel = dgss.getSortModel(GRID_NAME); + DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); - List<ISort> sorts = sortModel.getSorts(); + List<Sort> sorts = sortModel.getSorts(); assert sorts != null; assert sorts.size() == 2; assert sorts.get(0).getDirection() == SortDirection.ASCENDING; @@ -112,10 +112,10 @@ public void testSortModelSimple5() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name"); - DataGridStateService dgss = DataGridStateService.getInstance(_servletRequest); - SortModel sortModel = dgss.getSortModel(GRID_NAME); + DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); - List<ISort> sorts = sortModel.getSorts(); + List<Sort> sorts = sortModel.getSorts(); assert sorts != null; assert sorts.size() == 2; assert sorts.get(0).getDirection() == SortDirection.ASCENDING; @@ -191,8 +191,8 @@ public void testSortModelSimple6() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~-id,-name"); - DataGridStateService dgss = DataGridStateService.getInstance(_servletRequest); - SortModel sortModel = dgss.getSortModel(GRID_NAME); + DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); /* now, add a new column "newcolumn" and explicitly set its direction */ Map queryParams = dgss.buildSortQueryParamsMap(GRID_NAME, "id", SortDirection.NONE); @@ -208,8 +208,8 @@ public void testSortModelSimple7() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~-id"); - DataGridStateService dgss = DataGridStateService.getInstance(_servletRequest); - SortModel sortModel = dgss.getSortModel(GRID_NAME); + DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); /* now, add a new column "newcolumn" and explicitly set its direction */ Map queryParams = dgss.buildSortQueryParamsMap(GRID_NAME, "id", SortDirection.NONE); @@ -222,10 +222,10 @@ /* this is a test of sorts for two grids on the same URL */ public void testSortModelSimple8() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name&netui_sort=developers~bugcount,-milestone"); - DataGridStateService dgss = DataGridStateService.getInstance(_servletRequest); - SortModel sortModel = dgss.getSortModel(GRID_NAME); + DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); - List<ISort> sorts = sortModel.getSorts(); + List<Sort> sorts = sortModel.getSorts(); assert sorts != null; assert sorts.size() == 2; assert sorts.get(0).getDirection() == SortDirection.ASCENDING; Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag?view=diff&r1=153815&r2=153816 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag Mon Feb 14 10:05:13 2005 @@ -18,10 +18,10 @@ form.submit(); } </script> - <select name="${pageScope.dataGrid.pagerRowQueryParamKey}" onchange="doPagerSubmit(this); return true;"> - <netui-data:repeater dataSource="pageScope.dataGrid.pagerParamValues"> + <select name="${dataGrid.pagerRowQueryParamKey}" onchange="doPagerSubmit(this); return true;"> + <netui-data:repeater dataSource="dataGrid.pagerParamValues"> <c:choose> - <c:when test="${container.index == dataGrid.pagerModel.page}"> + <c:when test="${container.index == dataGrid.dataGridState.pagerModel.page}"> <option value="${container.item}" selected="true">${container.index+1}</option> </c:when> <c:otherwise>
