diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-08-10 07:04:37 +0000 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-08-10 07:04:37 +0000 |
| commit | 35887c66f84f0ca4f0b5d5803f24bbcc32cca15a (patch) | |
| tree | 7cb57050db06a9e5e709bfa000a5bde783e2c829 /tests | |
| parent | a41fbd0e685cc8f63b79805a5171777b2153807f (diff) | |
| download | vaadin-framework-35887c66f84f0ca4f0b5d5803f24bbcc32cca15a.tar.gz vaadin-framework-35887c66f84f0ca4f0b5d5803f24bbcc32cca15a.zip | |
#7187 Allow HTML content in an MenuItem
svn changeset:20245/svn branch:6.7
Diffstat (limited to 'tests')
3 files changed, 136 insertions, 1 deletions
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html b/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html new file mode 100644 index 0000000000..2878018752 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html @@ -0,0 +1,72 @@ +<?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">MenuBarHtmlItems</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.menubar.MenuBarHtmlItems?restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::PID_Scheckboxaction-Html content allowed/domChild[0]</td> + <td>44,1</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]#item0</td> + <td>7,6</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]</td> + <td>right</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>html</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::PID_Scheckboxaction-Html content allowed/domChild[0]</td> + <td>37,1</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]#item0</td> + <td>13,6</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]</td> + <td>right</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>plain</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java b/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java new file mode 100644 index 0000000000..ba22bcb7a4 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java @@ -0,0 +1,63 @@ +package com.vaadin.tests.components.menubar; + +import java.util.Arrays; +import java.util.List; + +import com.vaadin.terminal.Resource; +import com.vaadin.terminal.ThemeResource; +import com.vaadin.tests.components.ComponentTestCase; +import com.vaadin.ui.Component; +import com.vaadin.ui.MenuBar; +import com.vaadin.ui.MenuBar.MenuItem; + +public class MenuBarHtmlItems extends ComponentTestCase<MenuBar> { + + @Override + protected Class<MenuBar> getTestClass() { + return MenuBar.class; + } + + @Override + protected void initializeComponents() { + MenuBar m = new MenuBar(); + MenuItem submenu = m.addItem("Item <u>1</u>", getIcon(), null); + MenuItem subsubmenu = submenu.addItem("<b>Bold</b> item", null); + subsubmenu.addItem("<i><u>I</u>talic</i> item", getIcon(), null); + submenu.addItem( + "<span style='font-size: 30px'>Big</span> <span style='font-size: 8px'>disabled</span> item", + null).setEnabled(false); + + m.addItem("<span style='font-size: 30px'>Big</span> item", null); + + addTestComponent(m); + } + + private Resource getIcon() { + return new ThemeResource("../runo/icons/16/user.png"); + } + + @Override + protected List<Component> createActions() { + return Arrays.asList(createSwitchHtmlAction()); + } + + private Component createSwitchHtmlAction() { + return createBooleanAction("Html content allowed", false, + new Command<MenuBar, Boolean>() { + public void execute(MenuBar c, Boolean value, Object data) { + c.setHtmlContentAllowed(value.booleanValue()); + } + }); + } + + @Override + protected Integer getTicketNumber() { + return 7187; + } + + @Override + protected String getDescription() { + return "A menu containing items with embedded html. Items should chould either render the html or show it as plain text depending on the setting."; + } + +} diff --git a/tests/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html b/tests/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html index af6f74b3df..d74354299d 100644 --- a/tests/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html +++ b/tests/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html @@ -9,7 +9,7 @@ <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">New Test</td></tr> +<tr><td rowspan="1" colspan="3">HtmlOptionGroupItems</td></tr> </thead><tbody> <tr> <td>open</td> |