Changeset 10460 for code/branches

Timestamp:

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

Author:

landauf

Message:

StaticallyInitializedScopedSingletonWrapper registers ScopedSingletonWrapper in ScopeManager

Location:

code/branches/core7

Files:

• src/libraries/core/singleton/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/singleton/Scope.h (modified) (3 diffs)
• src/libraries/core/singleton/ScopedSingletonIncludes.cc (added)
• src/libraries/core/singleton/ScopedSingletonIncludes.h (modified) (1 diff)
• src/libraries/core/singleton/ScopedSingletonWrapper.h (modified) (6 diffs)
• test/core/singleton/ScopeTest.cc (modified) (7 diffs)

code/branches/core7/src/libraries/core/singleton/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(CORE_SRC_FILES
   Scope.cc
+  ScopedSingletonIncludes.cc
 )

code/branches/core7/src/libraries/core/singleton/Scope.h

@@ -76 +76 @@
         template <ScopeID::Value scope>
         friend class Scope;
-        friend class ScopeListener;
+        friend class StaticallyInitializedScopedSingletonWrapper;
 
         private:
@@ -95 +95 @@
 
         protected:
-            //! Constructor: Registers the instance.
-            ScopeListener(ScopeID::Value scope) : scope_(scope), bActivated_(false)
-                { ScopeManager::getListeners()[this->scope_].insert(this); }
-            //! Destructor: Unregisters the instance.
-            virtual ~ScopeListener()
-                { ScopeManager::getListeners()[this->scope_].erase(this); }
+            ScopeListener(ScopeID::Value scope) : scope_(scope), bActivated_(false) { }
+            virtual ~ScopeListener() { }
 
             //! Gets called if the scope is activated
@@ -106 +102 @@
             //! Gets called if the scope is deactivated
             virtual void deactivated() = 0;
+
+        public:
+            inline ScopeID::Value getScope() const
+                { return this->scope_; }
 
         private:

code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h

@@ -83 +83 @@
             StaticallyInitializedScopedSingletonWrapper(ScopedSingletonWrapper* wrapper) : wrapper_(wrapper) {}
 
-            virtual void load() {}
-            virtual void unload() {}
+            virtual void load();
+            virtual void unload();
 
             inline ScopedSingletonWrapper& getWrapper()

code/branches/core7/src/libraries/core/singleton/ScopedSingletonWrapper.h

@@ -57 +57 @@
         @brief Base class of ClassScopedSingletonWrapper.
     */
-    class _CoreExport ScopedSingletonWrapper
+    class _CoreExport ScopedSingletonWrapper : public ScopeListener
     {
         public:
             /// Constructor: Initializes all the values
             ScopedSingletonWrapper(const std::string& className, ScopeID::Value scope)
-                : className_(className)
-                , scope_(scope)
+                : ScopeListener(scope)
+                , className_(className)
             { }
             virtual ~ScopedSingletonWrapper() { }
@@ -69 +69 @@
         protected:
             const std::string className_;   ///< The name of the scoped singleton class that is managed by this object
-            const ScopeID::Value scope_;    ///< The scope of the singleton that is managed by this object
     };
 
@@ -89 +88 @@
     */
     template <class T, ScopeID::Value scope, bool allowedToFail>
-    class ClassScopedSingletonWrapper : public ScopedSingletonWrapper, public ScopeListener
+    class ClassScopedSingletonWrapper : public ScopedSingletonWrapper
     {
     public:
@@ -95 +94 @@
         ClassScopedSingletonWrapper(const std::string& className)
             : ScopedSingletonWrapper(className, scope)
-            , ScopeListener(scope)
             , singletonPtr_(NULL)
         {
@@ -145 +143 @@
     */
     template <class T, ScopeID::Value scope>
-    class ClassScopedSingletonWrapper<T, scope, true> : public ScopedSingletonWrapper, public ScopeListener
+    class ClassScopedSingletonWrapper<T, scope, true> : public ScopedSingletonWrapper
     {
     public:
@@ -151 +149 @@
         ClassScopedSingletonWrapper(const std::string& className)
             : ScopedSingletonWrapper(className, scope)
-            , ScopeListener(scope)
             , singletonPtr_(NULL)
         {

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());