Changeset 9649 for code/branches/core6/test/core/class

Timestamp:

Aug 14, 2013, 6:42:28 PM (11 years ago)

Author:

landauf

Message:

added ability to set the root-context explicitly (and also to destroy it before the class-hierarchy is destroyed).
currently it's not possible to set the root context explicitly during startup of the game because it is already used by static initialization

Location:

code/branches/core6/test/core/class

Files:

• OrxonoxClassTest.cc (modified) (2 diffs)
• OrxonoxInterfaceTest.cc (modified) (3 diffs)
• SubclassIdentifierTest.cc (modified) (1 diff)
• SuperTest.cc (modified) (2 diffs)

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

@@ -1 +1 @@
 #include <gtest/gtest.h>
 #include "core/class/OrxonoxClass.h"
+#include "core/object/Context.h"
 
 namespace orxonox
@@ -9 +10 @@
         {
         };
+
+        // Fixture
+        class OrxonoxClassTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    Context::setRootContext(new Context(NULL));
+                }
+
+                virtual void TearDown()
+                {
+                    Context::setRootContext(NULL);
+                }
+        };
     }
 
-    TEST(OrxonoxClassTest, CanCreate)
+    TEST_F(OrxonoxClassTest, CanCreate)
     {
         TestClass* test = new TestClass();

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

@@ -2 +2 @@
 #include "core/class/OrxonoxInterface.h"
 #include "core/class/OrxonoxClass.h"
+#include "core/object/Context.h"
 
 namespace orxonox
@@ -24 +25 @@
         {
         };
+
+        // Fixture
+        class OrxonoxInterfaceTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    Context::setRootContext(new Context(NULL));
+                }
+
+                virtual void TearDown()
+                {
+                    Context::setRootContext(NULL);
+                }
+        };
     }
 
-    TEST(OrxonoxInterfaceTest, CanCreate1)
+    TEST_F(OrxonoxInterfaceTest, CanCreate1)
     {
         TestClass1* test = new TestClass1();
@@ -33 +49 @@
     }
 
-    TEST(OrxonoxInterfaceTest, CanCreate2)
+    TEST_F(OrxonoxInterfaceTest, CanCreate2)
     {
         TestClass2* test = new TestClass2();

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

@@ -32 +32 @@
 
                     IdentifierManager::getInstance().createClassHierarchy();
+
+                    Context::setRootContext(new Context(NULL));
                 }
 
                 virtual void TearDown()
                 {
+                    Context::setRootContext(NULL);
+
                     IdentifierManager::getInstance().destroyAllIdentifiers();
                 }

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

@@ -62 +62 @@
         };
 
-        // Fixture
+       // Fixture
         class SuperTest : public ::testing::Test
         {
@@ -76 +76 @@
 
                     IdentifierManager::getInstance().createClassHierarchy();
+
+                    Context::setRootContext(new Context(NULL));
                 }
 
                 virtual void TearDown()
                 {
+                    Context::setRootContext(NULL);
+
                     IdentifierManager::getInstance().destroyAllIdentifiers();
                 }