X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2Fsingleton.test.cc;h=a6084c51de42cee70dacd23493182bdeea333ea2;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=348605a5368b4a316ec1a040491e2604475b659a;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/singleton.test.cc b/senf/Utils/singleton.test.cc
index 348605a..a6084c5 100644
--- a/senf/Utils/singleton.test.cc
+++ b/senf/Utils/singleton.test.cc
@@ -29,12 +29,13 @@
 // Custom includes
 #include <iostream>
 #include "singleton.hh"
+#include "IgnoreValue.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -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,25 +113,29 @@ 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() );
     BOOST_CHECK( AliveTest2::alive() );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_