Resolve infinite loop when clearing and adding rows (#16747)

Change-Id: Ibc364502cb756c499eb170a6a0c509f31d7fccb9

diff --git a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
index bd676e4ee95540a264295f3d875de6e00265faab..1de271c6466fb74d28a2331089160133d7295a89 100644 (file)
--- a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
+++ b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
@@ -541,7 +541,7 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
             Range oldCached = cached;
             cached = cached.offsetBy(count);
 
-            for (int i = 1; i <= indexToRowMap.size(); i++) {
+            for (int i = 1; i <= cached.length(); i++) {
                 int oldIndex = oldCached.getEnd() - i;
                 int newIndex = cached.getEnd() - i;
                 moveRowFromIndexToIndex(oldIndex, newIndex);

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
new file mode 100644 (file)
index 0000000..8be2dab
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
@@ -0,0 +1,72 @@
+/*
+ * 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.basicfeatures.server;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Grid;
+
+/**
+ * Tests that removing and adding rows doesn't cause an infinite loop in the
+ * browser.
+ * 
+ * @author Vaadin Ltd
+ */
+@Theme("valo")
+public class GridClearContainer extends AbstractTestUIWithLog {
+
+    private IndexedContainer ic;
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        final Grid grid = new Grid();
+        ic = new IndexedContainer();
+        ic.addContainerProperty("Col 1", String.class, "default");
+        ic.addItem("Row 1");
+        ic.addItem("Row 2");
+        grid.setContainerDataSource(ic);
+
+        Button b = new Button("Clear and re-add", new ClickListener() {
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public void buttonClick(ClickEvent event) {
+                ic.removeAllItems();
+                ic.addItem("Row 3").getItemProperty("Col 1")
+                        .setValue("Updated value 1");
+                ic.addItem("Row 4").getItemProperty("Col 1")
+                        .setValue("Updated value 2");
+            }
+        });
+        addComponent(b);
+        addComponent(grid);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Tests that removing and adding rows doesn't cause an infinite loop in the browser.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 16747;
+    }
+}

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
new file mode 100644 (file)
index 0000000..fd35dac
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.basicfeatures.server;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * Tests that removing and adding rows doesn't cause an infinite loop in the
+ * browser.
+ * 
+ * @author Vaadin Ltd
+ */
+public class GridClearContainerTest extends MultiBrowserTest {
+
+    private final String ERRORNOTE = "Unexpected cell contents.";
+
+    @Test
+    public void clearAndReadd() {
+        openTestURL();
+        ButtonElement button = $(ButtonElement.class).caption(
+                "Clear and re-add").first();
+        GridElement grid = $(GridElement.class).first();
+        Assert.assertEquals(ERRORNOTE, "default", grid.getCell(0, 0).getText());
+        Assert.assertEquals(ERRORNOTE, "default", grid.getCell(1, 0).getText());
+        button.click();
+        Assert.assertEquals(ERRORNOTE, "Updated value 1", grid.getCell(0, 0)
+                .getText());
+        Assert.assertEquals(ERRORNOTE, "Updated value 2", grid.getCell(1, 0)
+                .getText());
+    }
+}