diff options
| author | Leif Åstrand <leif@vaadin.com> | 2015-03-14 15:45:22 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-04-27 13:18:22 +0300 |
| commit | f8404b9be9d8f599ae62d0be22aab3e25142796f (patch) | |
| tree | 9225b42dceed06b5d4ca601bfe2d5b3063ba4f3b /uitest/src/com/vaadin/tests/widgetset | |
| parent | b5cf10682069780d0cbc05f102c2cf575b5c91cd (diff) | |
| download | vaadin-framework-f8404b9be9d8f599ae62d0be22aab3e25142796f.tar.gz vaadin-framework-f8404b9be9d8f599ae62d0be22aab3e25142796f.zip | |
Remove broken custom String[] serialization (#17146)
Change-Id: If40b6c4e979e4258a22a7d2d1af0532d3e8f11bc
Diffstat (limited to 'uitest/src/com/vaadin/tests/widgetset')
3 files changed, 8 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java index 07acd3d021..d055bf05e3 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java @@ -71,10 +71,11 @@ public class SerializerTestConnector extends AbstractExtensionConnector { } @Override - public void sendString(String value) { + public void sendString(String value, String[] array) { char[] chars = value.toCharArray(); Arrays.sort(chars); - rpc.sendString(new String(chars)); + rpc.sendString(new String(chars), new String[] { array[1], + array[0] }); } @Override @@ -339,6 +340,9 @@ public class SerializerTestConnector extends AbstractExtensionConnector { rpc.log("state.doubleObjectValue: " + getState().doubleObjectValue); rpc.log("state.doubleArray: " + Arrays.toString(getState().doubleArray)); + rpc.log("state.string: " + getState().string); + rpc.log("state.stringArray: " + Arrays.toString(getState().stringArray)); + rpc.log("state.jsonNull: " + getState().jsonNull.getType().name()); rpc.log("state.jsonString: " + ((JsonString) getState().jsonString).getString()); diff --git a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java index 4baebc819e..758a778564 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java @@ -45,7 +45,7 @@ public interface SerializerTestRpc extends ServerRpc, ClientRpc { public void sendDouble(double value, Double boxedValue, double[] array); - public void sendString(String value); + public void sendString(String value, String[] array); public void sendConnector(Connector connector); diff --git a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestState.java b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestState.java index 31ff58971f..982e567c20 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestState.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestState.java @@ -58,6 +58,7 @@ public class SerializerTestState extends AbstractComponentState { public double[] doubleArray; public String string; + public String[] stringArray; public String nullString; |