X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FMultiConnectorMixin.test.cc;h=b387e24bc22b9136db47c51be8c805e5797071d4;hb=73c33f663ff0f65e4656ea5a5f6f07a43a2e1722;hp=841dac199aa6b1f21b7eeff5d187ba8b232c8998;hpb=f221429e5f88f5543393d546babd958db4b5977c;p=senf.git

diff --git a/senf/PPI/MultiConnectorMixin.test.cc b/senf/PPI/MultiConnectorMixin.test.cc
index 841dac1..b387e24 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 <g0dil@berlios.de>
@@ -27,7 +27,10 @@
 //#include "MultiConnectorMixin.test.ih"
 
 // Custom includes
-#include "PPI.hh"
+#include "MultiConnectorMixin.hh"
+#include "DebugModules.hh"
+#include "Joins.hh"
+#include "AnnotationRouter.hh"
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
@@ -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<UserContainerModule, connector::ActiveOutput<>, void, void>;
     };
-        
+
     struct IntAnnotation {
         int value;
         bool operator<(IntAnnotation const & other) const { return value < other.value; }
@@ -141,7 +144,7 @@ namespace {
     { os << value.value; return os; }
 }
 
-BOOST_AUTO_UNIT_TEST(multiConnectorMixin_sequenceContainer)
+SENF_AUTO_UNIT_TEST(multiConnectorMixin_sequenceContainer)
 {
     debug::ActiveSource source1;
     debug::ActiveSource source2;
@@ -169,7 +172,7 @@ BOOST_AUTO_UNIT_TEST(multiConnectorMixin_sequenceContainer)
     BOOST_CHECK_EQUAL( module.count, 1u );
 }
 
-BOOST_AUTO_UNIT_TEST(multiConnectorMixin_userContainer)
+SENF_AUTO_UNIT_TEST(multiConnectorMixin_userContainer)
 {
     debug::ActiveSource source;
     UserContainerModule module;
@@ -194,7 +197,7 @@ BOOST_AUTO_UNIT_TEST(multiConnectorMixin_userContainer)
     BOOST_CHECK_EQUAL( module.connectors().size(), 1u );
 }
 
-BOOST_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules)
+SENF_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules)
 {
     debug::ActiveSource source;
     debug::PassiveSink sink;
@@ -202,13 +205,13 @@ BOOST_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules)
     module::PassiveJoin join2;
     module::AnnotationRouter<IntAnnotation> 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<IntAnnotation>().value = 1;