From aa3a703437e623134c16e81e8f2adef3ea411684 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Mon, 8 Jan 2018 12:58:08 +0200 Subject: Rename contentMode to descriptionContentMode in MenuItem (#10494) --- .../tests/components/menubar/MenuBarDeclarativeTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server/src/test/java') diff --git a/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java index 68f1fad864..55b1b84c75 100644 --- a/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java @@ -25,10 +25,10 @@ import org.junit.Test; import com.vaadin.server.ExternalResource; import com.vaadin.server.ThemeResource; +import com.vaadin.shared.ui.ContentMode; import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.MenuItem; -import com.vaadin.shared.ui.ContentMode; /** * Tests declarative support for menu bars. @@ -74,8 +74,8 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase { String design = "" + "One" + "preformatted" - + "I contain
html\">HTML
" - + "plain text" + + "I contain
html\">HTML
" + + "plain text" + "
"; MenuBar menuBar = new MenuBar(); menuBar.addItem("One", null).setDescription("This description is implicitly preformatted"); @@ -192,8 +192,8 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase { actual.getDescription()); assertEquals(baseError + "Style Name", expected.getStyleName(), actual.getStyleName()); - assertEquals(baseError + "Content Mode", expected.getContentMode(), - actual.getContentMode()); + assertEquals(baseError + "Content Mode", expected.getDescriptionContentMode(), + actual.getDescriptionContentMode()); if (expected.getIcon() != null) { assertNotNull(baseError + "Icon was null", actual.getIcon()); -- cgit v1.2.3