Changeset 10624 for code/trunk/test/core/class/IdentifiableTest.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/IdentifiableTest.cc (modified) (2 diffs)

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

@@ -2 +2 @@
 #include "core/CoreIncludes.h"
 #include "core/class/Identifiable.h"
+#include "core/module/ModuleInstance.h"
 
 namespace orxonox
@@ -7 +8 @@
     namespace
     {
-        class IdentifiableTest : public Identifiable
+        class IdentifiableClass : public Identifiable
         {
             public:
-                IdentifiableTest() { RegisterObject(IdentifiableTest); }
+                IdentifiableClass() { RegisterObject(IdentifiableClass); }
+        };
+
+        RegisterClassNoArgs(IdentifiableClass);
+
+        // Fixture
+        class IdentifiableTest : 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(IdentifiableTest, CanCreate)
+    TEST_F(IdentifiableTest, CanCreate)
     {
-        IdentifiableTest* test = new IdentifiableTest();
+        IdentifiableClass* test = new IdentifiableClass();
         ASSERT_TRUE(test != NULL);
         delete test;
     }
 
-    TEST(IdentifiableTest, HasIdentifierAssigned)
+    TEST_F(IdentifiableTest, HasIdentifierAssigned)
     {
-        IdentifiableTest test;
+        IdentifiableClass test;
         EXPECT_TRUE(test.getIdentifier());
     }
 
-    TEST(IdentifiableTest, CanBeIdentified)
+    TEST_F(IdentifiableTest, CanBeIdentified)
     {
-        IdentifiableTest test;
-        EXPECT_TRUE(test.isA(Class(IdentifiableTest)));
+        IdentifiableClass test;
+        EXPECT_TRUE(test.isA(Class(IdentifiableClass)));
     }
 }