switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / PPI / Route.test.cc

diff --git a/senf/PPI/Route.test.cc b/senf/PPI/Route.test.cc
index f798e4f..d94c04e 100644 (file)
--- a/senf/PPI/Route.test.cc
+++ b/senf/PPI/Route.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 Route unit tests */
@@ -43,7 +48,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace ppi = senf::ppi;
 namespace connector = ppi::connector;
@@ -65,7 +70,7 @@ namespace {
         ppi::DebugEvent event;
 
         ppi::ForwardingRoute * rt;
-        
+
         RouteTester() : events(0), throttles(0) {
                    route( activeIn,  activeOut  );  // non-forwarding
             rt = & route( activeIn,  passiveOut );  // forward throttling
@@ -99,7 +104,7 @@ namespace {
         void throttleRequest() {
             ++ throttles;
         }
-        
+
         void unthrottleRequest() {
             -- throttles;
         }
@@ -109,7 +114,7 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(route)
+SENF_AUTO_UNIT_TEST(route)
 {
     debug::PassiveSource passiveSource;
     debug::ActiveSource activeSource;
@@ -145,9 +150,9 @@ BOOST_AUTO_UNIT_TEST(route)
     passiveSink.input.unthrottle();
     BOOST_CHECK( activeSource );
     BOOST_CHECK( tester.event.enabled() );
-    
+
     // Now throttle the passive source by exhausting the queue
-    
+
     BOOST_CHECK( p1 == activeSink.request() );
     BOOST_CHECK( passiveSource.output.throttled() );
     BOOST_CHECK( ! tester.activeIn );
@@ -155,7 +160,7 @@ BOOST_AUTO_UNIT_TEST(route)
     BOOST_CHECK( tester.passiveOut.throttled() );
     BOOST_CHECK( ! activeSink );
     BOOST_CHECK( ! tester.event.enabled() );
-    
+
     passiveSource.submit(p1);
     BOOST_CHECK( activeSink );
     BOOST_CHECK( tester.event.enabled() );
@@ -178,14 +183,14 @@ BOOST_AUTO_UNIT_TEST(route)
     BOOST_CHECK( activeSink );
 }
 
-///////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // test connection new modules on runtime
 
 namespace {
     void timeout() {
         senf::scheduler::terminate();
     }
-    
+
     // just a helper class for the test
     struct ModuleConnector {
         module::PriorityJoin & join_;
@@ -197,7 +202,7 @@ namespace {
         }
         boost::scoped_ptr<module::PassiveQueue> queue;
     };
-    
+
     class TestSink : public module::Module
     {
         SENF_PPI_MODULE(TestSink);
@@ -209,36 +214,38 @@ namespace {
         }
     private:
         void request() {
-            SENF_ASSERT(input());
+            SENF_ASSERT(input(), "TestSink called without packet");
         }
     };
 }
 
-BOOST_AUTO_UNIT_TEST(connect_runtime)
+SENF_AUTO_UNIT_TEST(connect_runtime)
 {
     TestSink sink;
     module::ActiveFeeder feeder;
     module::PriorityJoin join;
     module::CloneSource source1 (senf::DataPacket::create());
-    
+
     ppi::connect( source1, join);
     ppi::connect( join, feeder);
     ppi::connect( feeder, sink);
-    
+
     ModuleConnector moduleConnector ( join);
-    senf::scheduler::TimerEvent timer ( 
+    senf::scheduler::TimerEvent timer (
         "connect_runtime timer",
         senf::membind(&ModuleConnector::connect, &moduleConnector),
         senf::ClockService::now() + senf::ClockService::milliseconds(250));
-    
+
     senf::scheduler::TimerEvent timeoutTimer (
         "connect_runtime test timeoutTimer", &timeout,
         senf::ClockService::now() + senf::ClockService::milliseconds(500));
-    
+
     senf::ppi::run();
+
+    BOOST_CHECK( true );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f