Fix active row range handling when removing rows (#15454)

Change-Id: I6de22796051503290db216d4c213401d24a7e2a0

2 files changed, 126 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/components/grid/GridInTabSheet.java b/uitest/src/com/vaadin/tests/components/grid/GridInTabSheet.java
new file mode 100644
index 0000000000..4a331f3fa4
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridInTabSheet.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Grid;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+
+public class GridInTabSheet extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        TabSheet sheet = new TabSheet();
+        final Grid grid = new Grid();
+        grid.addColumn("count", Integer.class);
+        for (Integer i = 0; i < 3; ++i) {
+            grid.addRow(i);
+        }
+
+        sheet.addTab(grid);
+        sheet.addTab(new Label("Hidden"));
+
+        addComponent(sheet);
+        addComponent(new Button("Add row to Grid", new Button.ClickListener() {
+
+            private Integer k = 0;
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                grid.addRow(100 + (k++));
+            }
+        }));
+        addComponent(new Button("Remove row from Grid",
+                new Button.ClickListener() {
+
+                    private Integer k = 0;
+
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        Object firstItemId = grid.getContainerDataSource()
+                                .firstItemId();
+                        if (firstItemId != null) {
+                            grid.getContainerDataSource().removeItem(
+                                    firstItemId);
+                        }
+                    }
+                }));
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridInTabSheetTest.java b/uitest/src/com/vaadin/tests/components/grid/GridInTabSheetTest.java
new file mode 100644
index 0000000000..0fe15b149b
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridInTabSheetTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class GridInTabSheetTest extends MultiBrowserTest {
+
+    @Test
+    public void testRemoveAllRowsAndAddThreeNewOnes() {
+        setDebug(true);
+        openTestURL();
+
+        for (int i = 0; i < 3; ++i) {
+            removeGridRow();
+        }
+
+        for (int i = 0; i < 3; ++i) {
+            addGridRow();
+            assertEquals("" + (100 + i), getGridElement().getCell(i, 1)
+                    .getText());
+        }
+        assertFalse("There was an unexpected error notification",
+                isElementPresent(NotificationElement.class));
+    }
+
+    private void removeGridRow() {
+        $(ButtonElement.class).caption("Remove row from Grid").first().click();
+    }
+
+    private void addGridRow() {
+        $(ButtonElement.class).caption("Add row to Grid").first().click();
+    }
+
+    private GridElement getGridElement() {
+        return $(GridElement.class).first();
+    }
+}