fixes for ClockService::clock_type -> RestrictedInt change introduced by last commit

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

diff --git a/senf/PPI/RateFilter.test.cc b/senf/PPI/RateFilter.test.cc
index 6557c07..1404fa2 100644 (file)
--- a/senf/PPI/RateFilter.test.cc
+++ b/senf/PPI/RateFilter.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief RateFilter unit tests */
@@ -33,38 +38,36 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace ppi = senf::ppi;
 namespace module = ppi::module;
 namespace debug = module::debug;
 
 namespace {
-    void timeout() {
-        senf::scheduler::terminate();
+    void runPPI(senf::ClockService::clock_type t) {
+        senf::scheduler::TimerEvent timeout(
+                "emulatedDvbInterface test timer", &senf::scheduler::terminate, senf::scheduler::now() + t);
+        senf::ppi::run();
     }
 }
 
-BOOST_AUTO_UNIT_TEST(rateFilter)
+SENF_AUTO_UNIT_TEST(rateFilter)
 {
-    module::RateFilter rateFilter ( senf::ClockService::milliseconds(100) );
+    module::RateFilter rateFilter ( senf::ClockService::milliseconds(200) );
     debug::PassiveSource source;
     debug::PassiveSink sink;
-    
+
     ppi::connect(source, rateFilter);
     ppi::connect(rateFilter, sink);
-    
+
     std::string data ("TEST");
     senf::Packet p (senf::DataPacket::create(data));
     for (int i=0; i<10; i++)
-        source.submit(p); 
-    
-    senf::scheduler::TimerEvent timer (
-        "rateFilter test timer", &timeout,
-        senf::ClockService::now() + senf::ClockService::milliseconds(250));
-    
-    senf::ppi::run();
+        source.submit(p);
 
-    BOOST_CHECK_EQUAL( rateFilter.interval(), senf::ClockService::milliseconds(100) );
+    runPPI( senf::ClockService::milliseconds(500));
+
+    BOOST_CHECK_EQUAL( rateFilter.interval(), senf::ClockService::milliseconds(200) );
     BOOST_CHECK_EQUAL( sink.size(), 2u );
 }
 
@@ -80,7 +83,7 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(rateFilter_changeInterval)
+SENF_AUTO_UNIT_TEST(rateFilter_changeInterval)
 {
     char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS"));
     if (! enabled) {
@@ -90,32 +93,28 @@ BOOST_AUTO_UNIT_TEST(rateFilter_changeInterval)
     module::RateFilter rateFilter ( senf::ClockService::milliseconds(100) );
     debug::PassiveSource source;
     debug::PassiveSink sink;
-    
+
     ppi::connect(source, rateFilter);
     ppi::connect(rateFilter, sink);
-    
+
     std::string data ("TEST");
     senf::Packet p (senf::DataPacket::create(data));
     for (int i=0; i<10; i++)
-        source.submit(p); 
-    
-    senf::scheduler::TimerEvent timeoutTimer (
-        "rateFilter test timer", &timeout,
-        senf::ClockService::now() + senf::ClockService::milliseconds(675));
-    
+        source.submit(p);
+
     RateFilter_IntervalChanger intervalChanger (rateFilter);
-    senf::scheduler::TimerEvent timer ( "RateFilter_IntervalChanger timer", 
+    senf::scheduler::TimerEvent timer ( "RateFilter_IntervalChanger timer",
         senf::membind(&RateFilter_IntervalChanger::changeInterval, intervalChanger),
         senf::ClockService::now() + senf::ClockService::milliseconds(250));
-    
-    senf::ppi::run();
+
+    runPPI( senf::ClockService::milliseconds(675));
 
     BOOST_CHECK_EQUAL( rateFilter.interval(), senf::ClockService::milliseconds(200) );
     if (enabled)
         BOOST_CHECK_EQUAL( sink.size(), 4);
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f