diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-28 09:17:02 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-28 07:46:18 +0000 |
| commit | b49e431840030436bdcecfb0cff3ff38b6509b6b (patch) | |
| tree | 5dc49a77238bc1a01b8eb18345922ab967a0ac78 | |
| parent | b7db290434cce13c260d11b8b6323a79aebf3ed6 (diff) | |
| download | vaadin-framework-b49e431840030436bdcecfb0cff3ff38b6509b6b.tar.gz vaadin-framework-b49e431840030436bdcecfb0cff3ff38b6509b6b.zip | |
Fix GridBasicFeatures to use correct property IDs
Change-Id: I385fc841b5a46c55f9a28197837616e597891fb1
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java index a862aa095f..87109b5007 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java @@ -18,7 +18,6 @@ package com.vaadin.tests.components.grid.basicfeatures; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.LinkedHashMap; import java.util.List; @@ -386,10 +385,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Boolean value, Object columnIndex) { - Object propertyId = (new ArrayList(grid - .getContainerDatasource() - .getContainerPropertyIds()) - .get((Integer) columnIndex)); + Object propertyId = getColumnProperty((Integer) columnIndex); GridColumn column = grid.getColumn(propertyId); column.setVisible(!column.isVisible()); } @@ -403,6 +399,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { grid.getContainerDatasource() .removeContainerProperty( getColumnProperty((Integer) data)); + removeCategory("Column " + data); } }, null, c); @@ -421,10 +418,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Boolean value, Object columnIndex) { - Object propertyId = (new ArrayList(grid - .getContainerDatasource() - .getContainerPropertyIds()) - .get((Integer) columnIndex)); + Object propertyId = getColumnProperty((Integer) columnIndex); GridColumn column = grid.getColumn(propertyId); column.setSortable(value); } @@ -438,10 +432,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Integer value, Object columnIndex) { - Object propertyId = (new ArrayList(grid - .getContainerDatasource() - .getContainerPropertyIds()) - .get((Integer) columnIndex)); + Object propertyId = getColumnProperty((Integer) columnIndex); GridColumn column = grid.getColumn(propertyId); column.setWidthUndefined(); } @@ -454,10 +445,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, Integer value, Object columnIndex) { - Object propertyId = (new ArrayList(grid - .getContainerDatasource() - .getContainerPropertyIds()) - .get((Integer) columnIndex)); + Object propertyId = getColumnProperty((Integer) columnIndex); GridColumn column = grid.getColumn(propertyId); column.setWidth(value); } @@ -475,10 +463,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, GridStaticCellType value, Object columnIndex) { - final Object propertyId = (new ArrayList(grid - .getContainerDatasource() - .getContainerPropertyIds()) - .get((Integer) columnIndex)); + final Object propertyId = getColumnProperty((Integer) columnIndex); final HeaderCell cell = grid.getHeader() .getDefaultRow().getCell(propertyId); switch (value) { @@ -516,10 +501,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void execute(Grid grid, GridStaticCellType value, Object columnIndex) { - final Object propertyId = (new ArrayList(grid - .getContainerDatasource() - .getContainerPropertyIds()) - .get((Integer) columnIndex)); + final Object propertyId = getColumnProperty((Integer) columnIndex); final FooterCell cell = grid.getFooter().getRow(0) .getCell(propertyId); switch (value) { |