Handle unparsable JSON as invalid content (#11733)

Change-Id: I67ed5e78b93ff0fe20d861105a0aa01ae6ccb2e6

1 files changed, 56 insertions, 0 deletions

diff --git a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java b/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
new file mode 100644
index 0000000000..4b788d06cc
--- /dev/null
+++ b/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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.client.communication;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class ServerMessageHandlerTest {
+
+    @Test
+    public void unwrapValidJson() {
+        String payload = "{'foo': 'bar'}";
+        Assert.assertEquals(
+                payload,
+                ServerMessageHandler.stripJSONWrapping("for(;;);[" + payload
+                        + "]"));
+
+    }
+
+    @Test
+    public void unwrapUnwrappedJson() {
+        String payload = "{'foo': 'bar'}";
+        Assert.assertNull(ServerMessageHandler.stripJSONWrapping(payload));
+
+    }
+
+    @Test
+    public void unwrapNull() {
+        Assert.assertNull(ServerMessageHandler.stripJSONWrapping(null));
+
+    }
+
+    @Test
+    public void unwrapEmpty() {
+        Assert.assertNull(ServerMessageHandler.stripJSONWrapping(""));
+
+    }
+}