From a7567d08e4d5869833069ec7211785af350aea88 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sat, 20 Dec 2014 15:51:00 +0100 Subject: Renamed ManagedType class to Rtti to make naming less confusing, implemented easier to use Rtti clas --- test/core/managed/ManagedTest.cpp | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) (limited to 'test/core/managed/ManagedTest.cpp') diff --git a/test/core/managed/ManagedTest.cpp b/test/core/managed/ManagedTest.cpp index e286166..c88cf7a 100644 --- a/test/core/managed/ManagedTest.cpp +++ b/test/core/managed/ManagedTest.cpp @@ -75,33 +75,10 @@ class TypeTestManaged5 : public Managed { using Managed::Managed; }; -ManagedType Type1("Type1", typeid(TypeTestManaged1)); -ManagedType Type2("Type2", typeid(TypeTestManaged2)); -ManagedType Type3("Type3", typeid(TypeTestManaged3), {&Type1}); -ManagedType Type4("Type2", typeid(TypeTestManaged4), {&Type3, &Type2}); - -TEST(ManagedType, 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)); -} +static const Rtti Type1("Type1"); +static const Rtti Type2("Type2"); +static const Rtti Type3("Type3", {&Type1}); +static const Rtti Type4("Type4", {&Type3, &Type2}); TEST(Managed, type) { @@ -117,10 +94,8 @@ TEST(Managed, type) ASSERT_EQ(&Type2, &m2->type()); ASSERT_EQ(&Type3, &m3->type()); ASSERT_EQ(&Type4, &m4->type()); - ASSERT_EQ(&ManagedType::None, &m5->type()); + ASSERT_EQ(&RttiBase::None, &m5->type()); - ASSERT_EQ(&Type1, &ManagedType::typeOf(*m1)); - ASSERT_EQ(&Type1, &ManagedType::typeOf()); ASSERT_EQ(&Type1, &typeOf()); ASSERT_EQ(&Type1, &typeOf(*m1)); } -- cgit v1.2.3