Changeset ef9dff6 for src/Helpers/unittests

Timestamp:

Jul 14, 2014, 8:37:03 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Children:

0ab195

Parents:

ca940b

git-author:

Frederik Heber <heber@…> (06/19/14 16:26:39)

git-committer:

Frederik Heber <heber@…> (07/14/14 20:37:03)

Message:

logger and errorLogger have new setOutputStream().

• this allows to redirect the logging streams in a program internally, e.g. in a GUI setting.
• added unit test on this function.
• TESTFIX: LogUnitTest used loggerStub which made the tests useless.

Location:

src/Helpers/unittests

Files:

• LogUnitTest.cpp (modified) (3 diffs)
• LogUnitTest.hpp (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• stubs/loggerStub.cpp (modified) (4 diffs)

src/Helpers/unittests/LogUnitTest.cpp

@@ -39 +39 @@
 void LogTest::setUp()
 {
-};
+}
 
 void LogTest::tearDown()
@@ -45 +45 @@
   logger::purgeInstance();
   errorLogger::purgeInstance();
-};
+}
 
 /**
@@ -70 +70 @@
   CPPUNIT_ASSERT(!DoLog(4));
   CPPUNIT_ASSERT(!DoeLog(4));
-};
+}
+
+/**
+ * UnitTest for log()
+ */
+void LogTest::newOutputTest()
+{
+  // check whether redirecting output works
+  std::stringstream teststream;
+  {
+    Log().setOutputStream(&teststream);
+    logger::getInstance().setVerbosity(2);
+    Log() << Verbose(0) << std::string("test");
+//    DoLog(0) && (Log() << Verbose(0) << "test" << endl);
+    CPPUNIT_ASSERT_EQUAL( std::string("test"), teststream.str() );
+    Log().setOutputStream(NULL);  // go to default, as stringstream is destroyed
+  }
+  // redirect to NULL changes to cout
+  teststream.str("");
+  {
+    DoLog(0) && (Log() << Verbose(0) << "test" << endl);
+    CPPUNIT_ASSERT_EQUAL( std::string(""), teststream.str() );
+  }
+}

src/Helpers/unittests/LogUnitTest.hpp

@@ -20 +20 @@
     CPPUNIT_TEST_SUITE( LogTest) ;
     CPPUNIT_TEST ( logTest );
+    CPPUNIT_TEST ( newOutputTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -25 +26 @@
     void setUp();
     void tearDown();
+    void newOutputTest();
 
     void logTest();

src/Helpers/unittests/Makefile.am

@@ -77 +77 @@
 LogUnitTest_SOURCES = UnitTestMain.cpp \
         ../Helpers/unittests/LogUnitTest.cpp \
-        ../Helpers/unittests/LogUnitTest.hpp \
-        ../Helpers/unittests/stubs/errorloggerStub.cpp \
-        ../Helpers/unittests/stubs/loggerStub.cpp
+        ../Helpers/unittests/LogUnitTest.hpp
 nodist_LogUnitTest_SOURCES = \
         $(top_srcdir)/src/CodePatterns/Assert.hpp \

src/Helpers/unittests/stubs/loggerStub.cpp

@@ -26 +26 @@
 int logger::verbosity = 2;
 ostream* logger::nix = NULL;
+ostream* logger::defaultout = NULL;
+ostream* logger::out = NULL;
 
 /**
@@ -35 +37 @@
 {
   nix = new stringstream;
+  defaultout = new stringstream;
+  out = defaultout;
 };
 
@@ -43 +47 @@
 {
   delete nix;
+  delete defaultout;
+  out = NULL;
 }
 
@@ -65 +71 @@
 }
 
+/** Sets a new output stream.
+ *
+ * \param _newout new output stream, if NULL we set to defaultout
+ */
+void logger::setOutputStream(ostream *_newout)
+{
+  if(_newout != NULL)
+    out = _newout;
+  else
+    out = defaultout;
+}
+
 /**
  * Operator for the Binary(arg) call.