Changes in src/unittests/logunittest.cpp [a67d19:952f38]

File:

• src/unittests/logunittest.cpp (modified) (4 diffs)

src/unittests/logunittest.cpp

@@ -11 +11 @@
 
 #include "logunittest.hpp"
-#include "log.hpp"
+#include "Helpers/Log.hpp"
 #include "defs.hpp"
-#include "verbose.hpp"
+#include "Helpers/Verbose.hpp"
+
+#ifdef HAVE_TESTRUNNER
+#include "UnitTestMain.hpp"
+#endif /*HAVE_TESTRUNNER*/
 
 /********************************************** Test classes **************************************/
@@ -27 +31 @@
 void LogTest::tearDown()
 {
+  logger::purgeInstance();
+  errorLogger::purgeInstance();
 };
 
@@ -34 +40 @@
 void LogTest::logTest()
 {
-  logger::getInstance()->setVerbosity(2);
+  logger::getInstance().setVerbosity(2);
   DoLog(0) && (Log() << Verbose(0) << "Verbosity level is set to 2." << endl);
   DoLog(0) && (Log() << Verbose(0) << "Test level 0" << endl);
@@ -48 +54 @@
   DoeLog(4) && (eLog()<< Verbose(4) << "This should not be printed." << endl);
 };
-
-
-/********************************************** Main routine **************************************/
-
-int main(int argc, char **argv)
-{
-  // Get the top level suite from the registry
-  CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-
-  // Adds the test to the list of test to run
-  CppUnit::TextUi::TestRunner runner;
-  runner.addTest( suite );
-
-  // Change the default outputter to a compiler error format outputter
-  runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(),
-                                                       std::cerr ) );
-  // Run the tests.
-  bool wasSucessful = runner.run();
-
-  // Return error code 1 if the one of test failed.
-  return wasSucessful ? 0 : 1;
-};