diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-30 09:30:04 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-30 15:24:31 +0300 |
| commit | 040f6d99950e3cba9eace07a4ca9de2e8d61efd4 (patch) | |
| tree | 1d5a68fe3eb40902b275fbd2585b1ef855429b7e /tests | |
| parent | d028bf97a4ce9629b8ebab06978218fc9fa4ca71 (diff) | |
| download | vaadin-framework-040f6d99950e3cba9eace07a4ca9de2e8d61efd4.tar.gz vaadin-framework-040f6d99950e3cba9eace07a4ca9de2e8d61efd4.zip | |
Moved server test to correct folder
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/server-side/com/vaadin/server/JSONSerializerTest.java (renamed from tests/client-side/com/vaadin/server/JSONSerializerTest.java) | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/client-side/com/vaadin/server/JSONSerializerTest.java b/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 { |