Always use charset for String.getBytes() method (#18863).

Change-Id: I15ce5a7922aebffc1a05ac55663033f7e5134d0c

diff --git a/server/src/com/vaadin/ui/declarative/Design.java b/server/src/com/vaadin/ui/declarative/Design.java
index a3589de5e2d513b87b4fbe50a9bdcc1549e2ce96..63a263842360f5fb58d25c4f94cbbbb5e49c745b 100644 (file)
--- a/server/src/com/vaadin/ui/declarative/Design.java
+++ b/server/src/com/vaadin/ui/declarative/Design.java
@@ -59,6 +59,8 @@ import com.vaadin.ui.declarative.DesignContext.ComponentCreationListener;
  */
 public class Design implements Serializable {
 
+    private static final String UTF8 = "UTF-8";
+
     /**
      * Callback for creating instances of a given component class when reading
      * designs. The default implementation, {@link DefaultComponentFactory} will
@@ -350,7 +352,7 @@ public class Design implements Serializable {
      */
     private static Document parse(InputStream html) {
         try {
-            Document doc = Jsoup.parse(html, "UTF-8", "", Parser.htmlParser());
+            Document doc = Jsoup.parse(html, UTF8, "", Parser.htmlParser());
             return doc;
         } catch (IOException e) {
             throw new DesignException("The html document cannot be parsed.");
@@ -769,7 +771,8 @@ public class Design implements Serializable {
         doc.outputSettings().indentAmount(4);
         doc.outputSettings().syntax(Syntax.html);
         doc.outputSettings().prettyPrint(true);
-        outputStream.write(doc.html().getBytes());
+        doc.outputSettings();
+        outputStream.write(doc.html().getBytes(UTF8));
     }
 
 }

diff --git a/server/tests/src/com/vaadin/ui/declarative/DesignTest.java b/server/tests/src/com/vaadin/ui/declarative/DesignTest.java
new file mode 100644 (file)
index 0000000..556adb3
--- /dev/null
+++ b/server/tests/src/com/vaadin/ui/declarative/DesignTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.ui.declarative;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+
+/**
+ * Tests for {@link Design} declarative support class.
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class DesignTest {
+
+    private static Charset CP1251_CHARSET = Charset.forName("cp1251");
+    private static Charset UTF8_CHARSET = Charset.forName("UTF-8");
+
+    private static String NON_ASCII_STRING = "\u043C";
+
+    private static Charset DEFAULT_CHARSET = Charset.defaultCharset();
+
+    @AfterClass
+    public static void restoreCharset() throws NoSuchFieldException,
+            SecurityException, IllegalArgumentException, IllegalAccessException {
+        setCharset(DEFAULT_CHARSET);
+    }
+
+    @Test
+    public void write_cp1251SystemDefaultEncoding_resultEqualsToUtf8Encoding()
+            throws IOException, NoSuchFieldException, SecurityException,
+            IllegalArgumentException, IllegalAccessException {
+        setCp1251Charset();
+        String cp1251Html = getHtml();
+        setUtf8Charset();
+        String utf8Html = getHtml();
+        Assert.assertEquals("Html written with UTF-8 as default encoding "
+                + "differs from html written with cp1251 encoding", cp1251Html,
+                utf8Html);
+    }
+
+    @Test
+    public void write_cp1251SystemDefaultEncoding_writtenLabelHasCorrectValue()
+            throws IOException, NoSuchFieldException, SecurityException,
+            IllegalArgumentException, IllegalAccessException {
+        setCp1251Charset();
+        String cp1251Html = getHtml();
+        Assert.assertEquals("Non ascii string parsed from serialized HTML "
+                + "differs from expected", NON_ASCII_STRING,
+                getHtmlLabelValue(cp1251Html));
+    }
+
+    @Test
+    public void write_utf8SystemDefaultEncoding_writtenLabelHasCorrectValue()
+            throws IOException, NoSuchFieldException, SecurityException,
+            IllegalArgumentException, IllegalAccessException {
+        setUtf8Charset();
+        String utf8 = getHtml();
+        Assert.assertEquals("Non ascii string parsed from serialized HTML "
+                + "differs from expected", NON_ASCII_STRING,
+                getHtmlLabelValue(utf8));
+    }
+
+    private String getHtmlLabelValue(String html) {
+        Document document = Jsoup.parse(html);
+        Element label = document.select("v-label").get(0);
+
+        StringBuilder builder = new StringBuilder();
+        for (Node child : label.childNodes()) {
+            if (child instanceof TextNode) {
+                builder.append(((TextNode) child).getWholeText());
+            }
+        }
+        return builder.toString().trim();
+    }
+
+    private String getHtml() throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        Component label = new Label(NON_ASCII_STRING);
+        Design.write(label, out);
+        return out.toString(UTF8_CHARSET.name());
+    }
+
+    private void setCp1251Charset() throws NoSuchFieldException,
+            SecurityException, IllegalArgumentException, IllegalAccessException {
+        setCharset(CP1251_CHARSET);
+    }
+
+    private void setUtf8Charset() throws NoSuchFieldException,
+            SecurityException, IllegalArgumentException, IllegalAccessException {
+        setCharset(UTF8_CHARSET);
+    }
+
+    private static void setCharset(Charset charset)
+            throws NoSuchFieldException, SecurityException,
+            IllegalArgumentException, IllegalAccessException {
+        Field field = Charset.class.getDeclaredField("defaultCharset");
+        field.setAccessible(true);
+        field.set(null, charset);
+    }
+
+}