WICKET-4611 Use UTF-8 charset for the binary test.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/760bf2a8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/760bf2a8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/760bf2a8 Branch: refs/heads/master Commit: 760bf2a8f8e147d21a98cb20f810c2d92091644f Parents: 3a8760b Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Jun 20 13:57:54 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Jun 20 13:57:54 2012 +0300 ---------------------------------------------------------------------- .../ws/util/tester/WebSocketTesterTest.java | 23 ++++++++++---- 1 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/760bf2a8/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java index 723b0f5..08af87e 100644 --- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java +++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.protocol.ws.util.tester; +import java.io.UnsupportedEncodingException; + import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.tester.WicketTester; import org.junit.After; @@ -75,9 +77,9 @@ public class WebSocketTesterTest extends Assert * pushes back the same message but capitalized, offset plus 1 and length minus 1. */ @Test - public void sendBinaryMessage() + public void sendBinaryMessage() throws UnsupportedEncodingException { - final byte[] expectedMessage = "some message".getBytes(); + final byte[] expectedMessage = "some message".getBytes("UTF-8"); final int offset = 1; final int length = 2; @@ -88,12 +90,19 @@ public class WebSocketTesterTest extends Assert @Override protected void onOutMessage(byte[] message, int off, int len) { - String msg = new String(expectedMessage); - byte[] pushedMessage = Strings.capitalize(msg).getBytes(); + try + { + String msg = new String(expectedMessage); + byte[] pushedMessage = Strings.capitalize(msg).getBytes("UTF-8"); + + assertArrayEquals(pushedMessage, message); + assertEquals(offset + 1, off); + assertEquals(length - 1, len); - assertArrayEquals(pushedMessage, message); - assertEquals(offset + 1, off); - assertEquals(length - 1, len); + } catch (UnsupportedEncodingException uex) + { + throw new RuntimeException(uex); + } } };
