allowing to store Function objects in Variants, added simple unit test for the Method class

2 files changed, 47 insertions, 3 deletions

diff --git a/test/core/common/FunctionTest.cpp b/test/core/common/FunctionTest.cpp
new file mode 100644
index 0000000..7225f9c
--- /dev/null
+++ b/test/core/common/FunctionTest.cpp
@@ -0,0 +1,44 @@
+/*
+    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 <http://www.gnu.org/licenses/>.
+*/
+
+#include <gtest/gtest.h>
+
+#include <core/common/Function.hpp>
+
+namespace ousia {
+
+class MethodTestClass {
+public:
+	bool visited = false;
+
+	void visit() { visited = true; }
+};
+
+TEST(Method, simpleTest)
+{
+	Method<MethodTestClass> m{
+	    [](const Variant::arrayType &args, MethodTestClass *thisRef) {
+		    thisRef->visit();
+		    return Variant{};
+		}};
+
+	MethodTestClass inst;
+	m.call({}, &inst);
+}
+}
+
diff --git a/test/core/managed/VariantObjectTest.cpp b/test/core/managed/VariantObjectTest.cpp
index 6c8aebc..f590637 100644
--- a/test/core/managed/VariantObjectTest.cpp
+++ b/test/core/managed/VariantObjectTest.cpp
@@ -30,7 +30,7 @@ TEST(Variant, simpleManagedObject)
 	Manager mgr(1);
 	bool a = false;
 	{
-		TestManaged *p = new TestManaged{mgr, a};
+		Handle<TestManaged> p{new TestManaged{mgr, a}};
 		Variant v(p);
 		ASSERT_TRUE(v.isObject());
 		ASSERT_EQ(p, v.asObject());
@@ -44,7 +44,7 @@ TEST(Variant, managedObjectCopy)
 	Manager mgr(1);
 	bool a = false;
 	{
-		TestManaged *p = new TestManaged{mgr, a};
+		Handle<TestManaged> p{new TestManaged{mgr, a}};
 		Variant v1(p);
 		{
 			Variant v2 = v1;
@@ -62,7 +62,7 @@ TEST(Variant, managedObjectMove)
 	Manager mgr(1);
 	bool a = false;
 	{
-		TestManaged *p = new TestManaged{mgr, a};
+		Handle<TestManaged> p{new TestManaged{mgr, a}};
 		Variant v1(p);
 		{
 			Variant v2 = std::move(v1);