X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FTimerDispatcher.test.cc;h=9f0599c607f0df9bc8796b513273ae495b81855d;hb=40fa3e3f1e0f639c68bd15bf469e35045f94abee;hp=46e9a82aaaa2985c78620b561d5b3432998b996e;hpb=e8a31ca63d661c8dd5402025c771b87798094a93;p=senf.git diff --git a/Scheduler/TimerDispatcher.test.cc b/Scheduler/TimerDispatcher.test.cc index 46e9a82..9f0599c 100644 --- a/Scheduler/TimerDispatcher.test.cc +++ b/Scheduler/TimerDispatcher.test.cc @@ -60,16 +60,26 @@ BOOST_AUTO_UNIT_TEST(timerDispatcher) senf::ClockService::clock_type t (senf::ClockService::now()); senf::scheduler::TimerDispatcher::timer_id id; SENF_CHECK_NO_THROW( - id = dispatcher.add( t + senf::ClockService::milliseconds(500), &handler ) ); + id = dispatcher.add( "testTimer", t + senf::ClockService::milliseconds(500), &handler ) ); SENF_CHECK_NO_THROW( dispatcher.unblockSignals() ); SENF_CHECK_NO_THROW( manager.processOnce() ); SENF_CHECK_NO_THROW( dispatcher.blockSignals() ); SENF_CHECK_NO_THROW( runner.run() ); senf::ClockService::clock_type t2 (senf::ClockService::now()); BOOST_CHECK( called ); - BOOST_CHECK_PREDICATE( is_close, (t2)(t + senf::ClockService::milliseconds(500)) ); + BOOST_CHECK_PREDICATE( is_close, (t2-t)(senf::ClockService::milliseconds(500)) ); SENF_CHECK_NO_THROW( dispatcher.remove(id) ); + + called=false; + t = senf::ClockService::now(); + SENF_CHECK_NO_THROW( dispatcher.add( "testTimer", t, &handler ) ); + SENF_CHECK_NO_THROW( dispatcher.unblockSignals() ); + SENF_CHECK_NO_THROW( manager.processOnce() ); + SENF_CHECK_NO_THROW( dispatcher.blockSignals() ); + SENF_CHECK_NO_THROW( runner.run() ); + BOOST_CHECK_PREDICATE( is_close, (t) (senf::ClockService::now()) ); + BOOST_CHECK( called ); } ///////////////////////////////cc.e////////////////////////////////////////