Merge lp:~unity-team/v8-cpp/lp-1504309 into lp:v8-cpp

[Marcus Tomlinson]

Fixed bug #1504309 and updated the appropriate tests

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'src/internal/class.h'
--- src/internal/class.h	2015-10-07 14:14:31 +0000
+++ src/internal/class.h	2015-10-09 10:46:13 +0000
@@ -170,6 +170,12 @@
     {
         v8::HandleScope scope(isolate_);
 
+        if (value->IsNull())
+        {
+            static T nullsptr(nullptr);
+            return &nullsptr;
+        }
+
         while (value->IsObject())
         {
             v8::Local<v8::Object> object = value->ToObject();
@@ -184,7 +190,7 @@
             }
             value = object->GetPrototype();
         }
-        return nullptr;
+        throw std::invalid_argument("expected an exported object");
     }
 
     template <typename O>
@@ -192,6 +198,11 @@
     {
         v8::HandleScope scope(isolate_);
 
+        if (value->IsNull())
+        {
+            return nullptr;
+        }
+
         while (value->IsObject())
         {
             v8::Local<v8::Object> object = value->ToObject();
@@ -206,7 +217,7 @@
             }
             value = object->GetPrototype();
         }
-        return nullptr;
+        throw std::invalid_argument("expected an exported object");
     }
 
     template <typename P>

=== modified file 'src/internal/convert.h'
--- src/internal/convert.h	2015-10-07 14:14:31 +0000
+++ src/internal/convert.h	2015-10-09 10:46:13 +0000
@@ -405,7 +405,7 @@
 
     static bool is_valid(v8::Isolate*, v8::Local<v8::Value> value)
     {
-        return !value.IsEmpty() && value->IsObject();
+        return !value.IsEmpty() && (value->IsObject() || value->IsNull());
     }
 
     static FromType from_v8(v8::Isolate* isolate, v8::Local<v8::Value> value)
@@ -445,7 +445,7 @@
 
     static bool is_valid(v8::Isolate*, v8::Local<v8::Value> value)
     {
-        return !value.IsEmpty() && value->IsObject();
+        return !value.IsEmpty() && (value->IsObject() || value->IsNull());
     }
 
     static FromType from_v8(v8::Isolate* isolate, v8::Local<v8::Value> value)

=== modified file 'tests/errors/module.cpp'
--- tests/errors/module.cpp	2015-08-05 18:57:44 +0000
+++ tests/errors/module.cpp	2015-10-09 10:46:13 +0000
@@ -32,6 +32,8 @@
     testclass
             .set_constructor<int, int>()
             .add_method("i", &TestClass::i)
+            .add_method("expect_sptr", &TestClass::expect_sptr)
+            .add_method("expect_obj", &TestClass::expect_obj)
             .add_method("throw_ex", &TestClass::throw_ex);
 
     // Prepare module

=== modified file 'tests/errors/test.cpp'
--- tests/errors/test.cpp	2015-07-16 14:25:39 +0000
+++ tests/errors/test.cpp	2015-10-09 10:46:13 +0000
@@ -117,6 +117,34 @@
     {
         EXPECT_STREQ(e.what(), "Uncaught Error: argument count does not match the corresponding C++ function definition");
     }
+
+    try
+    {
+        v8cpp::run_script(
+        R"(
+            var module = require("./test-errors-module");
+            var test_object = new module.TestClass(1, 2);
+            test_object.expect_sptr(function x(){});
+        )");
+    }
+    catch (std::exception const& e)
+    {
+        EXPECT_STREQ(e.what(), "Uncaught Error: expected an exported object");
+    }
+
+    try
+    {
+        v8cpp::run_script(
+        R"(
+            var module = require("./test-errors-module");
+            var test_object = new module.TestClass(1, 2);
+            test_object.expect_obj(null);
+        )");
+    }
+    catch (std::exception const& e)
+    {
+        EXPECT_STREQ(e.what(), "Uncaught Error: expected an exported object");
+    }
 }
 
 TEST(Test, conversion_errors)

=== modified file 'tests/errors/test.h'
--- tests/errors/test.h	2015-07-08 06:20:26 +0000
+++ tests/errors/test.h	2015-10-09 10:46:13 +0000
@@ -20,6 +20,8 @@
 
 #include <gtest/gtest.h>
 
+#include <memory>
+
 class TestClass
 {
 public:
@@ -33,6 +35,16 @@
         return i_;
     }
 
+    int expect_sptr(std::shared_ptr<TestClass> x) const
+    {
+        return 1;
+    }
+
+    int expect_obj(TestClass x) const
+    {
+        return 1;
+    }
+
     void throw_ex()
     {
         throw std::runtime_error("BOOM!");

=== modified file 'tests/objects/module.cpp'
--- tests/objects/module.cpp	2015-09-01 09:33:34 +0000
+++ tests/objects/module.cpp	2015-10-09 10:46:13 +0000
@@ -37,8 +37,9 @@
             .add_method("embedded_class_ptr", &TestClass::embedded_class_ptr)
             .add_method("embedded_class_ref", &TestClass::embedded_class_ref)
             .add_method("embedded_class_copy", &TestClass::embedded_class_copy)
-            .add_method("replace_i", &TestClass::replace_i)
-            .add_method("add_i", &TestClass::add_i);
+            .add_method("remove_ptr", &TestClass::remove_ptr)
+            .add_method("remove_sptr", &TestClass::remove_sptr)
+            .add_method("add_ref", &TestClass::add_ref);
 
     // Prepare EmbeddedTestClass binding
     v8cpp::Class<EmbeddedTestClass> embeddedtestclass(isolate);

=== modified file 'tests/objects/test.cpp'
--- tests/objects/test.cpp	2015-09-01 09:33:34 +0000
+++ tests/objects/test.cpp	2015-10-09 10:46:13 +0000
@@ -99,55 +99,55 @@
         var test_object = module.new_TestClass(1, 2);
         var test_object2 = module.new_TestClass(1, 2);
 
-        test_object.replace_i(test_object2.embedded_class_copy());
-        test_object;
-    )");
+        test_object.remove_ptr(test_object2.embedded_class_copy());
+        test_object;
+    )");
+
+    EXPECT_EQ(test_object.i(), 4);
+
+    test_object = v8cpp::run_script<TestClass>(
+    R"(
+        var module = require("./test-objects-module");
+        var test_object = module.new_TestClass(1, 2);
+        var test_object2 = module.new_TestClass(1, 2);
+
+        test_object.remove_ptr(null);
+        test_object;
+    )");
+
+    EXPECT_EQ(test_object.i(), 3);
+
+    test_object = v8cpp::run_script<TestClass>(
+    R"(
+        var module = require("./test-objects-module");
+        var test_object = module.new_TestClass(1, 2);
+        var test_object2 = module.new_TestClass(1, 2);
+
+        test_object.remove_sptr(null);
+        test_object;
+    )");
+
+    EXPECT_EQ(test_object.i(), 3);
 
     auto result = v8cpp::run_script<int>(
     R"(
         var module = require("./test-objects-module");
         var test_object = module.new_TestClass(1, 2);
-
-        var embedded_object = test_object.embedded_class_uptr();
-        embedded_object.i();
-    )");
-
-    EXPECT_EQ(result, -1);
-
-    auto result2 = v8cpp::run_script<int>(
-    R"(
-        var module = require("./test-objects-module");
-        var test_object = module.new_TestClass(1, 2);
-
-        var embedded_object = test_object.embedded_class_sptr();
-        embedded_object.i();
-    )");
-
-    EXPECT_EQ(result2, -1);
-
-    EXPECT_EQ(test_object.i(), -1);
-
-    auto result3 = v8cpp::run_script<int>(
-    R"(
-        var module = require("./test-objects-module");
-        var test_object = module.new_TestClass(1, 2);
-        var test_object2 = module.new_TestClass(1, 2);
-
-        test_object.add_i(test_object.embedded_class_ptr(),
-                          test_object2.embedded_class_ref());
-    )");
-
-    EXPECT_EQ(result3, -2);
-
-    auto result4 = v8cpp::run_script<int>(
-    R"(
-        var module = require("./test-objects-module");
-        var test_object = module.new_TestClass(1, 2);
-        var test_object2 = module.new_TestClass(1, 2);
-
-        test_object.add_i(test_object.embedded_class_sptr(),
-                          test_object2.embedded_class_uptr());
-    )");
-
-    EXPECT_EQ(result4, -2);
+        var test_object2 = module.new_TestClass(1, 2);
+
+        test_object.add_ref(test_object2.embedded_class_ref());
+    )");
+
+    EXPECT_EQ(result, 2);
+
+    result = v8cpp::run_script<int>(
+    R"(
+        var module = require("./test-objects-module");
+        var test_object = module.new_TestClass(1, 2);
+        var test_object2 = module.new_TestClass(1, 2);
+
+        test_object.add_ref(test_object2.embedded_class_uptr());
+    )");
+
+    EXPECT_EQ(result, 2);
 }

=== modified file 'tests/objects/test.h'
--- tests/objects/test.h	2015-09-01 09:33:34 +0000
+++ tests/objects/test.h	2015-10-09 10:46:13 +0000
@@ -82,14 +82,25 @@
         return *embedded_class_;
     }
 
-    void replace_i(EmbeddedTestClass const& other)
-    {
-        i_ = other.i();
-    }
-
-    int add_i(EmbeddedTestClass const& other, EmbeddedTestClass const& other2)
-    {
-        return other.i() + other2.i();
+    void remove_ptr(EmbeddedTestClass* other)
+    {
+        if (other)
+        {
+            i_ -= other->i();
+        }
+    }
+
+    void remove_sptr(std::shared_ptr<EmbeddedTestClass> const& other)
+    {
+        if (other)
+        {
+            i_ -= other->i();
+        }
+    }
+
+    int add_ref(EmbeddedTestClass const& other)
+    {
+        return i_ += other.i();
     }
 
 private: