From b9c0971afe9596329bd1a7e12f2cca1e647a80d4 Mon Sep 17 00:00:00 2001
From: Teppo Kurki <teppo.kurki@vaadin.com>
Date: Mon, 6 Jul 2015 11:59:00 +0300
Subject: Fixes scrollToLine while resizing Grid via split position (#18424)

Change-Id: I5ecd8a91bd1ebea809d04a54307fcd752fbe3f39
---
 .../grid/GridScrollToLineWhileResizing.java        | 73 ++++++++++++++++++++++
 .../grid/GridScrollToLineWhileResizingTest.java    | 49 +++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
 create mode 100644 uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java b/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
new file mode 100644
index 0000000000..194a9a3acc
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
@@ -0,0 +1,73 @@
+/*
+ * 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.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.event.SelectionEvent;
+import com.vaadin.event.SelectionEvent.SelectionListener;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Grid;
+import com.vaadin.ui.Grid.SelectionMode;
+import com.vaadin.ui.VerticalSplitPanel;
+
+public class GridScrollToLineWhileResizing extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+
+        final VerticalSplitPanel vsp = new VerticalSplitPanel();
+        vsp.setWidth(500, Unit.PIXELS);
+        vsp.setHeight(500, Unit.PIXELS);
+        vsp.setSplitPosition(100, Unit.PERCENTAGE);
+        addComponent(vsp);
+
+        IndexedContainer indexedContainer = new IndexedContainer();
+        indexedContainer.addContainerProperty("column1", String.class, "");
+
+        for (int i = 0; i < 100; i++) {
+            Item addItem = indexedContainer.addItem(i);
+            addItem.getItemProperty("column1").setValue("cell" + i);
+        }
+
+        final Grid grid = new Grid(indexedContainer);
+        grid.setSizeFull();
+
+        grid.setSelectionMode(SelectionMode.SINGLE);
+        grid.addSelectionListener(new SelectionListener() {
+
+            @Override
+            public void select(SelectionEvent event) {
+                vsp.setSplitPosition(50, Unit.PERCENTAGE);
+                grid.scrollTo(event.getSelected().iterator().next());
+            }
+        });
+
+        vsp.setFirstComponent(grid);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Tests scrollToLine while moving SplitPanel split position to resize the Grid on the same round-trip.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return null;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java b/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
new file mode 100644
index 0000000000..aee1db7a85
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.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;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.testbench.parallel.TestCategory;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+@TestCategory("grid")
+public class GridScrollToLineWhileResizingTest extends MultiBrowserTest {
+
+    @Test
+    public void testScrollToLineWorksWhileMovingSplitProgrammatically() {
+        openTestURL();
+
+        $(GridElement.class).first().getCell(21, 0).click();
+
+        List<WebElement> cells = findElements(By.className("v-grid-cell"));
+        boolean foundCell21 = false;
+        for (WebElement cell : cells) {
+            if ("cell21".equals(cell.getText())) {
+                foundCell21 = true;
+            }
+        }
+
+        assertTrue(foundCell21);
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3