Changeset 9650 for code/branches

Timestamp:

Aug 14, 2013, 7:04:40 PM (11 years ago)

Author:

landauf

Message:

add context to objectlist

Location:

code/branches/core6

Files:

• src/libraries/core/object/Context.cc (modified) (2 diffs)
• test/core/object/ContextTest.cc (modified) (1 diff)

code/branches/core6/src/libraries/core/object/Context.cc

@@ -34 +34 @@
 #include "Context.h"
 #include "core/class/Identifier.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox
 {
+    RegisterClass(Context);
+
     Context* Context::rootContext_s = 0;
 
@@ -46 +49 @@
         // setContext(this) here).
         this->setContext(this);
+
+        RegisterObject(Context);
     }
 

code/branches/core6/test/core/object/ContextTest.cc

@@ -58 +58 @@
         EXPECT_EQ(1u, context.getObjectList<SubclassContext>()->size());
     }
+
+    TEST_F(ContextTest, ContextIsAddedToItsOwnObjectList)
+    {
+        Context context(NULL);
+        ASSERT_EQ(1u, context.getObjectList<Context>()->size());
+        EXPECT_TRUE(context.getObjectList<Context>()->begin()->objectBase_ == static_cast<Listable*>(&context));
+    }
+
+    TEST_F(ContextTest, ContextIsAddedToObjectListOfBaseContext)
+    {
+        Context baseContext(NULL);
+        Context subContext(&baseContext);
+
+        ASSERT_EQ(1u, subContext.getObjectList<Context>()->size());
+        EXPECT_TRUE(subContext.getObjectList<Context>()->begin()->objectBase_ == static_cast<Listable*>(&subContext));
+
+        ASSERT_EQ(2u, baseContext.getObjectList<Context>()->size());
+        EXPECT_TRUE(baseContext.getObjectList<Context>()->begin()->objectBase_ == static_cast<Listable*>(&baseContext));
+        EXPECT_TRUE(baseContext.getObjectList<Context>()->begin()->next_->objectBase_ == static_cast<Listable*>(&subContext));
+    }
 }