diff options
author | Juuso Valli <juuso@vaadin.com> | 2014-04-29 12:48:07 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2014-05-14 07:34:28 +0000 |
commit | da11bda0a3583922ad1f338f4d12c0aa821ad796 (patch) | |
tree | eb0b0d219e2540affbc4bb9a70eeecd78167349b /uitest | |
parent | 5a1ffa814230c3da751ab5953da0fb0ae75c4c80 (diff) | |
download | vaadin-framework-da11bda0a3583922ad1f338f4d12c0aa821ad796.tar.gz vaadin-framework-da11bda0a3583922ad1f338f4d12c0aa821ad796.zip |
Fix table scrolling up on select (#10106)
Change-Id: I4d13bee983817ce299d1f7e52ddd6cdc725fee6f
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelect.java | 89 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java | 59 |
2 files changed, 148 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelect.java b/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelect.java new file mode 100644 index 0000000000..0e2e1b76e1 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelect.java @@ -0,0 +1,89 @@ +/* + * 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.table; + +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Table; +import com.vaadin.ui.TextField; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; + +/** + * Test to see if Table appears to scroll up under an obscure set of conditions + * (Scrolled down, set to expand, selecting updates a TextField that precedes + * the Table in a VerticalLayout.) (#10106) + * + * @author Vaadin Ltd + */ +public class TableScrollUpOnSelect extends AbstractTestUI { + public TextField text = null; + + @Override + protected void setup(VaadinRequest request) { + text = new TextField(); + text.setImmediate(true); + + final Table table = new Table(null); + table.addContainerProperty("value", Integer.class, 0); + for (int i = 0; i < 50; ++i) { + table.addItem(new Object[] { i }, i); + } + table.setSizeFull(); + table.setSelectable(true); + table.setImmediate(true); + table.setEditable(false); + + final VerticalLayout layout = new VerticalLayout(); + + table.addValueChangeListener(new ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + if (table.getValue() != null) { + text.setValue(table.getValue().toString()); + } + } + + }); + + table.setCurrentPageFirstItemIndex(49); + + layout.setSizeFull(); + layout.addComponent(text); + layout.addComponent(table); + layout.setExpandRatio(table, 1.0f); + Window window = new Window(); + window.setHeight("600px"); + window.setWidth("400px"); + window.setModal(true); + window.setContent(layout); + getUI().addWindow(window); + } + + @Override + protected String getTestDescription() { + return "Table scrolls up when selecting a row"; + } + + @Override + protected Integer getTicketNumber() { + return 13358; + } + +} diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java b/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java new file mode 100644 index 0000000000..b2fde31b93 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java @@ -0,0 +1,59 @@ +/* + * Copyright 2000-2013 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.table; + +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedCondition; + +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.TableElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +/** + * Test to see if Table appears to scroll up under an obscure set of conditions + * (Scrolled down, set to expand, selecting updates a TextField that precedes + * the Table in a VerticalLayout.) (#10106) + * + * @author Vaadin Ltd + */ +public class TableScrollUpOnSelectTest extends MultiBrowserTest { + + @Test + public void TestThatSelectingDoesntScroll() { + openTestURL(); + + // WebElement table = driver.findElement(By.vaadin("//Table")); + WebElement row = $(TableElement.class).first().getCell(49, 0); + final WebElement scrollPositionDisplay = getDriver().findElement( + By.className("v-table-scrollposition")); + waitUntilNot(new ExpectedCondition<Boolean>() { + + @Override + public Boolean apply(WebDriver input) { + return scrollPositionDisplay.isDisplayed(); + } + }, 10); + + int rowLocation = row.getLocation().getY(); + row.click(); + int newRowLocation = row.getLocation().getY(); + + Assert.assertTrue("Table has scrolled.", rowLocation == newRowLocation); + } +} |