moved statistics classes from NetEmu to SENF

[senf.git] / Scheduler / TimerEvent.test.cc

diff --git a/Scheduler/TimerEvent.test.cc b/Scheduler/TimerEvent.test.cc
index cbab9f6..e7b6141 100644 (file)
--- 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>
@@ -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() );