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

diff --git a/senf/PPI/MultiConnectorMixin.test.cc b/senf/PPI/MultiConnectorMixin.test.cc
index 841dac1..0c2f220 100644
--- a/senf/PPI/MultiConnectorMixin.test.cc
+++ b/senf/PPI/MultiConnectorMixin.test.cc
@@ -1,24 +1,29 @@
 // $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>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief MultiConnectorMixin.test unit tests */
@@ -27,13 +32,16 @@
 //#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>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace ppi = senf::ppi;
 namespace connector = ppi::connector;
 namespace module = ppi::module;
@@ -94,7 +102,7 @@ namespace {
 
         UserContainerModule()
         {
-            noroute(input); 
+            noroute(input);
             input.onRequest(&UserContainerModule::request);
         }
 
@@ -111,7 +119,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 +134,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 +149,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 +177,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 +202,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 +210,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;
 
@@ -217,7 +225,7 @@ BOOST_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules)
     BOOST_CHECK( sink.pop_front() == p );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_