Ensure correct render of selection when changing selection model (#17087)

Change-Id: I79547b32a7b7bec0ea2b327ceb0b69c756e2e812

2 files changed, 29 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
index a341e39b74..d1d7b21e11 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
@@ -195,4 +195,17 @@ public class GridClientSelectionTest extends GridBasicClientFeaturesTest {
                 isRowSelected(1));
     }
 
+    @Test
+    public void testChangeSelectionModelUpdatesUI() {
+        openTestURL();
+
+        setSelectionModelSingle(true);
+        getGridElement().getCell(5, 1).click();
+        assertTrue("Row 5 should be selected after clicking", isRowSelected(5));
+        setSelectionModelNone();
+        assertFalse(
+                "Row 5 should not be selected after changing selection model",
+                isRowSelected(5));
+
+    }
 }
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 74972fe4d2..9953bbcae0 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
@@ -319,6 +319,22 @@ public class GridSelectionTest extends GridBasicFeaturesTest {
                 .isSelected());
     }
 
+    @Test
+    public void testChangeSelectionModelUpdatesUI() {
+        openTestURL();
+
+        setSelectionModelSingle();
+
+        getGridElement().getCell(5, 1).click();
+        assertTrue("Row should be selected after clicking", getRow(5)
+                .isSelected());
+
+        setSelectionModelNone();
+        assertFalse(
+                "Row should not be selected after changing selection model",
+                getRow(5).isSelected());
+    }
+
     private void setSelectionModelMulti() {
         selectMenuPath("Component", "State", "Selection mode", "multi");
     }