Changeset 10460 for code/branches/core7/test/core

Timestamp:

May 24, 2015, 11:19:15 PM (9 years ago)

Author:

landauf

Message:

StaticallyInitializedScopedSingletonWrapper registers ScopedSingletonWrapper in ScopeManager

File:

• code/branches/core7/test/core/singleton/ScopeTest.cc (modified) (7 diffs)

code/branches/core7/test/core/singleton/ScopeTest.cc

@@ -1 +1 @@
 #include <gtest/gtest.h>
 #include "core/singleton/ScopedSingletonIncludes.h"
+#include "core/module/ModuleInstance.h"
 
 namespace orxonox
@@ -19 +20 @@
         ManageScopedSingleton(TestSingletonRoot, ScopeID::Root, false);
         ManageScopedSingleton(TestSingletonGraphics, ScopeID::Graphics, false);
+
+        // Fixture
+        class ScopeTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
+                }
+
+                virtual void TearDown()
+                {
+                    ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances();
+                }
+        };
     }
 
-    TEST(Scope, ScopesDoNotExist)
+    TEST_F(ScopeTest, ScopesDoNotExist)
     {
         EXPECT_FALSE(Scope<ScopeID::Root>::isActive());
@@ -27 +43 @@
     }
 
-    TEST(Scope, SingletonsDoNotExist)
+    TEST_F(ScopeTest, SingletonsDoNotExist)
     {
         EXPECT_FALSE(TestSingletonRoot::exists());
@@ -33 +49 @@
     }
 
-    TEST(Scope, RootScope)
+    TEST_F(ScopeTest, RootScope)
     {
         EXPECT_FALSE(Scope<ScopeID::Root>::isActive());
@@ -43 +59 @@
     }
 
-    TEST(DISABLED_Scope, RootAndGraphicsScope)
+    TEST_F(ScopeTest, DISABLED_RootAndGraphicsScope)
     {
         EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
@@ -58 +74 @@
     }
 
-    TEST(Scope, RootSingleton)
+    TEST_F(ScopeTest, RootSingleton)
     {
         EXPECT_FALSE(TestSingletonRoot::exists());
@@ -68 +84 @@
     }
 
-    TEST(DISABLED_Scope, RootAndGraphicsSingleton)
+    TEST_F(ScopeTest, DISABLED_RootAndGraphicsSingleton)
     {
         EXPECT_FALSE(TestSingletonGraphics::exists());