diff options
| author | John Ahlroos <john@vaadin.com> | 2013-06-05 14:01:00 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-06-05 16:20:39 +0000 |
| commit | 02da730068fc3f828a162b272a532f33a46d4c1e (patch) | |
| tree | 53082896bae4842dcffaa90faa6c880298387f2c | |
| parent | 14ebd0d9c8bdfa9940786492876172d1891f593f (diff) | |
| download | vaadin-framework-02da730068fc3f828a162b272a532f33a46d4c1e.tar.gz vaadin-framework-02da730068fc3f828a162b272a532f33a46d4c1e.zip | |
Change-Id: I14e02a02d77420e601ec5f98d70453fa85f1a473
svn: http://dev.vaadin.com/changeset/0000025944/svn
3 files changed, 122 insertions, 0 deletions
diff --git a/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html b/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html new file mode 100644 index 0000000000..613bb2cd41 --- /dev/null +++ b/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <meta http-equiv="X-UA-Compatible" content="IE=9;chrome=1" /> + + <title>This is my Embedding Page</title> + + <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="/VAADIN/themes/reindeer/favicon.ico" /> + <link rel="icon" type="image/vnd.microsoft.icon" href="/VAADIN/themes/reindeer/favicon.ico" /> +</head> + +<body> + <script type="text/javascript" src="/VAADIN/vaadinBootstrap.js"></script> + + + <p>This is a static web page that contains an embedded Vaadin + application. The embedded application div has been taken out of the normal element flow by applying 'float:left' causing the application + to float to the left.</p> + + <div id="helloworld" style="border: 2px solid green; float:left; width:400px; height:400px"></div> + + <div style="clear:both"></div> + + <hr/> + + <script type="text/javascript">//<![CDATA[ + if (!window.vaadin) alert("Failed to load the bootstrap JavaScript: "+ "VAADIN/vaadinBootstrap.js"); + + /* The UI Configuration */ + vaadin.initApplication("helloworld", { + "browserDetailsUrl": "/run/com.vaadin.tests.components.popupview.PopupViewInEmbeddedApplication", + "serviceUrl": "/run", + "widgetset": "com.vaadin.DefaultWidgetSet", + "theme": "reindeer", + "versionInfo": {"vaadinVersion": "7.0.0"}, + "vaadinDir": "./../VAADIN/", + "heartbeatInterval": 300, + "debug": true, + "standalone": false, + "authErrMsg": { + "message": "Take note of any unsaved data, "+ + "and <u>click here<\/u> to continue.", + "caption": "Authentication problem" + }, + "comErrMsg": { + "message": "Take note of any unsaved data, "+ + "and <u>click here<\/u> to continue.", + "caption": "Communication problem" + }, + "sessExpMsg": { + "message": "Take note of any unsaved data, "+ + "and <u>click here<\/u> to continue.", + "caption": "Session Expired" + } + }); + </script> +</body> + +</html>
\ No newline at end of file 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; + } + +} |