X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FTimerEvent.test.cc;h=e7b61412726d54161b010e6e1b75c8736f07ab90;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=cbab9f6c2da46c2533ba04112cec6d02c040d370;hpb=8057a9e389e33771aad9c78538f76d0e82ad7adb;p=senf.git diff --git a/Scheduler/TimerEvent.test.cc b/Scheduler/TimerEvent.test.cc index cbab9f6..e7b6141 100644 --- a/Scheduler/TimerEvent.test.cc +++ b/Scheduler/TimerEvent.test.cc @@ -21,13 +21,14 @@ // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** \file - \brief TimerEvent.test unit tests */ + \brief TimerEvent unit tests */ //#include "TimerEvent.test.hh" //#include "TimerEvent.test.ih" // Custom includes #include "TimerEvent.hh" +#include "Scheduler.hh" #include "../Utils//auto_unit_test.hh" #include @@ -61,12 +62,7 @@ BOOST_AUTO_UNIT_TEST(timerDispatcher) SENF_CHECK_NO_THROW( timer.disable() ); SENF_CHECK_NO_THROW( timer.enable() ); BOOST_CHECK( timer.enabled() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().enable() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().reschedule() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::FdManager::instance().processOnce() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().prepareRun() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::FIFORunner::instance().run() ); - SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().disable() ); + SENF_CHECK_NO_THROW( senf::scheduler::process() ); senf::ClockService::clock_type t2 (senf::ClockService::now()); BOOST_CHECK( called ); BOOST_CHECK( ! timer.enabled() );