Changeset 9537

Timestamp:

Mar 4, 2013, 11:23:57 PM (11 years ago)

Author:

landauf

Message:

ConsoleWriter now accepts and writes to any std::ostream, not just std::cout. Makes it easier to test.

Location:

code/branches/testing

Files:

• src/libraries/util/output/ConsoleWriter.cc (modified) (3 diffs)
• src/libraries/util/output/ConsoleWriter.h (modified) (3 diffs)
• src/libraries/util/output/OutputManager.cc (modified) (2 diffs)
• test/util/output/ConsoleWriterTest.cc (modified) (3 diffs)

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

@@ -34 +34 @@
 #include "ConsoleWriter.h"
 
-#include <iostream>
 
 #include "OutputManager.h"
@@ -48 +47 @@
         After creation, the instance is enabled.
     */
-    ConsoleWriter::ConsoleWriter() : BaseWriter("Console")
+    ConsoleWriter::ConsoleWriter(std::ostream& outputStream) : BaseWriter("Console"), outputStream_(outputStream)
     {
 #ifdef ORXONOX_RELEASE
@@ -70 +69 @@
     void ConsoleWriter::printLine(const std::string& line, OutputLevel)
     {
-        std::cout << line << std::endl;
+        this->outputStream_ << line << std::endl;
     }
 

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

@@ -37 +37 @@
 
 #include "util/UtilPrereqs.h"
+
+#include <ostream>
+
 #include "BaseWriter.h"
 
@@ -50 +53 @@
     {
         public:
-            ConsoleWriter();
+            ConsoleWriter(std::ostream& outputStream);
             ConsoleWriter(const ConsoleWriter&);
             virtual ~ConsoleWriter();
@@ -57 +60 @@
             void disable();
 
+            inline const std::ostream& getOutputStream() const
+                { return this->outputStream_; }
+
         protected:
             virtual void printLine(const std::string& line, OutputLevel level);
 
         private:
-            bool bEnabled_; ///< If false, the instance will not write output to the console.
+            std::ostream& outputStream_; ///< The ostream to which the console writer writes its output
+            bool bEnabled_;              ///< If false, the instance will not write output to the console.
     };
 }

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

@@ -33 +33 @@
 
 #include "OutputManager.h"
+
+#include <iostream>
 
 #include "MemoryWriter.h"
@@ -111 +113 @@
     ConsoleWriter& OutputManager::getConsoleWriter()
     {
-        static ConsoleWriter instance;
+        static ConsoleWriter instance(std::cout);
         return instance;
     }

code/branches/testing/test/util/output/ConsoleWriterTest.cc

@@ -8 +8 @@
     TEST(ConsoleWriterTest, Disable)
     {
+        std::ostream stream(NULL);
         EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
-        ConsoleWriter writer;
+        ConsoleWriter writer(stream);
         EXPECT_EQ(1U, OutputManager::getInstance().getListeners().size());
         writer.disable();
@@ -17 +18 @@
     TEST(ConsoleWriterTest, Enable)
     {
-        ConsoleWriter writer;
+        std::ostream stream(NULL);
+        ConsoleWriter writer(stream);
         writer.disable();
         EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
@@ -23 +25 @@
         EXPECT_EQ(1U, OutputManager::getInstance().getListeners().size());
     }
+
+    TEST(ConsoleWriterTest, WritesNoOutputToOutputStream)
+    {
+        std::stringbuf buffer;
+        std::ostream stream(&buffer);
+        ConsoleWriter writer(stream);
+        writer.setLevelMax(level::verbose);
+
+        EXPECT_EQ(0, buffer.in_avail());
+        EXPECT_EQ("", buffer.str());
+    }
+
+    TEST(ConsoleWriterTest, WritesOutputToOutputStream)
+    {
+        std::stringbuf buffer;
+        std::ostream stream(&buffer);
+        ConsoleWriter writer(stream);
+        writer.setLevelMax(level::verbose);
+
+        std::vector<std::string> lines;
+        lines.push_back("test");
+
+        EXPECT_TRUE(writer.acceptsOutput(level::debug_output, context::undefined()));
+
+        writer.unfilteredOutput(level::debug_output, context::undefined(), lines);
+
+        EXPECT_LT(0, buffer.in_avail());
+        EXPECT_NE("", buffer.str());
+        EXPECT_NE(std::string::npos, buffer.str().find("test"));
+    }
+
+    TEST(ConsoleWriterTest, DefaultConsoleWriterUsesCout)
+    {
+        EXPECT_EQ(std::cout, OutputManager::getInstance().getConsoleWriter().getOutputStream());
+    }
 }