diff options
| author | Marc Englund <marc@vaadin.com> | 2012-11-01 09:18:40 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-01 09:18:40 +0000 |
| commit | 06c6b1efcaea9a3f63f9abddb544cac3562cee40 (patch) | |
| tree | b0da80cd6b1320a50092790d146d4416fb35fb89 /uitest/src/com/vaadin | |
| parent | b15c163fd5504f64933984a93d62e1f473edd47c (diff) | |
| parent | 4028718760ec3a6e2a73f56cfa72de08efc1250c (diff) | |
| download | vaadin-framework-06c6b1efcaea9a3f63f9abddb544cac3562cee40.tar.gz vaadin-framework-06c6b1efcaea9a3f63f9abddb544cac3562cee40.zip | |
Merge "Fixed Combobox popup positioning problem when located inside a PopupView #9768"
Diffstat (limited to 'uitest/src/com/vaadin')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html | 42 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java | 45 |
2 files changed, 87 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html b/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html new file mode 100644 index 0000000000..1b7b42a4e3 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.html @@ -0,0 +1,42 @@ +<?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="http://localhost:8888/" /> +<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.combobox.ComboboxInPopupViewWithItems?restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboboxInPopupViewWithItems::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VPopupView[0]</td> + <td>26,6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>//input[@type='text']</td> + <td>52,13</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>//input[@type='text']</td> + <td>down</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>popup-open</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java b/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java new file mode 100644 index 0000000000..3aaae7e6dc --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java @@ -0,0 +1,45 @@ +package com.vaadin.tests.components.combobox; + +import java.util.Arrays; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.ComboBox; +import com.vaadin.ui.Component; +import com.vaadin.ui.PopupView; +import com.vaadin.ui.TextArea; + +public class ComboboxInPopupViewWithItems extends TestBase { + + @Override + protected void setup() { + addComponent(new TextArea("Some component")); + addComponent(new PopupView(new PopupContent())); + + } + + @Override + protected String getDescription() { + return "Combobox popup should be in the correct place even when it is located inside a PopupView"; + } + + @Override + protected Integer getTicketNumber() { + return 9768; + } + + class PopupContent implements PopupView.Content { + + private final ComboBox cb = new ComboBox(null, Arrays.asList("Item 1", + "Item 2", "Item 3")); + + @Override + public String getMinimizedValueAsHTML() { + return "click here"; + } + + @Override + public Component getPopupComponent() { + return cb; + } + } +} |