X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FDebugModules.test.cc;h=f693bbb75fd33b9e4bcac847c25ae3cddc50c4d6;hb=refs%2Fheads%2Fmaster;hp=edd29b8179b17d0baf17f270dea79e93dad905a6;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/DebugModules.test.cc b/senf/PPI/DebugModules.test.cc
index edd29b8..f693bbb 100644
--- a/senf/PPI/DebugModules.test.cc
+++ b/senf/PPI/DebugModules.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 DebubgModules unit tests */
@@ -32,20 +37,20 @@
 
 #define SENF_LOG_CONF (( (senf)(log)(Debug), (_), VERBOSE ))
 
-#include "../Packets/Packets.hh"
+#include <senf/Packets/Packets.hh>
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace debug = senf::ppi::module::debug;
 namespace ppi = senf::ppi;
 
-BOOST_AUTO_UNIT_TEST(debugModules)
+SENF_AUTO_UNIT_TEST(debugModules)
 {
     {
         debug::ActiveSource source;
@@ -53,7 +58,7 @@ BOOST_AUTO_UNIT_TEST(debugModules)
 
         ppi::connect(source, sink);
         ppi::init();
-    
+
         senf::PacketData::byte data[] = { 0x13u, 0x24u, 0x35u };
         senf::Packet p (senf::DataPacket::create(data));
 
@@ -64,7 +69,7 @@ BOOST_AUTO_UNIT_TEST(debugModules)
         BOOST_CHECK( ! sink.input.throttled() );
         BOOST_CHECK_EQUAL( sink.size(), 1u );
         BOOST_CHECK( ! sink.empty() );
-        BOOST_CHECK_EQUAL( 
+        BOOST_CHECK_EQUAL(
             debug::PassiveSink::size_type(std::distance(sink.begin(),sink.end())),
             sink.size() );
         BOOST_CHECK( *sink.begin() == p );
@@ -87,7 +92,7 @@ BOOST_AUTO_UNIT_TEST(debugModules)
         senf::Packet p (senf::DataPacket::create(data));
 
         source.submit(p);
-        
+
         BOOST_CHECK_EQUAL( source.size(), 1u );
         BOOST_CHECK_EQUAL( sink.request(), p );
         BOOST_CHECK_EQUAL( source.size(), 0u );
@@ -95,7 +100,7 @@ BOOST_AUTO_UNIT_TEST(debugModules)
     }
 }
 
-BOOST_AUTO_UNIT_TEST(activeFeederSource)
+SENF_AUTO_UNIT_TEST(activeFeederSource)
 {
     debug::ActiveFeederSource source;
     debug::PassiveSink sink;
@@ -109,7 +114,7 @@ BOOST_AUTO_UNIT_TEST(activeFeederSource)
     BOOST_CHECK_EQUAL( sink.size(), 1u );
 }
 
-BOOST_AUTO_UNIT_TEST(activeFeederSink)
+SENF_AUTO_UNIT_TEST(activeFeederSink)
 {
     debug::PassiveSource source;
     debug::ActiveFeederSink sink;
@@ -128,7 +133,7 @@ BOOST_AUTO_UNIT_TEST(activeFeederSink)
     BOOST_CHECK( source.empty() );
 }
 
-BOOST_AUTO_UNIT_TEST(logSink)
+SENF_AUTO_UNIT_TEST(logSink)
 {
     senf::log::StringTarget logTarget;
     logTarget.route<senf::log::Debug,senf::log::VERBOSE>();
@@ -140,11 +145,11 @@ BOOST_AUTO_UNIT_TEST(logSink)
     senf::PacketData::byte data[] = { 0x13u, 0x24u, 0x35u };
     source.submit( senf::DataPacket::create(data) );
     senf::ppi::run();
-    
+
     BOOST_CHECK( ! logTarget.str().empty() );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_