X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FQueueing.test.cc;h=5f18e15de4a4f253755710e4d51eb16d248f1729;hb=b8ca4a544cce3e6023bb56b712a03d6362f2bb79;hp=cd256b6ef22392d5171ccf8c7bffa1a2656e1e5a;hpb=9e64a6d6a4840325f74502ba959ebd56fbb8441c;p=senf.git diff --git a/PPI/Queueing.test.cc b/PPI/Queueing.test.cc index cd256b6..5f18e15 100644 --- a/PPI/Queueing.test.cc +++ b/PPI/Queueing.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 Queueing.test unit tests */ + \brief Queueing unit tests */ //#include "Queueing.test.hh" //#include "Queueing.test.ih" @@ -31,10 +31,10 @@ #include "Module.hh" #include "Connectors.hh" #include "DebugModules.hh" -#include "Packets/Packets.hh" +#include "../Packets/Packets.hh" #include "Setup.hh" -#include +#include "../Utils/auto_unit_test.hh" #include #define prefix_ @@ -50,8 +50,8 @@ namespace { { SENF_PPI_MODULE(QueueTester); public: - connector::PassiveInput input; - connector::ActiveOutput output; + connector::PassiveInput<> input; + connector::ActiveOutput<> output; QueueTester() { route(input, output); @@ -59,7 +59,7 @@ namespace { input.onRequest(&QueueTester::nop); } - void nop() {} + void nop() { /* no operation */ } void forward() { if (input && output) @@ -71,9 +71,9 @@ namespace { BOOST_AUTO_UNIT_TEST(thresholdQueueing) { - debug::ActivePacketSource source; + debug::ActiveSource source; QueueTester tester; - debug::PassivePacketSink sink; + debug::PassiveSink sink; ppi::connect(source, tester); ppi::connect(tester, sink);