diff options
| -rw-r--r-- | src/core/common/Variant.hpp | 13 | ||||
| -rw-r--r-- | test/core/common/ArgumentTest.cpp | 16 | ||||
| -rw-r--r-- | test/core/managed/VariantObjectTest.cpp | 6 |
3 files changed, 11 insertions, 24 deletions
diff --git a/src/core/common/Variant.hpp b/src/core/common/Variant.hpp index e5bca4d..7ec3481 100644 --- a/src/core/common/Variant.hpp +++ b/src/core/common/Variant.hpp @@ -379,19 +379,6 @@ public: } /** - * Constructor for storing managed objects. The reference at the managed - * object is stored as a Rooted object. - * - * @param o is a reference to the object. - */ - template <class T> - Variant(Handle<T> o) - : ptrVal(nullptr) - { - setObject(o); - } - - /** * Copy assignment operator. */ Variant &operator=(const Variant &v) diff --git a/test/core/common/ArgumentTest.cpp b/test/core/common/ArgumentTest.cpp index 85f99a1..e580986 100644 --- a/test/core/common/ArgumentTest.cpp +++ b/test/core/common/ArgumentTest.cpp @@ -374,7 +374,7 @@ TEST(Argument, validateObject) { Rooted<Managed> m{new Managed(mgr)}; - Variant v(m); + Variant v = Variant::fromObject(m); ASSERT_FALSE(a.validate(v, logger)); ASSERT_TRUE(v.isObject()); @@ -383,7 +383,7 @@ TEST(Argument, validateObject) { Rooted<TestManaged1> m{new TestManaged1(mgr)}; - Variant v(m); + Variant v = Variant::fromObject(m); ASSERT_TRUE(a.validate(v, logger)); ASSERT_TRUE(v.isObject()); @@ -392,7 +392,7 @@ TEST(Argument, validateObject) { Rooted<TestManaged2> m{new TestManaged2(mgr)}; - Variant v(m); + Variant v = Variant::fromObject(m); ASSERT_TRUE(a.validate(v, logger)); ASSERT_TRUE(v.isObject()); @@ -401,7 +401,7 @@ TEST(Argument, validateObject) { Rooted<TestManaged1> m1{nullptr}; - Variant v(m1); + Variant v = Variant::fromObject(m1); ASSERT_FALSE(a.validate(v, logger)); ASSERT_TRUE(v.isObject()); @@ -428,7 +428,7 @@ TEST(Argument, validateObjectDefault) { Rooted<Managed> m{new Managed(mgr)}; - Variant v(m); + Variant v = Variant::fromObject(m); ASSERT_FALSE(a.validate(v, logger)); ASSERT_TRUE(v.isObject()); @@ -437,7 +437,7 @@ TEST(Argument, validateObjectDefault) { Rooted<TestManaged1> m{new TestManaged1(mgr)}; - Variant v(m); + Variant v = Variant::fromObject(m); ASSERT_TRUE(a.validate(v, logger)); ASSERT_TRUE(v.isObject()); @@ -446,7 +446,7 @@ TEST(Argument, validateObjectDefault) { Rooted<TestManaged2> m{new TestManaged2(mgr)}; - Variant v(m); + Variant v = Variant::fromObject(m); ASSERT_TRUE(a.validate(v, logger)); ASSERT_TRUE(v.isObject()); @@ -455,7 +455,7 @@ TEST(Argument, validateObjectDefault) { Rooted<TestManaged1> m1{nullptr}; - Variant v(m1); + Variant v = Variant::fromObject(m1); ASSERT_FALSE(a.validate(v, logger)); ASSERT_TRUE(v.isObject()); diff --git a/test/core/managed/VariantObjectTest.cpp b/test/core/managed/VariantObjectTest.cpp index f590637..575b7ac 100644 --- a/test/core/managed/VariantObjectTest.cpp +++ b/test/core/managed/VariantObjectTest.cpp @@ -31,7 +31,7 @@ TEST(Variant, simpleManagedObject) bool a = false; { Handle<TestManaged> p{new TestManaged{mgr, a}}; - Variant v(p); + Variant v = Variant::fromObject(p); ASSERT_TRUE(v.isObject()); ASSERT_EQ(p, v.asObject()); ASSERT_TRUE(a); @@ -45,7 +45,7 @@ TEST(Variant, managedObjectCopy) bool a = false; { Handle<TestManaged> p{new TestManaged{mgr, a}}; - Variant v1(p); + Variant v1 = Variant::fromObject(p); { Variant v2 = v1; ASSERT_TRUE(v2.isObject()); @@ -63,7 +63,7 @@ TEST(Variant, managedObjectMove) bool a = false; { Handle<TestManaged> p{new TestManaged{mgr, a}}; - Variant v1(p); + Variant v1 = Variant::fromObject(p); { Variant v2 = std::move(v1); ASSERT_TRUE(v2.isObject()); |