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

File:

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

src/unittests/logunittest.cpp

@@ -11 +11 @@
 
 #include "logunittest.hpp"
-#include "Helpers/Log.hpp"
+#include "log.hpp"
 #include "defs.hpp"
-#include "Helpers/Verbose.hpp"
-
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
+#include "verbose.hpp"
 
 /********************************************** Test classes **************************************/
@@ -31 +27 @@
 void LogTest::tearDown()
 {
-  logger::purgeInstance();
-  errorLogger::purgeInstance();
 };
 
@@ -40 +34 @@
 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);
@@ -54 +48 @@
   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;
+};