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

File:

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

src/unittests/ObserverTest.cpp ¶

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