X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FJoins.test.cc;h=7e14488bf193d6e785977473feea0899bdb46f11;hb=92f8630b75f3ef50e73c48cde58645dcd1534e27;hp=8e336bbe498cec81089e4b9148da91fa39da3391;hpb=914af680a37d303da51e3877972ca9bd68d6190b;p=senf.git diff --git a/PPI/Joins.test.cc b/PPI/Joins.test.cc index 8e336bb..7e14488 100644 --- a/PPI/Joins.test.cc +++ b/PPI/Joins.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 Joins.test unit tests */ + \brief Joins unit tests */ //#include "Joins.test.hh" //#include "Joins.test.ih" @@ -30,9 +30,9 @@ #include "Joins.hh" #include "DebugModules.hh" #include "Setup.hh" -#include "Packets/Packets.hh" +#include "../Packets/Packets.hh" -#include +#include "../Utils/auto_unit_test.hh" #include #define prefix_ @@ -45,10 +45,10 @@ namespace debug = module::debug; BOOST_AUTO_UNIT_TEST(passiveJoin) { - debug::ActivePacketSource source1; - debug::ActivePacketSource source2; + debug::ActiveSource source1; + debug::ActiveSource source2; module::PassiveJoin join; - debug::PassivePacketSink sink; + debug::PassiveSink sink; ppi::connect(source1, join); ppi::connect(source2, join); @@ -75,10 +75,10 @@ BOOST_AUTO_UNIT_TEST(passiveJoin) BOOST_AUTO_UNIT_TEST(priorityJoin) { - debug::PassivePacketSource source1; - debug::PassivePacketSource source2; + debug::PassiveSource source1; + debug::PassiveSource source2; module::PriorityJoin join; - debug::ActivePacketSink sink; + debug::ActiveSink sink; ppi::connect(source1, join); ppi::connect(source2, join);