diff options
Diffstat (limited to 'server/tests')
4 files changed, 46 insertions, 34 deletions
diff --git a/server/tests/src/com/vaadin/server/JSONSerializerTest.java b/server/tests/src/com/vaadin/server/JSONSerializerTest.java index 8c1967acb3..393cea1c4c 100644 --- a/server/tests/src/com/vaadin/server/JSONSerializerTest.java +++ b/server/tests/src/com/vaadin/server/JSONSerializerTest.java @@ -15,8 +15,8 @@ package com.vaadin.server; * License for the specific language governing permissions and limitations under * the License. */ + import java.lang.reflect.Type; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -24,14 +24,15 @@ import java.util.Map; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import com.vaadin.server.JsonCodec.BeanProperty; import com.vaadin.shared.communication.UidlValue; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState; +import elemental.json.Json; +import elemental.json.JsonArray; +import elemental.json.JsonException; +import elemental.json.JsonValue; + /** * Tests for {@link JsonCodec} * @@ -56,7 +57,7 @@ public class JSONSerializerTest extends TestCase { stringToStateMap.put("string - state 1", s); stringToStateMap.put("String - state 2", s2); - Object encodedMap = JsonCodec.encode(stringToStateMap, null, mapType, + JsonValue encodedMap = JsonCodec.encode(stringToStateMap, null, mapType, null).getEncodedValue(); ensureDecodedCorrectly(stringToStateMap, encodedMap, mapType); @@ -73,15 +74,16 @@ public class JSONSerializerTest extends TestCase { stateToStringMap.put(s, "string - state 1"); stateToStringMap.put(s2, "String - state 2"); - Object encodedMap = JsonCodec.encode(stateToStringMap, null, mapType, + JsonValue encodedMap = JsonCodec.encode(stateToStringMap, null, mapType, null).getEncodedValue(); ensureDecodedCorrectly(stateToStringMap, encodedMap, mapType); } - public void testNullLegacyValue() throws JSONException { - JSONArray inputArray = new JSONArray( - Arrays.asList("n", JSONObject.NULL)); + public void testNullLegacyValue() throws JsonException { + JsonArray inputArray = Json.createArray(); + inputArray.set(0, "n"); + inputArray.set(1, Json.createNull()); UidlValue decodedObject = (UidlValue) JsonCodec.decodeInternalType( UidlValue.class, true, inputArray, null); assertNull(decodedObject.getValue()); @@ -89,17 +91,19 @@ public class JSONSerializerTest extends TestCase { public void testNullTypeOtherValue() { try { - JSONArray inputArray = new JSONArray(Arrays.asList("n", "a")); + JsonArray inputArray = Json.createArray(); + inputArray.set(0, "n"); + inputArray.set(1, "a"); UidlValue decodedObject = (UidlValue) JsonCodec.decodeInternalType( UidlValue.class, true, inputArray, null); - throw new AssertionFailedError("No JSONException thrown"); - } catch (JSONException e) { + throw new AssertionFailedError("No JsonException thrown"); + } catch (JsonException e) { // Should throw exception } } - private void ensureDecodedCorrectly(Object original, Object encoded, + private void ensureDecodedCorrectly(Object original, JsonValue encoded, Type type) throws Exception { Object serverSideDecoded = JsonCodec.decodeInternalOrCustomType(type, encoded, null); diff --git a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java b/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java index 30f1c85fef..214341371a 100644 --- a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java +++ b/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java @@ -22,7 +22,6 @@ import java.util.logging.Logger; import javax.servlet.http.HttpServletRequest; import org.easymock.EasyMock; -import org.json.JSONException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -37,6 +36,7 @@ import com.vaadin.server.communication.ServerRpcHandler.RpcRequest; import com.vaadin.shared.ApplicationConstants; import com.vaadin.tests.util.AlwaysLockedVaadinSession; import com.vaadin.tests.util.MockDeploymentConfiguration; +import elemental.json.JsonException; /** * Test the actual csrf token validation by the server. @@ -141,7 +141,7 @@ public class CsrfTokenMissingTestServer { private RpcRequest createRequest() { try { return new RpcRequest(getPayload(), vaadinRequest); - } catch (JSONException e) { + } catch (JsonException e) { LOGGER.log(Level.SEVERE, "", e); Assert.assertTrue(false); diff --git a/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java b/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java index 41b71a37fa..ad70024af4 100644 --- a/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java +++ b/server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java @@ -21,22 +21,23 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; import java.lang.reflect.Method; -import java.util.Arrays; import junit.framework.TestCase; -import org.json.JSONArray; - import com.vaadin.server.ClientMethodInvocation; import com.vaadin.server.JavaScriptCallbackHelper; import com.vaadin.ui.JavaScript.JavaScriptCallbackRpc; import com.vaadin.util.ReflectTools; +import elemental.json.Json; +import elemental.json.JsonArray; +import elemental.json.impl.JsonUtil; + public class TestClientMethodSerialization extends TestCase { private static final Method JAVASCRIPT_CALLBACK_METHOD = ReflectTools .findMethod(JavaScriptCallbackRpc.class, "call", String.class, - JSONArray.class); + JsonArray.class); private static final Method BASIC_PARAMS_CALL_METHOD = ReflectTools .findMethod(TestClientMethodSerialization.class, @@ -60,15 +61,17 @@ public class TestClientMethodSerialization extends TestCase { */ public void testClientMethodSerialization_WithJSONArray_ContentStaysSame() throws Exception { - JSONArray originalArray = new JSONArray(Arrays.asList( - "callbackParameter1", "callBackParameter2", "12345")); + JsonArray originalArray = Json.createArray(); + originalArray.set(0, "callbackParameter1"); + originalArray.set(1, "callBackParameter2"); + originalArray.set(2, "12345"); ClientMethodInvocation original = new ClientMethodInvocation(null, "interfaceName", JAVASCRIPT_CALLBACK_METHOD, new Object[] { "callBackMethodName", originalArray }); ClientMethodInvocation copy = (ClientMethodInvocation) serializeAndDeserialize(original); - JSONArray copyArray = (JSONArray) copy.getParameters()[1]; - assertEquals(originalArray.toString(), copyArray.toString()); + JsonArray copyArray = (JsonArray) copy.getParameters()[1]; + assertEquals(JsonUtil.stringify(originalArray), JsonUtil.stringify(copyArray)); } public void testClientMethodSerialization_WithBasicParams_NoChanges() diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java index 5583fc02e8..54d15f15d8 100644 --- a/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java @@ -36,6 +36,9 @@ import com.vaadin.ui.components.grid.Grid; import com.vaadin.ui.components.grid.GridColumn; import com.vaadin.ui.components.grid.renderers.TextRenderer; +import elemental.json.Json; +import elemental.json.JsonValue; + public class RendererTest { private static class TestBean { @@ -48,8 +51,9 @@ public class RendererTest { private static class TestRenderer extends TextRenderer { @Override - public Object encode(String value) { - return "renderer(" + super.encode(value) + ")"; + public JsonValue encode(String value) { + return Json.create("renderer(" + super.encode(value).asString() + + ")"); } } @@ -156,13 +160,13 @@ public class RendererTest { @Test public void testEncoding() throws Exception { - assertEquals("42", render(foo, 42)); + assertEquals("42", render(foo, 42).asString()); foo.setRenderer(renderer()); - assertEquals("renderer(42)", render(foo, 42)); + assertEquals("renderer(42)", render(foo, 42).asString()); - assertEquals("2.72", render(bar, "2.72")); + assertEquals("2.72", render(bar, "2.72").asString()); bar.setRenderer(new TestRenderer()); - assertEquals("renderer(2.72)", render(bar, "2.72")); + assertEquals("renderer(2.72)", render(bar, "2.72").asString()); } @Test(expected = ConversionException.class) @@ -175,12 +179,13 @@ public class RendererTest { baz.setRenderer(renderer(), converter()); bah.setRenderer(renderer(), converter()); - assertEquals("renderer(TestBean(42))", render(baz, new TestBean())); + assertEquals("renderer(TestBean(42))", render(baz, new TestBean()) + .asString()); assertEquals("renderer(ExtendedBean(42, 3.14))", - render(baz, new ExtendedBean())); + render(baz, new ExtendedBean()).asString()); assertEquals("renderer(ExtendedBean(42, 3.14))", - render(bah, new ExtendedBean())); + render(bah, new ExtendedBean()).asString()); } private TestConverter converter() { @@ -191,7 +196,7 @@ public class RendererTest { return new TestRenderer(); } - private Object render(GridColumn column, Object value) { + private JsonValue render(GridColumn column, Object value) { return RpcDataProviderExtension.encodeValue(value, column.getRenderer(), column.getConverter(), grid.getLocale()); } |