Changeset 9646 for code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc

Timestamp:

Aug 13, 2013, 11:35:26 PM (12 years ago)

Author:

landauf

Message:

implemented new concept to initialize the class hierarchy: each identifier is initialized individually by creating an object of the corresponding class. identifiers of abstract classes must be told explicitly about their direct parents. this allows to build the class tree correctly also for complicated setups like multiple inheritance of abstract classes.

File:

• code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc (modified) (6 diffs)

code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc

@@ -8 +8 @@
     {
         class Interface : virtual public Identifiable
-            { public: Interface() { RegisterRootObject(Interface); } };
+        {
+            public:
+                Interface()
+                {
+                    RegisterRootObject(Interface);
+                }
+
+                virtual void test() = 0;
+        };
 
         class BaseClass : virtual public Identifiable
-            { public: BaseClass() { RegisterRootObject(BaseClass); } };
+        {
+            public:
+                BaseClass()
+                {
+                    RegisterRootObject(BaseClass);
+                }
+        };
 
         class RealClass : public BaseClass, public Interface
-            { public: RealClass() { RegisterObject(RealClass); } };
+        {
+            public:
+                RealClass()
+                {
+                    RegisterObject(RealClass);
+                }
+
+                virtual void test() {}
+        };
 
         // Fixture
@@ -22 +44 @@
                 virtual void SetUp()
                 {
-                    registerClass("Interface", new ClassFactoryNoArgs<Interface>());
+                    registerClass("Interface", static_cast<ClassFactory<Interface>*>(NULL), false).inheritsFrom(Class(Identifiable));
                     registerClass("BaseClass", new ClassFactoryNoArgs<BaseClass>());
                     registerClass("RealClass", new ClassFactoryNoArgs<RealClass>());
@@ -34 +56 @@
                 }
         };
+
+        bool contains(const std::set<const Identifier*> identifiers, Identifier* identifier)
+        {
+            return identifiers.find(identifier) != identifiers.end();
+        }
     }
 
@@ -59 +86 @@
         Identifier* identifier = Class(Interface);
 
+        EXPECT_EQ(1u, identifier->getDirectChildren().size());
+        EXPECT_TRUE(contains(identifier->getDirectChildren(), Class(RealClass)));
+
         EXPECT_EQ(1u, identifier->getChildren().size());
-        EXPECT_EQ(0u, identifier->getParents().size());
+        EXPECT_TRUE(contains(identifier->getChildren(), Class(RealClass)));
+
+        EXPECT_EQ(1u, identifier->getDirectParents().size());
+        EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Identifiable)));
+
+        EXPECT_EQ(1u, identifier->getParents().size());
+        EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
     }
 
@@ -67 +103 @@
         Identifier* identifier = Class(BaseClass);
 
+        EXPECT_EQ(1u, identifier->getDirectChildren().size());
+        EXPECT_TRUE(contains(identifier->getDirectChildren(), Class(RealClass)));
+
         EXPECT_EQ(1u, identifier->getChildren().size());
-        EXPECT_EQ(0u, identifier->getParents().size());
+        EXPECT_TRUE(contains(identifier->getChildren(), Class(RealClass)));
+
+        EXPECT_EQ(1u, identifier->getDirectParents().size());
+        EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Identifiable)));
+
+        EXPECT_EQ(1u, identifier->getParents().size());
+        EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
     }
 
@@ -75 +120 @@
         Identifier* identifier = Class(RealClass);
 
+        EXPECT_EQ(0u, identifier->getDirectChildren().size());
+
         EXPECT_EQ(0u, identifier->getChildren().size());
-        EXPECT_EQ(2u, identifier->getParents().size());
+
+        EXPECT_EQ(2u, identifier->getDirectParents().size());
+        EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface)));
+        EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseClass)));
+
+        EXPECT_EQ(3u, identifier->getParents().size());
+        EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
+        EXPECT_TRUE(contains(identifier->getParents(), Class(Interface)));
+        EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass)));
     }
 }