X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FMultiConnectorMixin.test.cc;h=998a5c777bf71272e2aa28b39666b4f14b6e64bf;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=eac542cdf9c9afc05688e967573364d4ca80ef7e;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git diff --git a/senf/PPI/MultiConnectorMixin.test.cc b/senf/PPI/MultiConnectorMixin.test.cc index eac542c..998a5c7 100644 --- a/senf/PPI/MultiConnectorMixin.test.cc +++ b/senf/PPI/MultiConnectorMixin.test.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -27,13 +27,16 @@ //#include "MultiConnectorMixin.test.ih" // Custom includes -#include "PPI.hh" +#include "MultiConnectorMixin.hh" +#include "DebugModules.hh" +#include "Joins.hh" +#include "AnnotationRouter.hh" #include #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace ppi = senf::ppi; namespace connector = ppi::connector; namespace module = ppi::module; @@ -94,7 +97,7 @@ namespace { UserContainerModule() { - noroute(input); + noroute(input); input.onRequest(&UserContainerModule::request); } @@ -111,7 +114,7 @@ namespace { void connectorDestroy(ConnectorType const * c) { Connectors::iterator i ( - std::find_if(connectors_.begin(), connectors_.end(), + std::find_if(connectors_.begin(), connectors_.end(), boost::bind(&Connectors::value_type::get,_1) == c)); if (i != connectors_.end()) connectors_.erase(i); @@ -126,10 +129,10 @@ namespace { } Connectors connectors_; - + friend class module::MultiConnectorMixin, void, void>; }; - + struct IntAnnotation { int value; bool operator<(IntAnnotation const & other) const { return value < other.value; } @@ -202,13 +205,13 @@ SENF_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules) module::PassiveJoin join2; module::AnnotationRouter router; UserContainerModule module; - + ppi::connect(source, join1); ppi::connect(join1, router); ppi::connect(router, 1, join2); ppi::connect(join2, module); ppi::connect(module, sink); - + senf::Packet p (senf::DataPacket::create()); p.annotation().value = 1; @@ -217,7 +220,7 @@ SENF_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules) BOOST_CHECK( sink.pop_front() == p ); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_