X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerEventProxy.test.cc;h=dfab9cc559e9384519d518462984076a97d3899e;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=e682687391501d214158d6ca57751ad842ed39de;hpb=2b2af7d62142f61f5804df2184b58e5f7ce3bd06;p=senf.git

diff --git a/senf/Scheduler/TimerEventProxy.test.cc b/senf/Scheduler/TimerEventProxy.test.cc
index e682687..dfab9cc 100644
--- a/senf/Scheduler/TimerEventProxy.test.cc
+++ b/senf/Scheduler/TimerEventProxy.test.cc
@@ -61,15 +61,20 @@ SENF_AUTO_UNIT_TEST(timerEventProxy)
 
     senf::ClockService::clock_type t (senf::ClockService::now());
     {
-        senf::scheduler::TimerEventProxy<int> timers;
+        senf::scheduler::TimerEventProxy<int> timers ("unit-test");
 
-        timers.add( t + senf::ClockService::milliseconds(10000), 0 , &handler);
+//        timers.add( t + senf::ClockService::milliseconds(10000), 0 , &handler);
         timers.add( t + senf::ClockService::milliseconds(800), 4, &handler);
         timers.add( t + senf::ClockService::milliseconds(200), 1, &handler);
         BOOST_CHECK( timers.remove( 4));
+        BOOST_CHECK(! timers.remove( 4));
         timers.add( t + senf::ClockService::milliseconds(700), 2, &handler);
 
-        run( senf::ClockService::milliseconds( 1000));
+        BOOST_CHECK_EQUAL( timers.timeout(1), t + senf::ClockService::milliseconds(200));
+        BOOST_CHECK_EQUAL( timers.timeout(2), t + senf::ClockService::milliseconds(700));
+        BOOST_CHECK_EQUAL( timers.timeout(4), 0);
+
+        run( senf::ClockService::milliseconds( 2000));
 
         BOOST_CHECK( mask == 3);
     }