summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-10-19 14:43:06 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2015-10-26 14:01:41 +0000
commitf5e2275e70a42817c4786657c385f8213ec365ee (patch)
treeae1bcf0ef1c40786b91c7253ff43e04d6268ed69 /uitest
parentce161ac530bb9122e7a9c09d48b8f27218a8940b (diff)
downloadvaadin-framework-f5e2275e70a42817c4786657c385f8213ec365ee.tar.gz
vaadin-framework-f5e2275e70a42817c4786657c385f8213ec365ee.zip
Fix Grid NPE when deselecting already removed row (#19152)
Change-Id: I1361c8099e9f4a95e991f4937a406c5e4db67027
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java13
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java14
2 files changed, 27 insertions, 0 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 94ee3ef348..777f5f6775 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -1396,6 +1396,19 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> {
ds.removeAllItems();
}
}, null);
+
+ createClickAction("Remove selected rows", "Body rows",
+ new Command<Grid, String>() {
+ @Override
+ public void execute(Grid c, String value, Object data) {
+ // Usually you'd deselect all the rows before removing
+ // them. It is done this way to test for #19152
+ for (Object itemId : c.getSelectedRows()) {
+ ds.removeItem(itemId);
+ }
+ c.select(null);
+ }
+ }, null);
}
protected void createEditorActions() {
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
index 8bf8639d76..44a632bc49 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
@@ -382,6 +382,20 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
selectAll.isSelected());
}
+ @Test
+ public void testRemoveSelectedRow() {
+ openTestURL();
+
+ setSelectionModelSingle();
+ getGridElement().getCell(0, 0).click();
+
+ selectMenuPath("Component", "Body rows", "Remove selected rows");
+
+ assertFalse(
+ "Unexpected NullPointerException when removing selected rows",
+ logContainsText("Exception occured, java.lang.NullPointerException: null"));
+ }
+
private void waitUntilCheckBoxValue(final WebElement checkBoxElememnt,
final boolean expectedValue) {
waitUntil(new ExpectedCondition<Boolean>() {