X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FSocketSource.test.cc;h=f922db89baee98482d1cc7c1ce0d4331aac81c86;hb=92f8630b75f3ef50e73c48cde58645dcd1534e27;hp=47cc426fe91ac0a8b927adfda09b6faf6dcf136e;hpb=d6abda313f70c8a849c5e3f3bbfc12ce301789f1;p=senf.git diff --git a/PPI/SocketSource.test.cc b/PPI/SocketSource.test.cc index 47cc426..f922db8 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 // // 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" @@ -47,7 +47,7 @@ namespace debug = module::debug; namespace { void timeout() { - senf::Scheduler::instance().terminate(); + senf::scheduler::terminate(); } } @@ -64,8 +64,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() );