moved Rtti from managed to common folder, added Function header

2 files changed, 1 insertions, 64 deletions

diff --git a/test/core/managed/ManagedTest.cpp b/test/core/managed/ManagedTest.cpp
index c88cf7a..61b89ef 100644
--- a/test/core/managed/ManagedTest.cpp
+++ b/test/core/managed/ManagedTest.cpp
@@ -94,7 +94,7 @@ TEST(Managed, type)
 	ASSERT_EQ(&Type2, &m2->type());
 	ASSERT_EQ(&Type3, &m3->type());
 	ASSERT_EQ(&Type4, &m4->type());
-	ASSERT_EQ(&RttiBase::None, &m5->type());
+	ASSERT_EQ(&RttiTypes::None, &m5->type());
 
 	ASSERT_EQ(&Type1, &typeOf<TypeTestManaged1>());
 	ASSERT_EQ(&Type1, &typeOf(*m1));
diff --git a/test/core/managed/RttiTest.cpp b/test/core/managed/RttiTest.cpp
deleted file mode 100644
index 091bdea..0000000
--- a/test/core/managed/RttiTest.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    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 <array>
-#include <string>
-#include <iostream>
-
-#include <gtest/gtest.h>
-
-#include <core/managed/Rtti.hpp>
-
-namespace ousia {
-
-class RttiTestClass1 {};
-class RttiTestClass2 {};
-class RttiTestClass3 {};
-class RttiTestClass4 {};
-
-static const Rtti<RttiTestClass1> Type1("Type1");
-static const Rtti<RttiTestClass2> Type2("Type2");
-static const Rtti<RttiTestClass3> Type3("Type3", {&Type1});
-static const Rtti<RttiTestClass4> Type4("Type4", {&Type3, &Type2});
-
-TEST(Rtti, isa)
-{
-	ASSERT_TRUE(Type1.isa(Type1));
-	ASSERT_FALSE(Type1.isa(Type2));
-	ASSERT_FALSE(Type1.isa(Type3));
-	ASSERT_FALSE(Type1.isa(Type4));
-
-	ASSERT_FALSE(Type2.isa(Type1));
-	ASSERT_TRUE(Type2.isa(Type2));
-	ASSERT_FALSE(Type2.isa(Type3));
-	ASSERT_FALSE(Type2.isa(Type4));
-
-	ASSERT_TRUE(Type3.isa(Type1));
-	ASSERT_FALSE(Type3.isa(Type2));
-	ASSERT_TRUE(Type3.isa(Type3));
-	ASSERT_FALSE(Type3.isa(Type4));
-
-	ASSERT_TRUE(Type4.isa(Type1));
-	ASSERT_TRUE(Type4.isa(Type2));
-	ASSERT_TRUE(Type4.isa(Type3));
-	ASSERT_TRUE(Type4.isa(Type4));
-}
-
-}
-