diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/embind/embind.test.js | 20 | ||||
-rw-r--r-- | tests/embind/embind_test.cpp | 10 |
2 files changed, 25 insertions, 5 deletions
diff --git a/tests/embind/embind.test.js b/tests/embind/embind.test.js index 07f093ea..872ee398 100755 --- a/tests/embind/embind.test.js +++ b/tests/embind/embind.test.js @@ -389,11 +389,21 @@ module({ }); BaseFixture.extend("string", function() { - var expected = ''; - for (var i = 0; i < 128; ++i) { - expected += String.fromCharCode(128 + i); - } - assert.equal(expected, cm.get_non_ascii_string()); + test("non-ascii strings", function() { + var expected = ''; + for (var i = 0; i < 128; ++i) { + expected += String.fromCharCode(128 + i); + } + assert.equal(expected, cm.get_non_ascii_string()); + }); + + test("non-ascii wstrings", function() { + var expected = String.fromCharCode(10) + + String.fromCharCode(1234) + + String.fromCharCode(2345) + + String.fromCharCode(65535); + assert.equal(expected, cm.get_non_ascii_wstring()); + }); }); BaseFixture.extend("embind", function() { diff --git a/tests/embind/embind_test.cpp b/tests/embind/embind_test.cpp index 6a3d5dba..f274fbf5 100644 --- a/tests/embind/embind_test.cpp +++ b/tests/embind/embind_test.cpp @@ -88,6 +88,15 @@ std::string get_non_ascii_string() { return c;
}
+std::wstring get_non_ascii_wstring() {
+ std::wstring ws(4, 0);
+ ws[0] = 10;
+ ws[1] = 1234;
+ ws[2] = 2345;
+ ws[3] = 65535;
+ return ws;
+}
+
std::string emval_test_take_and_return_const_char_star(const char* str) {
return str;
}
@@ -1503,6 +1512,7 @@ EMSCRIPTEN_BINDINGS(tests) { function("emval_test_sum", &emval_test_sum);
function("get_non_ascii_string", &get_non_ascii_string);
+ function("get_non_ascii_wstring", &get_non_ascii_wstring);
//function("emval_test_take_and_return_const_char_star", &emval_test_take_and_return_const_char_star);
function("emval_test_take_and_return_std_string", &emval_test_take_and_return_std_string);
function("emval_test_take_and_return_std_string_const_ref", &emval_test_take_and_return_std_string_const_ref);
|