2 files changed, 90 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselect.java b/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselect.java
new file mode 100644
index 0000000000..b80a9d1153
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselect.java
@@ -0,0 +1,35 @@
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Grid;
+
+public class GridEditorMultiselect extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        Grid grid = new Grid();
+
+        grid.addColumn("name");
+        grid.addColumn("age", Integer.class);
+
+        for (int i = 0; i < 30; i++) {
+            grid.addRow("name " + i, i);
+        }
+
+        grid.setEditorEnabled(true);
+        grid.setSelectionMode(Grid.SelectionMode.MULTI);
+
+        addComponent(grid);
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 17132;
+    }
+
+    @Override
+    public String getDescription() {
+        return "Grid Multiselect: Edit mode allows invalid selection";
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
new file mode 100644
index 0000000000..ba689fb5e1
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
@@ -0,0 +1,55 @@
+package com.vaadin.tests.components.grid;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class GridEditorMultiselectTest extends MultiBrowserTest {
+
+    @Test
+    public void testSelectCheckboxesDisabled() {
+        openTestURL();
+        GridElement grid = openEditor();
+        assertCheckboxesEnabled(grid, false);
+    }
+
+    @Test
+    public void testSelectCheckboxesEnabledBackOnSave() {
+        openTestURL();
+        GridElement grid = openEditor();
+        grid.getEditor().save();
+        assertCheckboxesEnabled(grid, true);
+    }
+
+    @Test
+    public void testSelectCheckboxesEnabledBackOnCancel() {
+        openTestURL();
+        GridElement grid = openEditor();
+        grid.getEditor().cancel();
+        assertCheckboxesEnabled(grid, true);
+    }
+
+    private GridElement openEditor() {
+        GridElement grid = $(GridElement.class).first();
+        grid.getRow(0).doubleClick();
+        Assert.assertTrue("Grid editor should be displayed.", grid.getEditor()
+                .isDisplayed());
+        return grid;
+    }
+
+    private void assertCheckboxesEnabled(GridElement grid, boolean isEnabled) {
+        List<WebElement> checkboxes = grid.findElements(By
+                .xpath("//input[@type='checkbox']"));
+        for (WebElement checkbox : checkboxes) {
+            Assert.assertEquals("Select checkboxes should be "
+                    + (isEnabled ? "enabled" : "disabled"), isEnabled,
+                    checkbox.isEnabled());
+        }
+    }
+}