X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FMonitorModule.test.cc;h=192b66f32854546998461720cb8511e6d800e89b;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=ab9ce99b70583e0dd5ea1701fa6574b5ecbc014d;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/PPI/MonitorModule.test.cc b/senf/PPI/MonitorModule.test.cc
index ab9ce99..192b66f 100644
--- a/senf/PPI/MonitorModule.test.cc
+++ b/senf/PPI/MonitorModule.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 MonitorModule unit tests */
@@ -34,10 +39,10 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
-    
+
     class PacketCounter : public senf::ppi::module::MonitorModule<>
     {
         SENF_PPI_MODULE(PacketCounter);
@@ -49,17 +54,17 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(monitorModulePassthrough)
+SENF_AUTO_UNIT_TEST(monitorModulePassthrough)
 {
     senf::ppi::module::debug::ActiveSource source;
     senf::ppi::module::debug::PassiveSink sink;
     PacketCounter counter;
-    
+
     senf::ppi::connect(source, counter);
     senf::ppi::connect(counter, sink);
 
     senf::ppi::init();
-    
+
     senf::Packet p (senf::DataPacket::create());
 
     BOOST_CHECK_EQUAL( counter.count, 0u );
@@ -73,7 +78,7 @@ BOOST_AUTO_UNIT_TEST(monitorModulePassthrough)
     BOOST_CHECK( source );
 }
 
-BOOST_AUTO_UNIT_TEST(monitorModuleNoPassthrough)
+SENF_AUTO_UNIT_TEST(monitorModuleNoPassthrough)
 {
     senf::ppi::module::debug::ActiveSource source;
     PacketCounter counter;
@@ -83,14 +88,14 @@ BOOST_AUTO_UNIT_TEST(monitorModuleNoPassthrough)
     senf::ppi::init();
 
     senf::Packet p (senf::DataPacket::create());
-    
+
     BOOST_CHECK_EQUAL( counter.count, 0u );
     source.submit(p);
     BOOST_CHECK_EQUAL( counter.count, 1u );
     BOOST_CHECK( source );
 }
 
-BOOST_AUTO_UNIT_TEST(monitorModuleDynamicConnect)
+SENF_AUTO_UNIT_TEST(monitorModuleDynamicConnect)
 {
     senf::ppi::module::debug::ActiveSource source;
     PacketCounter counter;
@@ -100,7 +105,7 @@ BOOST_AUTO_UNIT_TEST(monitorModuleDynamicConnect)
     senf::ppi::init();
 
     senf::Packet p (senf::DataPacket::create());
-    
+
     BOOST_CHECK_EQUAL( counter.count, 0u );
     source.submit(p);
     BOOST_CHECK_EQUAL( counter.count, 1u );
@@ -125,10 +130,10 @@ BOOST_AUTO_UNIT_TEST(monitorModuleDynamicConnect)
     BOOST_CHECK( source );
     source.submit(p);
     BOOST_CHECK_EQUAL( counter.count, 3u );
-    
+
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_