From 040f6d99950e3cba9eace07a4ca9de2e8d61efd4 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 30 Aug 2012 09:30:04 +0300 Subject: [PATCH] Moved server test to correct folder --- .../com/vaadin/server/JSONSerializerTest.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) rename tests/{client-side => server-side}/com/vaadin/server/JSONSerializerTest.java (90%) diff --git a/tests/client-side/com/vaadin/server/JSONSerializerTest.java b/tests/server-side/com/vaadin/server/JSONSerializerTest.java similarity index 90% rename from tests/client-side/com/vaadin/server/JSONSerializerTest.java rename to tests/server-side/com/vaadin/server/JSONSerializerTest.java index 446506cdef..05139e6f1a 100644 --- a/tests/client-side/com/vaadin/server/JSONSerializerTest.java +++ b/tests/server-side/com/vaadin/server/JSONSerializerTest.java @@ -22,14 +22,11 @@ import java.util.Map; import junit.framework.TestCase; -import com.vaadin.client.communication.JsonDecoder; -import com.vaadin.client.communication.JsonEncoder; -import com.vaadin.server.JsonCodec; import com.vaadin.server.JsonCodec.BeanProperty; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState; /** - * Tests for {@link JsonCodec}, {@link JsonEncoder}, {@link JsonDecoder} + * Tests for {@link JsonCodec} * * @author Vaadin Ltd * @since 7.0 @@ -81,12 +78,6 @@ public class JSONSerializerTest extends TestCase { encoded, null); assertTrue("Server decoded", equals(original, serverSideDecoded)); - // Object clientSideDecoded = JsonDecoder.decodeValue( - // (com.google.gwt.json.client.JSONArray) JSONParser - // .parseStrict(encoded.toString()), null, null, null); - // assertTrue("Client decoded", - // equals(original, clientSideDecoded)); - } private boolean equals(Object o1, Object o2) throws Exception { -- 2.39.5