diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-01-14 20:38:01 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-01-14 20:38:01 +0200 |
| commit | cc39c3db5895fb950814b97d6db5c1712fd8e078 (patch) | |
| tree | c372256c19acc51628ff4270992ea47c61cdb297 /uitest | |
| parent | 13261dc275d1cda7ef5436d6bc6ff649c1338cb6 (diff) | |
| download | vaadin-framework-cc39c3db5895fb950814b97d6db5c1712fd8e078.tar.gz vaadin-framework-cc39c3db5895fb950814b97d6db5c1712fd8e078.zip | |
Maintain Table scroll position when changing expand (#10489, #10106)
Change-Id: I4937d8943eab65cd4da2ec2e01af5935f96e244d
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.html | 52 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java | 61 |
2 files changed, 113 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.html b/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.html new file mode 100644 index 0000000000..8fbd3d215b --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.html @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.orderedlayout.ExpandChangeReattach?restartApplication</td> + <td></td> +</tr> +<tr> + <td>scroll</td> + <td>vaadin=runcomvaadintestscomponentsorderedlayoutExpandChangeReattach::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[1]</td> + <td>10000</td> +</tr> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentsorderedlayoutExpandChangeReattach::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>expandEnabled</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentsorderedlayoutExpandChangeReattach::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>expandDisabled</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java b/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java new file mode 100644 index 0000000000..4360ff60d8 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java @@ -0,0 +1,61 @@ +/* + * Copyright 2012 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.orderedlayout; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.util.TestUtils; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Table; +import com.vaadin.ui.VerticalLayout; + +public class ExpandChangeReattach extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + final VerticalLayout verticalLayout = new VerticalLayout(); + verticalLayout.setHeight(null); + + Table table = new Table("Table", TestUtils.getISO3166Container()); + verticalLayout.addComponent(table); + verticalLayout.addComponent(new Button("Toggle expand logic", + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + if (verticalLayout.getHeight() == -1) { + verticalLayout.setHeight("900px"); + } else { + verticalLayout.setHeight(null); + } + } + })); + + addComponent(verticalLayout); + } + + @Override + protected String getTestDescription() { + return "Table should not forget its scroll position when it is temporarily detached from the DOM because an ordered layout changes expand modes."; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(10489); + } + +} |