X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2Fsingleton.test.cc;h=45ae34aff212a5a4a6d50e7a4336c53b9c8cef41;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=9d5785cb3b4f5036e441f27f4e6034df9e81c967;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/singleton.test.cc b/senf/Utils/singleton.test.cc
index 9d5785c..45ae34a 100644
--- a/senf/Utils/singleton.test.cc
+++ b/senf/Utils/singleton.test.cc
@@ -29,6 +29,7 @@
 // Custom includes
 #include <iostream>
 #include "singleton.hh"
+#include "IgnoreValue.hh"
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
@@ -54,7 +55,7 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(sInGlEtOn)
+SENF_AUTO_UNIT_TEST(sInGlEtOn)
 {
     BOOST_CHECK_EQUAL( Test::instance().foo(), 1234 );
     BOOST_CHECK( Test::alive() );
@@ -86,7 +87,7 @@ namespace {
         ~AliveTest2();
     };
 
-    AliveTest1::AliveTest1() 
+    AliveTest1::AliveTest1()
     {
         test2Alive = AliveTest2::alive();
     }
@@ -94,8 +95,12 @@ namespace {
     AliveTest1::~AliveTest1()
     {
         if (test2Dead) {
-            assert( ! AliveTest2::alive() );
-            std::cerr << "singleton alive test ok\n";
+            if (! AliveTest2::alive() )
+                std::cerr << "singleton alive test ok\n";
+            else {
+                std::cerr << "singleton alive test 2 NOT ok!\n";
+                throw 1;
+            }
         }
         test1Dead = true;
     }
@@ -108,18 +113,22 @@ namespace {
     AliveTest2::~AliveTest2()
     {
         if (test1Dead) {
-            assert( ! AliveTest1::alive() );
-            std::cerr << "singleton alive test ok\n";
+            if (! AliveTest1::alive() )
+                std::cerr << "singleton alive test ok\n";
+            else {
+                std::cerr << "singleton alive test 1 NOT ok!\n";
+                throw 1;
+            }
         }
         test2Dead = true;
     }
 
 }
 
-BOOST_AUTO_UNIT_TEST(singletonAlive)
+SENF_AUTO_UNIT_TEST(singletonAlive)
 {
-    (void) AliveTest1::instance();
-    (void) AliveTest2::instance();
+    senf::IGNORE( AliveTest1::instance() );
+    senf::IGNORE( AliveTest2::instance() );
 
     BOOST_CHECK( (test1Alive && !test2Alive) || (!test1Alive && test2Alive) );
     BOOST_CHECK( AliveTest1::alive() );