Changeset 9533 for code/branches/testing/src/libraries/util/output

Timestamp:

Mar 2, 2013, 7:15:37 PM (12 years ago)

Author:

landauf

Message:

added more tests

Location:

code/branches/testing/src/libraries/util/output

Files:

• OutputManager.cc (modified) (3 diffs)
• OutputManager.h (modified) (4 diffs)

code/branches/testing/src/libraries/util/output/OutputManager.cc

@@ -39 +39 @@
 #include "util/Output.h"
 #include "util/StringUtils.h"
+#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -61 +62 @@
     }
 
+    /*static*/ SharedPtr<OutputManager>& OutputManager::Testing::getInstancePointer()
+    {
+        static SharedPtr<OutputManager> instance(new OutputManager());
+        return instance;
+    }
+
     /**
         @brief Returns the only existing instance of the OutputManager singleton.
@@ -66 +73 @@
     /*static*/ OutputManager& OutputManager::getInstance()
     {
-        static OutputManager instance;
-        return instance;
+        return *OutputManager::Testing::getInstancePointer();
     }
 

code/branches/testing/src/libraries/util/output/OutputManager.h

@@ -65 +65 @@
     {
         public:
+            OutputManager();
+            OutputManager(const OutputManager&);
+            virtual ~OutputManager();
+
             static OutputManager& getInstance();
             static OutputManager& getInstanceAndCreateListeners();
@@ -70 +74 @@
             void pushMessage(OutputLevel level, const OutputContextContainer& context, const std::string& message);
 
-            void registerListener(OutputListener* listener);
-            void unregisterListener(OutputListener* listener);
+            virtual void registerListener(OutputListener* listener);
+            virtual void unregisterListener(OutputListener* listener);
 
             virtual void updatedLevelMask(const OutputListener* listener)
@@ -103 +107 @@
 
         private:
-            OutputManager();
-            OutputManager(const OutputManager&);
-            ~OutputManager();
-
             void updateMasks();
             void updateCombinedLevelMask();
@@ -121 +121 @@
             std::map<std::string, OutputContextContainer> contextContainers_;   ///< Contains all contexts including sub-contexts and their containers
             OutputContextSubID subcontextCounter_;                              ///< Counts the number of sub-contexts (and generates their IDs)
+
+        public:
+            struct _UtilExport Testing
+            {
+                static SharedPtr<OutputManager>& getInstancePointer();
+            };
     };
 }