summaryrefslogtreecommitdiffstats
path: root/server/src/test
diff options
context:
space:
mode:
authorLeif Åstrand <legioth@gmail.com>2018-01-08 12:58:08 +0200
committerTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2018-01-08 12:58:08 +0200
commitaa3a703437e623134c16e81e8f2adef3ea411684 (patch)
tree7c0fe09ae51de190527bf1784151365a1a950000 /server/src/test
parent580d60744473b2d01547b1daa4049603c7f05561 (diff)
downloadvaadin-framework-aa3a703437e623134c16e81e8f2adef3ea411684.tar.gz
vaadin-framework-aa3a703437e623134c16e81e8f2adef3ea411684.zip
Rename contentMode to descriptionContentMode in MenuItem (#10494)
Diffstat (limited to 'server/src/test')
-rw-r--r--server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java10
1 files changed, 5 insertions, 5 deletions
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<MenuBar> {
String design = "<vaadin-menu-bar plain-text>"
+ "<menu description=\"This description is implicitly preformatted\">One</menu>"
+ "<menu description=\"This description\nis explicitly\n\npreformatted\">preformatted</menu>"
- + "<menu contentmode=\"HTML\" description=\"<b>I</b> contain <br/> <e>html</e>\">HTML</menu>"
- + "<menu contentmode=\"TEXT\" description=\"Just plain text\">plain text</menu>"
+ + "<menu descriptioncontentmode=\"HTML\" description=\"<b>I</b> contain <br/> <e>html</e>\">HTML</menu>"
+ + "<menu descriptioncontentmode=\"TEXT\" description=\"Just plain text\">plain text</menu>"
+ "</vaadin-menu-bar>";
MenuBar menuBar = new MenuBar();
menuBar.addItem("One", null).setDescription("This description is implicitly preformatted");
@@ -192,8 +192,8 @@ public class MenuBarDeclarativeTest extends DeclarativeTestBase<MenuBar> {
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());