aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/test
diff options
context:
space:
mode:
authorDenis <denis@vaadin.com>2016-12-20 09:53:33 +0200
committerPekka Hyvönen <pekka@vaadin.com>2016-12-20 09:53:33 +0200
commit54df589b2006587798748fe1502af44b1f7fd831 (patch)
treea54fe1dcf6eb0cc714b56b3353fc946ebae9ad0c /server/src/test
parent5be4fb00cc648816ea1695aa3a30a646d47cd567 (diff)
downloadvaadin-framework-54df589b2006587798748fe1502af44b1f7fd831.tar.gz
vaadin-framework-54df589b2006587798748fe1502af44b1f7fd831.zip
Fix for Grid declarative format (read). (#8050)
* Fix for Grid declarative format (read). Fixes vaadin/framework8-issues#576
Diffstat (limited to 'server/src/test')
-rw-r--r--server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java
index 70e6539a48..d8b75b130e 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridDeclarativeTest.java
@@ -28,6 +28,7 @@ import org.junit.Test;
import com.vaadin.data.SelectionModel.Multi;
import com.vaadin.data.SelectionModel.Single;
import com.vaadin.data.provider.DataProvider;
+import com.vaadin.data.provider.Query;
import com.vaadin.shared.ui.grid.HeightMode;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.data.bean.Person;
@@ -264,7 +265,8 @@ public class GridDeclarativeTest extends AbstractListingDeclarativeTest<Grid> {
person2.getFirstName(), person2.getLastName(),
getComponentTag());
- testRead(design, grid);
+ Grid<?> readGrid = testRead(design, grid, true, true);
+ Assert.assertEquals(2, readGrid.getDataProvider().size(new Query<>()));
testWrite(design, grid, true);
}
@@ -313,7 +315,8 @@ public class GridDeclarativeTest extends AbstractListingDeclarativeTest<Grid> {
person3.toString(), person3.getFirstName(),
person3.getLastName(), getComponentTag());
- testRead(design, grid);
+ Grid<?> readGrid = testRead(design, grid, true, true);
+ Assert.assertEquals(3, readGrid.getDataProvider().size(new Query<>()));
testWrite(design, grid, true);
}
@@ -347,7 +350,8 @@ public class GridDeclarativeTest extends AbstractListingDeclarativeTest<Grid> {
person2.getFirstName(), person2.getLastName(),
getComponentTag());
- testRead(design, grid);
+ Grid<?> readGrid = testRead(design, grid, true, true);
+ Assert.assertEquals(2, readGrid.getDataProvider().size(new Query<>()));
testWrite(design, grid, true);
}
@@ -382,7 +386,8 @@ public class GridDeclarativeTest extends AbstractListingDeclarativeTest<Grid> {
person2.toString(), person2.getFirstName(),
person2.getLastName(), getComponentTag());
- testRead(design, grid);
+ Grid<?> readGrid = testRead(design, grid, true, true);
+ Assert.assertEquals(2, readGrid.getDataProvider().size(new Query<>()));
testWrite(design, grid, true);
grid.setSelectionMode(SelectionMode.SINGLE);
@@ -394,7 +399,8 @@ public class GridDeclarativeTest extends AbstractListingDeclarativeTest<Grid> {
person2.getFirstName(), person2.getLastName(),
getComponentTag());
- testRead(design, grid);
+ readGrid = testRead(design, grid, true, true);
+ Assert.assertEquals(2, readGrid.getDataProvider().size(new Query<>()));
testWrite(design, grid, true);
}