Merge pull request scala-js#1545 from gzm0/fix-nodejs-high-char

sjrd · sjrd · commit 285327a9f576 · 2015-03-16T10:11:37.000+01:00
Fix scala-js#1536: NodeJSEnv is unable to send characters larger than 0x7FFF
diff --git a/js-envs/src/main/scala/org/scalajs/jsenv/nodejs/NodeJSEnv.scala b/js-envs/src/main/scala/org/scalajs/jsenv/nodejs/NodeJSEnv.scala
@@ -169,7 +169,7 @@ class NodeJSEnv private (
             var buf = new Buffer(4 + len * 2);
             buf.writeInt32BE(len, 0);
             for (var i = 0; i < len; ++i)
-              buf.writeInt16BE(msg.charCodeAt(i), 4 + i * 2);
+              buf.writeUInt16BE(msg.charCodeAt(i), 4 + i * 2);
             socket.write(buf);
           },
           close: function() {
diff --git a/js-envs/src/test/scala/org/scalajs/jsenv/test/ComTests.scala b/js-envs/src/test/scala/org/scalajs/jsenv/test/ComTests.scala
@@ -177,6 +177,23 @@ trait ComTests extends AsyncTests {
     com.await(DefaultTimeout)
   }
 
+  @Test
+  def highCharTest = { // #1536
+    val com = comRunner("""
+      scalajsCom.init(scalajsCom.send);
+    """)
+
+    com.start()
+
+    val msg = "\uC421\u8F10\u0112\uFF32"
+
+    com.send(msg)
+    assertEquals(msg, com.receive())
+
+    com.close()
+    com.await(DefaultTimeout)
+  }
+
   @Test
   def noInitTest = {
     val com = comRunner("")
