Repository: incubator-edgent Updated Branches: refs/heads/master c9d149f80 -> 77d7f55db
[Edgent-332] WebSocketClientGlobalTest failures on MSWin Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/d5fa5392 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/d5fa5392 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/d5fa5392 Branch: refs/heads/master Commit: d5fa539204b7c8b20ff1476433fb14a8b250993b Parents: cc405cc Author: Dale LaBossiere <[email protected]> Authored: Thu Dec 29 14:39:38 2016 -0500 Committer: Dale LaBossiere <[email protected]> Committed: Thu Dec 29 14:39:38 2016 -0500 ---------------------------------------------------------------------- .../wsclient/javax/websocket/WebSocketClientTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d5fa5392/connectors/wsclient-javax.websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java ---------------------------------------------------------------------- diff --git a/connectors/wsclient-javax.websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java b/connectors/wsclient-javax.websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java index f095be6..0a85cfb 100644 --- a/connectors/wsclient-javax.websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java +++ b/connectors/wsclient-javax.websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java @@ -25,6 +25,7 @@ import static org.junit.Assume.assumeTrue; import java.net.InetSocketAddress; import java.net.Socket; import java.net.URI; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -301,12 +302,12 @@ public class WebSocketClientTest extends ConnectorTestBase { String[] expected = new String[] { getStr1(), getStr2() }; TStream<byte[]> s = t.strings(expected) - .map(tup -> tup.getBytes()); + .map(tup -> tup.getBytes(StandardCharsets.UTF_8)); s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS); wsClient.sendBytes(s); TStream<String> rcvd = wsClient.receiveBytes() - .map(tup -> new String(tup)); + .map(tup -> new String(tup, StandardCharsets.UTF_8)); completeAndValidate("", t, rcvd, SEC_TMO, expected); } @@ -375,7 +376,7 @@ public class WebSocketClientTest extends ConnectorTestBase { String[] expected = new String[] { getStr1(), getStr2(), getStr3(), getStr4() }; - TStream<byte[]> s = t.strings(expected).map(tup -> tup.getBytes()); + TStream<byte[]> s = t.strings(expected).map(tup -> tup.getBytes(StandardCharsets.UTF_8)); s = PlumbingStreams.blockingOneShotDelay(s, 2, TimeUnit.SECONDS); // send one, two, restart the server to force reconnect, send the next @@ -396,7 +397,7 @@ public class WebSocketClientTest extends ConnectorTestBase { TStream<String> rcvd = wsClient.receiveBytes() .peek(tuple -> latch.countDown()) - .map(tup -> new String(tup)); + .map(tup -> new String(tup, StandardCharsets.UTF_8)); completeAndValidate("", t, rcvd, SEC_TMO + 10, expected); }
