Add test for RpcDataProvider calls to Container (#16642)

Change-Id: I25eb85ac1241c46dbef6d473b3a2f7cdebb4b4ba

2 files changed, 57 insertions, 22 deletions

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
index 0f04a1552e..f91f93c5d5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
@@ -16,7 +16,6 @@
 package com.vaadin.tests.components.grid.basicfeatures.server;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.NotificationElement;
@@ -39,27 +38,6 @@ public class GridRowAddRemoveTest extends GridBasicFeaturesTest {
     }
 
     @Test
-    @Ignore("This test checks the parameters passed to Container. Has nothing to do with what's sent to client.")
-    public void removeRows_loadAllAtOnce() {
-        openTestURL();
-
-        selectMenuPath("Component", "Size", "HeightMode Row");
-        selectMenuPath("Settings", "Clear log");
-        selectMenuPath("Component", "Body rows", "Remove 18 first rows");
-
-        Assert.assertTrue(
-                "All newly required rows should be fetched in the same round trip.",
-                logContainsText("Requested items 37 - 55"));
-
-        selectMenuPath("Settings", "Clear log");
-        selectMenuPath("Component", "Body rows", "Remove 18 first rows");
-
-        Assert.assertTrue(
-                "All newly required rows should be fetched in the same round trip.",
-                logContainsText("Requested items 37 - 55"));
-    }
-
-    @Test
     public void testAdd18Rows() {
         setDebug(true);
         openTestURL();
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
new file mode 100644
index 0000000000..9313b40770
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+
+public class GridScrollTest extends GridBasicFeaturesTest {
+
+    @Test
+    public void testCorrectItemRequestsOnScroll() {
+        openTestURL();
+
+        assertTrue("Initial push from server not found",
+                getLogRow(1).equals("0. Requested items 0 - 40"));
+        // Client response varies a bit between browsers as different amount of
+        // rows is cached.
+        assertTrue("First row request from client not found", getLogRow(0)
+                .startsWith("1. Requested items 0 - "));
+
+        selectMenuPath("Component", "Size", "HeightMode Row");
+
+        selectMenuPath("Settings", "Clear log");
+        $(GridElement.class).first().scrollToRow(40);
+        assertEquals("Log row did not contain expected item request",
+                "0. Requested items 0 - 86", getLogRow(0));
+        assertEquals("There should be only one log row", " ", getLogRow(1));
+        selectMenuPath("Settings", "Clear log");
+        $(GridElement.class).first().scrollToRow(100);
+        assertEquals("Log row did not contain expected item request",
+                "0. Requested items 47 - 146", getLogRow(0));
+        assertEquals("There should be only one log row", " ", getLogRow(1));
+        selectMenuPath("Settings", "Clear log");
+        $(GridElement.class).first().scrollToRow(300);
+        assertEquals("Log row did not contain expected item request",
+                "0. Requested items 247 - 346", getLogRow(0));
+        assertEquals("There should be only one log row", " ", getLogRow(1));
+    }
+}