From 35887c66f84f0ca4f0b5d5803f24bbcc32cca15a Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Wed, 10 Aug 2011 07:04:37 +0000 Subject: #7187 Allow HTML content in an MenuItem svn changeset:20245/svn branch:6.7 --- .../tests/components/menubar/MenuBarHtmlItems.html | 72 ++++++++++++++++++++++ .../tests/components/menubar/MenuBarHtmlItems.java | 63 +++++++++++++++++++ .../optiongroup/HtmlOptionGroupItems.html | 2 +- 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html create mode 100644 tests/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java (limited to 'tests') 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 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MenuBarHtmlItems
open/run/com.vaadin.tests.components.menubar.MenuBarHtmlItems?restartApplication
mouseClickvaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::PID_Scheckboxaction-Html content allowed/domChild[0]44,1
mouseClickvaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]#item07,6
pressSpecialKeyvaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]down
pressSpecialKeyvaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]right
screenCapturehtml
mouseClickvaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::PID_Scheckboxaction-Html content allowed/domChild[0]37,1
mouseClickvaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]#item013,6
pressSpecialKeyvaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]down
pressSpecialKeyvaadin=runcomvaadintestscomponentsmenubarMenuBarHtmlItems::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VMenuBar[0]right
screenCaptureplain
+ + 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 { + + @Override + protected Class getTestClass() { + return MenuBar.class; + } + + @Override + protected void initializeComponents() { + MenuBar m = new MenuBar(); + MenuItem submenu = m.addItem("Item 1", getIcon(), null); + MenuItem subsubmenu = submenu.addItem("Bold item", null); + subsubmenu.addItem("Italic item", getIcon(), null); + submenu.addItem( + "Big disabled item", + null).setEnabled(false); + + m.addItem("Big item", null); + + addTestComponent(m); + } + + private Resource getIcon() { + return new ThemeResource("../runo/icons/16/user.png"); + } + + @Override + protected List createActions() { + return Arrays.asList(createSwitchHtmlAction()); + } + + private Component createSwitchHtmlAction() { + return createBooleanAction("Html content allowed", false, + new Command() { + 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 @@ - + -- cgit v1.2.3
New Test
HtmlOptionGroupItems
open