X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FTimerEvent.test.cc;h=e7b61412726d54161b010e6e1b75c8736f07ab90;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=e7f777ee79e0aa56ab2ac9c577fd5025a174deab;hpb=db007c39287e3c666dd6b53edc8c3404617c7dd5;p=senf.git

diff --git a/Scheduler/TimerEvent.test.cc b/Scheduler/TimerEvent.test.cc
index e7f777e..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 <boost/test/test_tools.hpp>
@@ -52,7 +53,7 @@ namespace {
 
 BOOST_AUTO_UNIT_TEST(timerDispatcher)
 {
-    senf::scheduler::FdManager::instance().timeout(1000);
+    senf::scheduler::detail::FdManager::instance().timeout(1000);
 
     senf::ClockService::clock_type t (senf::ClockService::now());
     {
@@ -61,10 +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().unblockSignals() );
-        SENF_CHECK_NO_THROW( senf::scheduler::FdManager::instance().processOnce() );
-        SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().blockSignals() );
-        SENF_CHECK_NO_THROW( senf::scheduler::FIFORunner::instance().run() );
+        SENF_CHECK_NO_THROW( senf::scheduler::process() );
         senf::ClockService::clock_type t2 (senf::ClockService::now());
         BOOST_CHECK( called );
         BOOST_CHECK( ! timer.enabled() );
@@ -74,10 +72,12 @@ BOOST_AUTO_UNIT_TEST(timerDispatcher)
         t = senf::ClockService::now();
         SENF_CHECK_NO_THROW( timer.timeout(t) );
         BOOST_CHECK( timer.enabled() );
-        SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().unblockSignals() );
-        SENF_CHECK_NO_THROW( senf::scheduler::FdManager::instance().processOnce() );
-        SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().blockSignals() );
-        SENF_CHECK_NO_THROW( senf::scheduler::FIFORunner::instance().run() );
+        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() );
         BOOST_CHECK_PREDICATE( is_close, (t) (senf::ClockService::now()) );
         BOOST_CHECK( called );
     }