Browse Source

Merged testbench test for #7110 from 6.8 (fix not needed for 7.0)

Change-Id: I14e02a02d77420e601ec5f98d70453fa85f1a473
svn: http://dev.vaadin.com/changeset/0000025944/svn
tags/7.0.7^0
John Ahlroos 11 years ago
parent
commit
02da730068

+ 60
- 0
WebContent/statictestfiles/PopupViewInEmbeddedApplication.html View File

@@ -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>

+ 32
- 0
uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html View File

@@ -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>

+ 30
- 0
uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java View File

@@ -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;
}

}

Loading…
Cancel
Save