Change Notification default to no allow HTML (#9066)

5 files changed, 16 insertions, 9 deletions

diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java b/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java
index 694c5b54f9..88c6f7fc45 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java
+++ b/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java
@@ -64,7 +64,7 @@ public class BooleanFieldExample extends TestBase {
             public void buttonClick(ClickEvent event) {
                 form.commit();
                 Notification.show("The custom boolean field value is "
-                        + data.isCustom() + ".<br>"
+                        + data.isCustom() + ".\n"
                         + "The checkbox (default boolean field) value is "
                         + data.isNormal() + ".");
             }
diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java
index 5a158c8f03..b0c597004e 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java
+++ b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java
@@ -53,6 +53,7 @@ public class Notifications extends TestBase implements ClickListener {
     public void buttonClick(ClickEvent event) {
         Notification n = new Notification(tf.getValue(),
                 (Integer) type.getValue());
+        n.setHtmlContentAllowed(true);
         n.show(Page.getCurrent());
     }
 }
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
index 98f31cd68c..3b77de8b86 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
+++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
@@ -3,6 +3,7 @@ package com.vaadin.tests.components.richtextarea;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ShortcutAction;
+import com.vaadin.terminal.Page;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Component;
@@ -31,7 +32,9 @@ public class RichTextAreaWithKeyboardShortcuts extends TestBase {
             String string = f.getValue().toString();
 
             msg += " Value: " + string;
-            Notification.show(msg);
+            Notification notification = new Notification(msg);
+            notification.setHtmlContentAllowed(true);
+            notification.show(Page.getCurrent());
 
         }
 
diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
index 9397206f1e..78b8f812b9 100644
--- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
@@ -596,8 +596,10 @@ public class LiferayThemeDemo extends Application.LegacyApplication {
         Button show = new Button("Humanized Notification",
                 new Button.ClickListener() {
                     public void buttonClick(ClickEvent event) {
-                        new Notification(title.getValue(), message.getValue())
-                                .show(Page.getCurrent());
+                        Notification notification = new Notification(
+                                title.getValue(), message.getValue());
+                        notification.setHtmlContentAllowed(true);
+                        notification.show(Page.getCurrent());
                     }
                 });
         l.addComponent(show);
@@ -606,7 +608,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication {
         show = new Button("Warning Notification", new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
                 new Notification(title.getValue(), message.getValue(),
-                        Notification.TYPE_WARNING_MESSAGE).show(Page
+                        Notification.TYPE_WARNING_MESSAGE, true).show(Page
                         .getCurrent());
 
             }
@@ -617,7 +619,8 @@ public class LiferayThemeDemo extends Application.LegacyApplication {
         show = new Button("Error Notification", new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
                 new Notification(title.getValue(), message.getValue(),
-                        Notification.TYPE_ERROR_MESSAGE).show(Page.getCurrent());
+                        Notification.TYPE_ERROR_MESSAGE, true).show(Page
+                        .getCurrent());
 
             }
         });
@@ -627,7 +630,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication {
         show = new Button("Tray Notification", new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
                 new Notification(title.getValue(), message.getValue(),
-                        Notification.TYPE_TRAY_NOTIFICATION).show(Page
+                        Notification.TYPE_TRAY_NOTIFICATION, true).show(Page
                         .getCurrent());
 
             }
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index dd32242062..66185ef6a6 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
+++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
@@ -41,8 +41,8 @@ public class IntegerTextFieldDataSource extends AbstractTestRoot {
                 int dataModelValue = myBean.getValue();
 
                 Notification.show("UI value (String): " + uiValue
-                        + "<br />Property value (Integer): " + propertyValue
-                        + "<br />Data model value (int): " + dataModelValue);
+                        + "\nProperty value (Integer): " + propertyValue
+                        + "\nData model value (int): " + dataModelValue);
             }
         });