tests for val::as on strings and val too

2 files changed, 26 insertions, 8 deletions

diff --git a/tests/embind/embind.test.js b/tests/embind/embind.test.js
index 67171822..033b47b5 100644
--- a/tests/embind/embind.test.js
+++ b/tests/embind/embind.test.js
@@ -1939,14 +1939,26 @@ module({
         // Let the memory leak test superfixture check that no leaks occurred.
     });
 
-    test("val::as supports variety of types", function() {
-        assert.equal(true,  cm.val_as_bool(true));
-        assert.equal(127,   cm.val_as_char(127));
-        assert.equal(32767, cm.val_as_short(32767));
-        assert.equal(65536, cm.val_as_int(65536));
-        assert.equal(65536, cm.val_as_long(65536));
-        assert.equal(10.5,  cm.val_as_float(10.5));
-        assert.equal(10.5,  cm.val_as_double(10.5));
+    BaseFixture.extend("val::as built-in types", function() {
+        test("primitives", function() {
+            assert.equal(true,  cm.val_as_bool(true));
+            assert.equal(127,   cm.val_as_char(127));
+            assert.equal(32767, cm.val_as_short(32767));
+            assert.equal(65536, cm.val_as_int(65536));
+            assert.equal(65536, cm.val_as_long(65536));
+            assert.equal(10.5,  cm.val_as_float(10.5));
+            assert.equal(10.5,  cm.val_as_double(10.5));
+
+            assert.equal("foo", cm.val_as_string("foo"));
+            assert.equal("foo", cm.val_as_wstring("foo"));
+
+            var obj = {};
+            assert.equal(obj, cm.val_as_val(obj));
+
+            // JS->C++ memory view not implemented
+            //var ab = cm.val_as_memory_view(new ArrayBuffer(13));
+            //assert.equal(13, ab.byteLength);
+        });
     });
 });
 
diff --git a/tests/embind/embind_test.cpp b/tests/embind/embind_test.cpp
index af8b2e8d..6aa543ef 100644
--- a/tests/embind/embind_test.cpp
+++ b/tests/embind/embind_test.cpp
@@ -2316,6 +2316,12 @@ EMSCRIPTEN_BINDINGS(val_as) {
     function("val_as_short",  &val_as<short>);
     function("val_as_int",    &val_as<int>);
     function("val_as_long",   &val_as<long>);
+
     function("val_as_float",  &val_as<float>);
     function("val_as_double", &val_as<double>);
+
+    function("val_as_string", &val_as<std::string>);
+    function("val_as_wstring", &val_as<std::wstring>);
+    function("val_as_val", &val_as<val>);
+    //function("val_as_memory_view", &val_as<memory_view>);
 }