X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FSocketSink.test.cc;h=5b7f420ec67de23312a6bb7809782976173e6373;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=69532b62f08914f45b96dd1d69282947d00cfde0;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git diff --git a/PPI/SocketSink.test.cc b/PPI/SocketSink.test.cc index 69532b6..5b7f420 100644 --- a/PPI/SocketSink.test.cc +++ b/PPI/SocketSink.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 SocketSink.test unit tests */ + \brief SocketSink unit tests */ //#include "SocketSink.test.hh" //#include "SocketSink.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(); } } @@ -84,8 +82,9 @@ BOOST_AUTO_UNIT_TEST(activeSocketSink) senf::UDPv4ClientSocketHandle inputSocket; inputSocket.bind(senf::INet4SocketAddress("localhost:44344")); - senf::Scheduler::instance().timeout( - senf::ClockService::now() + senf::ClockService::milliseconds(100), &timeout); + senf::scheduler::TimerEvent timer ( + "activeSocketSink test timer", &timeout, + senf::ClockService::now() + senf::ClockService::milliseconds(100)); source.submit(p); senf::ppi::run();