Changes in src/unittests/ObserverTest.cpp [5e5283:317df8]

File:

• src/unittests/ObserverTest.cpp (modified) (7 diffs)

src/unittests/ObserverTest.cpp

@@ -18 +18 @@
 using namespace std;
 
-#ifdef HAVE_TESTRUNNER
-#include "UnitTestMain.hpp"
-#endif /*HAVE_TESTRUNNER*/
-
 // Registers the fixture into the 'registry'
 CPPUNIT_TEST_SUITE_REGISTRATION( ObserverTest );
@@ -44 +40 @@
   void changeMethod() {
     OBSERVE;
-    int i = 0;
+    int i;
     i++;
   }
@@ -53 +49 @@
   void changeMethod1() {
     OBSERVE;
-    int i = 0;
+    int i;
     i++;
   }
@@ -59 +55 @@
   void changeMethod2() {
     OBSERVE;
-    int i = 0;
+    int i;
     i++;
     changeMethod1();
@@ -76 +72 @@
   void changeMethod() {
     OBSERVE;
-    int i = 0;
+    int i;
     i++;
     subObservable->changeMethod();
@@ -114 +110 @@
   simpleObservable1->signOn(observer2);
   simpleObservable1->signOn(observer3);
-
   simpleObservable2->signOn(observer2);
   simpleObservable2->signOn(observer4);
@@ -186 +181 @@
   CPPUNIT_ASSERT(true);
 }
+
+/********************************************** 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;
+};