Changeset 9608 for code/branches/core6/test/core

Timestamp:

Mar 30, 2013, 10:40:48 PM (12 years ago)

Author:

landauf

Message:

implemented method to change the context of a Listable. the object will then be added to the object lists of the new context

Location:

code/branches/core6/test/core/object

Files:

• ListableTest.cc (modified) (2 diffs)
• ObjectListBaseTest.cc (modified) (5 diffs)

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

@@ -20 +20 @@
 
         template <class T>
-        bool objectListContains(T* element)
+        bool objectListContains(T* element, Context* context = Context::getRootContext())
         {
-            for (typename ObjectList<T>::iterator it = ObjectList<T>::begin(); it != ObjectList<T>::end(); ++it)
+            for (typename ObjectList<T>::iterator it = static_cast<ObjectListElement<T>*>(context->getObjectList<T>()->begin());
+                    it != static_cast<ObjectListElement<T>*>(context->getObjectList<T>()->end()); ++it)
                 if (*it == element)
                     return true;
@@ -77 +78 @@
         EXPECT_EQ(0u, ObjectList<ListableSubclassTest>::size());
     }
+
+    TEST(ListableTest, CanChangeContext)
+    {
+        Context* rootContext = Context::getRootContext();
+        Context newContext;
+        ListableSubclassTest test;
+
+        EXPECT_EQ(1u, rootContext->getObjectList<ListableTest>()->size());
+        EXPECT_TRUE(objectListContains<ListableTest>(&test, rootContext));
+        EXPECT_EQ(1u, rootContext->getObjectList<ListableSubclassTest>()->size());
+        EXPECT_TRUE(objectListContains<ListableSubclassTest>(&test, rootContext));
+
+        EXPECT_EQ(0u, newContext.getObjectList<ListableTest>()->size());
+        EXPECT_FALSE(objectListContains<ListableTest>(&test, &newContext));
+        EXPECT_EQ(0u, newContext.getObjectList<ListableSubclassTest>()->size());
+        EXPECT_FALSE(objectListContains<ListableSubclassTest>(&test, &newContext));
+
+        test.setContext(&newContext);
+
+        EXPECT_EQ(0u, rootContext->getObjectList<ListableTest>()->size());
+        EXPECT_FALSE(objectListContains<ListableTest>(&test, rootContext));
+        EXPECT_EQ(0u, rootContext->getObjectList<ListableSubclassTest>()->size());
+        EXPECT_FALSE(objectListContains<ListableSubclassTest>(&test, rootContext));
+
+        EXPECT_EQ(1u, newContext.getObjectList<ListableTest>()->size());
+        EXPECT_TRUE(objectListContains<ListableTest>(&test, &newContext));
+        EXPECT_EQ(1u, newContext.getObjectList<ListableSubclassTest>()->size());
+        EXPECT_TRUE(objectListContains<ListableSubclassTest>(&test, &newContext));
+    }
 }

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

@@ -2 +2 @@
 #include <gmock/gmock.h>
 #include "core/object/ObjectListBase.h"
+#include "core/class/Identifier.h"
 
 namespace orxonox
@@ -23 +24 @@
     {
         ObjectListBase list;
-        ObjectListBaseElement* element = new ObjectListBaseElement(NULL);
+        ObjectListBaseElement* element = new ObjectListElement<Listable>(NULL);
         list.addElement(element);
         EXPECT_EQ(1u, list.size());
@@ -31 +32 @@
     {
         ObjectListBase list;
-        ObjectListBaseElement* element = new ObjectListBaseElement(NULL);
+        ObjectListBaseElement* element = new ObjectListElement<Listable>(NULL);
         list.addElement(element);
         EXPECT_EQ(1u, list.size());
@@ -51 +52 @@
         EXPECT_EQ(0u, list.size());
         {
-            ObjectListBaseElement element1(NULL);
+            ObjectListElement<Listable> element1(NULL);
             list.addElement(&element1);
             EXPECT_EQ(1u, list.size());
             {
-                ObjectListBaseElement element1(NULL);
+                ObjectListElement<Listable> element1(NULL);
                 list.addElement(&element1);
                 EXPECT_EQ(2u, list.size());
                 {
-                    ObjectListBaseElement element1(NULL);
+                    ObjectListElement<Listable> element1(NULL);
                     list.addElement(&element1);
                     EXPECT_EQ(3u, list.size());
@@ -75 +76 @@
         ObjectListElementRemovalListenerMock listener;
         list.registerRemovalListener(&listener);
-        ObjectListBaseElement* element = new ObjectListBaseElement(NULL);
+        ObjectListBaseElement* element = new ObjectListElement<Listable>(NULL);
         list.addElement(element);
         EXPECT_CALL(listener, removedElement(element));