diff options
Diffstat (limited to 'server/tests')
2 files changed, 6 insertions, 1 deletions
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java index 1c22a69571..798988bb0d 100644 --- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java @@ -28,6 +28,8 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { + " <col sortable=true width='100' property-id='Column1'>" + " <col sortable=false max-width='200' expand='2' property-id='Column2'>" + " <col sortable=true editable=false min-width='15' expand='1' property-id='Column3'>" + + " <col sortable=true hidable=true property-id='Column4'>" + + " <col sortable=true hidden=true property-id='Column5'>" + "</colgroup>" // + "<thead />" // + "</table></v-grid>"; @@ -37,6 +39,8 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { .setExpandRatio(2).setSortable(false); grid.addColumn("Column3", String.class).setMinimumWidth(15) .setExpandRatio(1).setEditable(false); + grid.addColumn("Column4", String.class).setHidable(true); + grid.addColumn("Column5", String.class).setHidden(true); // Remove the default header grid.removeHeaderRow(grid.getDefaultHeaderRow()); diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java index e17f3ee0be..d27968cb07 100644 --- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java @@ -38,7 +38,7 @@ public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> { public void testBasicAttributes() { String design = "<v-grid editable='true' rows=20 frozen-columns=-1 " - + "editor-save-caption='Tallenna' editor-cancel-caption='Peruuta'>"; + + "editor-save-caption='Tallenna' editor-cancel-caption='Peruuta' column-reordering-allowed=true>"; Grid grid = new Grid(); grid.setEditorEnabled(true); @@ -47,6 +47,7 @@ public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> { grid.setFrozenColumnCount(-1); grid.setEditorSaveCaption("Tallenna"); grid.setEditorCancelCaption("Peruuta"); + grid.setColumnReorderingAllowed(true); testRead(design, grid); testWrite(design, grid); |