X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FSocketSource.test.cc;h=c8947a1ecc5638048d796c0bcad56fd1a6ef7e71;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=e2ec5037ee7447f6059dfcb8c7451f042d3d4068;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git diff --git a/PPI/SocketSource.test.cc b/PPI/SocketSource.test.cc index e2ec503..c8947a1 100644 --- a/PPI/SocketSource.test.cc +++ b/PPI/SocketSource.test.cc @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // 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" @@ -39,15 +39,13 @@ #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() );