diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-12 09:39:16 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-12 09:39:21 +0300 |
| commit | da0a11208888f7883bf40fe31019d3a80940e19f (patch) | |
| tree | 10e3470c04a15315300b9d74f60ce8fbeff59d52 /uitest | |
| parent | ecc2de3ff1b9998c8a7ca496e71a13c53acd5c84 (diff) | |
| parent | 02da730068fc3f828a162b272a532f33a46d4c1e (diff) | |
| download | vaadin-framework-da0a11208888f7883bf40fe31019d3a80940e19f.tar.gz vaadin-framework-da0a11208888f7883bf40fe31019d3a80940e19f.zip | |
Merge changes from origin/7.0
02da730 Merged testbench test for #7110 from 6.8 (fix not needed for 7.0)
Change-Id: I4a53d5a1fed3018c8cdda5b1aa88715e911ed112
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html | 32 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java | 30 |
2 files changed, 62 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html new file mode 100644 index 0000000000..d2ca843cf5 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html @@ -0,0 +1,32 @@ +<?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>/statictestfiles/PopupViewInEmbeddedApplication.html</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=helloworld::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupView[0]</td> + <td>28,16</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>popup-on-link</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java new file mode 100644 index 0000000000..d19f98124e --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java @@ -0,0 +1,30 @@ +package com.vaadin.tests.components.popupview; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Label; +import com.vaadin.ui.PopupView; + +/* + * Used by PopupViewInEmbedded.html + */ +public class PopupViewInEmbeddedApplication extends TestBase { + + @Override + protected void setup() { + PopupView pop = new PopupView("Click me!", new Label( + "I popped up, woohoo!")); + addComponent(pop); + } + + @Override + protected String getDescription() { + return "Clicking on the popup link should pop up the popup on top of the link," + + " even though the application has been embedded inside a div."; + } + + @Override + protected Integer getTicketNumber() { + return 7110; + } + +} |