Changeset 10624 for code/trunk/test/core/class/IdentifierTest.cc

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• test/core/class/IdentifierTest.cc (modified) (5 diffs)

code/trunk/test/core/class/IdentifierTest.cc

@@ -2 +2 @@
 #include "core/CoreIncludes.h"
 #include "core/class/Identifiable.h"
+#include "core/module/ModuleInstance.h"
 
 namespace orxonox
@@ -18 +19 @@
                 TestSubclass() { RegisterObject(TestSubclass); }
         };
+
+        RegisterClassNoArgs(TestClass);
+        RegisterClassNoArgs(TestSubclass);
+
+        // Fixture
+        class IdentifierTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    new IdentifierManager();
+                    ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+                }
+
+                virtual void TearDown()
+                {
+                    ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+                    delete &IdentifierManager::getInstance();
+                }
+        };
     }
 
-    TEST(IdentifierTest, IdentifierExistsOfClass)
+    TEST_F(IdentifierTest, IdentifierExistsOfClass)
     {
         TestClass test;
@@ -28 +49 @@
     }
 
-    TEST(IdentifierTest, IdentifierExistsOfSubclass)
+    TEST_F(IdentifierTest, IdentifierExistsOfSubclass)
     {
         TestSubclass test;
@@ -36 +57 @@
     }
 
-    TEST(IdentifierTest, HasNameOfClass)
+    TEST_F(IdentifierTest, HasNameOfClass)
     {
         TestClass test;
@@ -44 +65 @@
     }
 
-    TEST(IdentifierTest, HasNameOfSubClass)
+    TEST_F(IdentifierTest, HasNameOfSubClass)
     {
         TestSubclass test;