X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FSocketSource.test.cc;h=c8947a1ecc5638048d796c0bcad56fd1a6ef7e71;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=21406260d37658c43bf53c6cdc76128e8f45a568;hpb=a479735a65e334af538b895f182f8efd36a541c5;p=senf.git

diff --git a/PPI/SocketSource.test.cc b/PPI/SocketSource.test.cc
index 2140626..c8947a1 100644
--- a/PPI/SocketSource.test.cc
+++ b/PPI/SocketSource.test.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief SocketSource.test unit tests */
+    \brief SocketSource unit tests */
 
 //#include "SocketSource.test.hh"
 //#include "SocketSource.test.ih"
@@ -34,20 +34,18 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
-
 namespace ppi = senf::ppi;
-namespace connector = ppi::connector;
 namespace module = ppi::module;
 namespace debug = module::debug;
 
 namespace {
     void timeout() {
-        senf::Scheduler::instance().terminate();
+        senf::scheduler::terminate();
     }
 }
 
@@ -64,8 +62,9 @@ BOOST_AUTO_UNIT_TEST(socketSource)
 
     senf::UDPv4ClientSocketHandle outputSocket;
     outputSocket.writeto(senf::INet4SocketAddress("localhost:44344"),data);
-    senf::Scheduler::instance().timeout(
-        senf::ClockService::now() + senf::ClockService::milliseconds(100), &timeout);
+    senf::scheduler::TimerEvent timer (
+        "socketSource test timer", &timeout,
+        senf::ClockService::now() + senf::ClockService::milliseconds(100));
     senf::ppi::run();
 
     BOOST_REQUIRE( ! sink.empty() );