From dbb94be50c67ce2d4a132b0811c2a8dac825b49b Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sat, 25 Oct 2014 00:01:56 +0000 Subject: started unit test for Object, fixed possible used of already freed ArgumentValidator when copying ValidatingFunction git-svn-id: file:///var/local/svn/basicwriter@77 daaaf23c-2e50-4459-9457-1e69db5a47bf --- test/core/script/Function.cpp | 28 +++++++++++++-------- test/core/script/Object.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 11 deletions(-) create mode 100644 test/core/script/Object.cpp (limited to 'test/core') diff --git a/test/core/script/Function.cpp b/test/core/script/Function.cpp index 39dd9ce..5bacf2a 100644 --- a/test/core/script/Function.cpp +++ b/test/core/script/Function.cpp @@ -27,9 +27,11 @@ TEST(HostFunction, callDirect) { int v = 0; HostFunction f{[](const std::vector &args, void *data) { - *(static_cast(data)) = args[0].getIntegerValue(); - return Variant::Null; - }, {Argument{VariantType::integer}}, &v}; + *(static_cast(data)) = args[0].getIntegerValue(); + return Variant::Null; + }, + {Argument{VariantType::integer}}, + &v}; ASSERT_EQ(VariantType::null, f.call({{(int64_t)42}}).getType()); ASSERT_EQ(42, v); } @@ -38,9 +40,11 @@ TEST(HostFunction, callDefaults) { int v = 0; HostFunction f{[](const std::vector &args, void *data) { - *(static_cast(data)) = args[0].getIntegerValue(); - return Variant{"Hallo Welt"}; - }, {Argument{VariantType::integer, {(int64_t)42}}}, &v}; + *(static_cast(data)) = args[0].getIntegerValue(); + return Variant{"Hallo Welt"}; + }, + {Argument{VariantType::integer, {(int64_t)42}}}, + &v}; ASSERT_EQ("Hallo Welt", f.call().getStringValue()); ASSERT_EQ(42, v); } @@ -49,8 +53,10 @@ TEST(Setter, call) { int v = 0; Setter f{VariantType::integer, [](Variant arg, void *data) { - *(static_cast(data)) = arg.getIntegerValue(); - }, &v}; + *(static_cast(data)) = + arg.getIntegerValue(); + }, + &v}; f.call({(int64_t)42}); ASSERT_EQ(42, v); } @@ -59,11 +65,11 @@ TEST(Getter, call) { int v = 42; Getter f{[](void *data) { - return Variant{int64_t(*(static_cast(data)))}; - }, &v}; + return Variant{int64_t(*(static_cast(data)))}; + }, + &v}; ASSERT_EQ(v, f.call().getIntegerValue()); } - } } diff --git a/test/core/script/Object.cpp b/test/core/script/Object.cpp new file mode 100644 index 0000000..3c392bb --- /dev/null +++ b/test/core/script/Object.cpp @@ -0,0 +1,58 @@ +/* + Ousía + Copyright (C) 2014, 2015 Benjamin Paaßen, Andreas Stöckel + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include + +#include + +namespace ousia { +namespace script { + +TEST(Object, addProperty) +{ + int64_t i = 0; + + Object o{&i}; + + auto get = [](void *data) { + return Variant{*((int64_t*)data)}; + }; + auto set = [](Variant v, void *data) { + *((int64_t*)data) = v.getIntegerValue(); + }; + + std::map ps; + + o.addProperty("p1", VariantType::integer, get, set); + o.addReadonlyProperty("p2", get); + + ASSERT_TRUE(o.getProperty("p1") != nullptr); + ASSERT_TRUE(o.getProperty("p2") != nullptr); + ASSERT_FALSE(o.getMethod("p1") != nullptr); + ASSERT_FALSE(o.getMethod("p2") != nullptr); + + o.getProperty("p1")->set({(int64_t)42}); + ASSERT_EQ(42, i); + ASSERT_EQ(i, o.getProperty("p1")->get().getIntegerValue()); + + ASSERT_FALSE(o.getProperty("p2")->set.exists()); + ASSERT_EQ(i, o.getProperty("p2")->get().getIntegerValue()); +} +} +} + -- cgit v1.2.3