[Orxonox-commit 5742] r10402 - code/branches/core7/test/util/output

[landauf at orxonox.net]

Author: landauf
Date: 2015-04-26 15:51:49 +0200 (Sun, 26 Apr 2015)
New Revision: 10402

Modified:
   code/branches/core7/test/util/output/ConsoleWriterTest.cc
   code/branches/core7/test/util/output/LogWriterTest.cc
   code/branches/core7/test/util/output/MemoryWriterTest.cc
Log:
fixed tests in util_test which failed when a different order of execution was used

Modified: code/branches/core7/test/util/output/ConsoleWriterTest.cc
===================================================================
--- code/branches/core7/test/util/output/ConsoleWriterTest.cc	2015-04-26 13:34:57 UTC (rev 10401)
+++ code/branches/core7/test/util/output/ConsoleWriterTest.cc	2015-04-26 13:51:49 UTC (rev 10402)
@@ -6,11 +6,26 @@
 
 namespace orxonox
 {
-    TEST(ConsoleWriterTest, Disable)
+    namespace
     {
-        // reset output manager
-        OutputManager::Testing::getInstancePointer() = new OutputManager();
+        // Fixture
+        class ConsoleWriterTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    // reset output manager
+                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                }
 
+                virtual void TearDown()
+                {
+                }
+        };
+    }
+
+    TEST_F(ConsoleWriterTest, Disable)
+    {
         std::ostream stream(NULL);
         EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
         ConsoleWriter writer(stream);
@@ -19,11 +34,8 @@
         EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
     }
 
-    TEST(ConsoleWriterTest, Enable)
+    TEST_F(ConsoleWriterTest, Enable)
     {
-        // reset output manager
-        OutputManager::Testing::getInstancePointer() = new OutputManager();
-
         std::ostream stream(NULL);
         ConsoleWriter writer(stream);
         writer.disable();
@@ -32,7 +44,7 @@
         EXPECT_EQ(1U, OutputManager::getInstance().getListeners().size());
     }
 
-    TEST(ConsoleWriterTest, WritesNoOutputToOutputStream)
+    TEST_F(ConsoleWriterTest, WritesNoOutputToOutputStream)
     {
         std::stringbuf buffer;
         std::ostream stream(&buffer);
@@ -43,7 +55,7 @@
         EXPECT_EQ("", buffer.str());
     }
 
-    TEST(ConsoleWriterTest, WritesOutputToOutputStream)
+    TEST_F(ConsoleWriterTest, WritesOutputToOutputStream)
     {
         std::stringbuf buffer;
         std::ostream stream(&buffer);
@@ -62,7 +74,7 @@
         EXPECT_NE(std::string::npos, buffer.str().find("test"));
     }
 
-    TEST(ConsoleWriterTest, DefaultConsoleWriterUsesCout)
+    TEST_F(ConsoleWriterTest, DefaultConsoleWriterUsesCout)
     {
         OutputManager::getInstanceAndCreateListeners();
         EXPECT_EQ(std::cout, OutputManager::getInstance().getConsoleWriter()->getOutputStream());

Modified: code/branches/core7/test/util/output/LogWriterTest.cc
===================================================================
--- code/branches/core7/test/util/output/LogWriterTest.cc	2015-04-26 13:34:57 UTC (rev 10401)
+++ code/branches/core7/test/util/output/LogWriterTest.cc	2015-04-26 13:51:49 UTC (rev 10402)
@@ -2,6 +2,8 @@
 #include "util/Output.h"
 #include "util/output/LogWriter.h"
 #include "util/Convert.h"
+#include "util/output/OutputManager.h"
+#include "util/SharedPtr.h"
 
 namespace orxonox
 {
@@ -13,10 +15,25 @@
                 virtual void printLine(const std::string& line, OutputLevel level)
                     { this->LogWriter::printLine(line, level); }
         };
+
+        // Fixture
+        class LogWriterTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    // reset output manager
+                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                }
+
+                virtual void TearDown()
+                {
+                }
+        };
     }
 
     // test constructor opens file
-    TEST(LogWriterTest, ConstructorOpensFile)
+    TEST_F(LogWriterTest, ConstructorOpensFile)
     {
         LogWriter logWriter;
         EXPECT_TRUE(logWriter.getFile().is_open());
@@ -63,7 +80,7 @@
         return result;
     }
 
-    TEST(LogWriterTest, SetLogDirectoryOpensNewFile)
+    TEST_F(LogWriterTest, SetLogDirectoryOpensNewFile)
     {
         std::string path = "./orxonox.log";
 
@@ -82,7 +99,7 @@
     }
 
     // prints output to logfile
-    TEST(LogWriterTest, PrintsOutputToLogfile)
+    TEST_F(LogWriterTest, PrintsOutputToLogfile)
     {
         std::string path;
 
@@ -102,7 +119,7 @@
     }
 
     // prints time to logfile
-    TEST(LogWriterTest, PrintsTimestampToLogfile)
+    TEST_F(LogWriterTest, PrintsTimestampToLogfile)
     {
         std::string path;
 
@@ -151,7 +168,7 @@
         deleteFile(path + ".9");
     }
 
-    TEST(LogWriterTest, ArchivesOldLogFile)
+    TEST_F(LogWriterTest, ArchivesOldLogFile)
     {
         deleteAllLogFiles();
 
@@ -195,7 +212,7 @@
         EXPECT_FALSE(fileExists(path + ".3"));
     }
 
-    TEST(LogWriterTest, ArchivesNineLogFiles)
+    TEST_F(LogWriterTest, ArchivesNineLogFiles)
     {
         deleteAllLogFiles();
 

Modified: code/branches/core7/test/util/output/MemoryWriterTest.cc
===================================================================
--- code/branches/core7/test/util/output/MemoryWriterTest.cc	2015-04-26 13:34:57 UTC (rev 10401)
+++ code/branches/core7/test/util/output/MemoryWriterTest.cc	2015-04-26 13:51:49 UTC (rev 10402)
@@ -3,6 +3,7 @@
 #include "util/Output.h"
 #include "util/output/MemoryWriter.h"
 #include "util/output/OutputManager.h"
+#include "util/SharedPtr.h"
 
 namespace orxonox
 {
@@ -13,9 +14,24 @@
             public:
                 MOCK_METHOD3(output, void(OutputLevel, const OutputContextContainer&, const std::vector<std::string>&));
         };
+
+        // Fixture
+        class MemoryWriterTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    // reset output manager
+                    OutputManager::Testing::getInstancePointer() = new OutputManager();
+                }
+
+                virtual void TearDown()
+                {
+                }
+        };
     }
 
-    TEST(MemoryWriterTest, Disable)
+    TEST_F(MemoryWriterTest, Disable)
     {
         EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
         MemoryWriter writer;
@@ -24,7 +40,7 @@
         EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
     }
 
-    TEST(MemoryWriterTest, ResendOutput)
+    TEST_F(MemoryWriterTest, ResendOutput)
     {
         MemoryWriter writer;