Changeset 11071 for code/trunk/test/util/output

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• test/util/output/BaseWriterTest.cc (modified) (1 diff)
• test/util/output/ConsoleWriterTest.cc (modified) (4 diffs)
• test/util/output/LogWriterTest.cc (modified) (5 diffs)
• test/util/output/MemoryWriterTest.cc (modified) (2 diffs)
• test/util/output/OutputListenerTest.cc (modified) (2 diffs)
• test/util/output/OutputManagerTest.cc (modified) (2 diffs)
• test/util/output/OutputStreamTest.cc (modified) (2 diffs)

code/trunk/test/util/output/BaseWriterTest.cc

@@ -30 +30 @@
                 MOCK_METHOD2(printLine, void(const std::string&, OutputLevel));
 
-                virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines)
+                virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override
                     { this->BaseWriter::output(level, context, lines); }
         };

code/trunk/test/util/output/ConsoleWriterTest.cc

@@ -3 +3 @@
 #include "util/output/ConsoleWriter.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -13 +12 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                 }
@@ -27 +26 @@
     TEST_F(ConsoleWriterTest, Disable)
     {
-        std::ostream stream(NULL);
+        std::ostream stream(nullptr);
         EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
         ConsoleWriter writer(stream);
@@ -37 +36 @@
     TEST_F(ConsoleWriterTest, Enable)
     {
-        std::ostream stream(NULL);
+        std::ostream stream(nullptr);
         ConsoleWriter writer(stream);
         writer.disable();

code/trunk/test/util/output/LogWriterTest.cc

@@ -4 +4 @@
 #include "util/Convert.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -13 +12 @@
         {
             public:
-                virtual void printLine(const std::string& line, OutputLevel level)
+                virtual void printLine(const std::string& line, OutputLevel level) override
                     { this->LogWriter::printLine(line, level); }
         };
@@ -21 +20 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                 }
@@ -138 +137 @@
         std::string line = getLineWhichContains(path, "myothertestoutput");
         EXPECT_FALSE(line.empty());
+        ASSERT_TRUE(line.length() > 12);
+
         EXPECT_TRUE(isdigit(line[0]));
         EXPECT_TRUE(isdigit(line[1]));
@@ -146 +147 @@
         EXPECT_TRUE(isdigit(line[6]));
         EXPECT_TRUE(isdigit(line[7]));
-        EXPECT_EQ(' ', line[8]);
+        EXPECT_EQ(':', line[8]);
+        EXPECT_TRUE(isdigit(line[9]));
+        EXPECT_TRUE(isdigit(line[10]));
+        EXPECT_TRUE(isdigit(line[11]));
+        EXPECT_EQ(' ', line[12]);
     }
 

code/trunk/test/util/output/MemoryWriterTest.cc

@@ -4 +4 @@
 #include "util/output/MemoryWriter.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -20 +19 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     // reset output manager
-                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                    OutputManager::Testing::getInstancePointer().reset(new OutputManager());
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                 }

code/trunk/test/util/output/OutputListenerTest.cc

@@ -3 +3 @@
 #include "util/output/OutputListener.h"
 #include "util/output/OutputManager.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -342 +341 @@
             {
                 this->manager_ = new MockOutputManager();
-                OutputManager::Testing::getInstancePointer() = this->manager_;
+                OutputManager::Testing::getInstancePointer().reset(this->manager_);
             }
 
             virtual void TearDown()
             {
-                OutputManager::Testing::getInstancePointer() = new OutputManager();
+                OutputManager::Testing::getInstancePointer().reset(new OutputManager());
             }
 

code/trunk/test/util/output/OutputManagerTest.cc

@@ -54 +54 @@
     TEST(OutputManagerTest, GetInstanceDoesNotCreateDefaultListeners)
     {
-        EXPECT_TRUE(NULL == OutputManager::getInstance().getMemoryWriter());
-        EXPECT_TRUE(NULL == OutputManager::getInstance().getConsoleWriter());
-        EXPECT_TRUE(NULL == OutputManager::getInstance().getLogWriter());
+        EXPECT_TRUE(nullptr == OutputManager::getInstance().getMemoryWriter());
+        EXPECT_TRUE(nullptr == OutputManager::getInstance().getConsoleWriter());
+        EXPECT_TRUE(nullptr == OutputManager::getInstance().getLogWriter());
     }
 
@@ -62 +62 @@
     TEST(OutputManagerTest, GetInstanceAndCreateListenersCreatesDefaultListeners)
     {
-        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
-        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
-        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getLogWriter());
+        EXPECT_TRUE(nullptr != OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
+        EXPECT_TRUE(nullptr != OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
+        EXPECT_TRUE(nullptr != OutputManager::getInstanceAndCreateListeners().getLogWriter());
     }
 

code/trunk/test/util/output/OutputStreamTest.cc

@@ -8 +8 @@
 #include "util/output/OutputManager.h"
 #include "util/output/MemoryWriter.h"
-#include "util/SharedPtr.h"
 
 namespace orxonox
@@ -88 +87 @@
             {
                 this->manager_ = new MockOutputManager();
-                OutputManager::Testing::getInstancePointer() = this->manager_;
+                OutputManager::Testing::getInstancePointer().reset(this->manager_);
             }
 
             virtual void TearDown()
             {
-                OutputManager::Testing::getInstancePointer() = new OutputManager();
+                OutputManager::Testing::getInstancePointer().reset(new OutputManager());
             }