X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FIntervalTimer.test.cc;h=45f87f9ad8f3144a3947be7a2c5ea10257252d50;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=b3984e1fea2fa9c56ea279f5902a7d33a96e7092;hpb=e8b91aa6a817af6d9a3714e7b66be6c0d6b0a4e5;p=senf.git

diff --git a/PPI/IntervalTimer.test.cc b/PPI/IntervalTimer.test.cc
index b3984e1..45f87f9 100644
--- a/PPI/IntervalTimer.test.cc
+++ b/PPI/IntervalTimer.test.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief IntervalTimer.test unit tests */
+    \brief IntervalTimer unit tests */
 
 //#include "IntervalTimer.test.hh"
 //#include "IntervalTimer.test.ih"
@@ -31,7 +31,7 @@
 #include "Module.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -41,7 +41,7 @@ namespace module = senf::ppi::module;
 namespace ppi = senf::ppi;
 
 namespace {
-    
+
     class TimerTest : public module::Module
     {
         SENF_PPI_MODULE(TimerTest);
@@ -56,16 +56,16 @@ namespace {
         unsigned n;
 
     public:
-        TimerTest(senf::ClockService::clock_type d_, unsigned n_)
-        :   timer ( senf::ClockService::milliseconds(d_) ), 
-            n     ( n_ ) 
+        TimerTest(senf::ClockService::int64_type d_, unsigned n_)
+        :   timer ( senf::ClockService::milliseconds(d_) ),
+            n     ( n_ )
         {
-            registerEvent( &TimerTest::tick, timer );
+            registerEvent( timer, &TimerTest::tick );
         }
     };
 
-    bool is_close_clock(senf::ClockService::clock_type a, senf::ClockService::clock_type b, 
-                        unsigned long delta = 50000000ul)
+    bool is_close_clock(senf::ClockService::clock_type a, senf::ClockService::clock_type b,
+                        senf::ClockService::clock_type delta)
     {
         return (a<b ? b-a : a-b ) < delta;
     }
@@ -73,12 +73,13 @@ namespace {
 
 BOOST_AUTO_UNIT_TEST(intervalTimer)
 {
-    TimerTest timer (100,4);
+    TimerTest timer (100,3);
     senf::ClockService::clock_type start (senf::ClockService::now());
     senf::ppi::run();
-    BOOST_CHECK_PREDICATE( is_close_clock, 
+    BOOST_CHECK_PREDICATE( is_close_clock,
                            (senf::ClockService::now())
-                           (start+senf::ClockService::milliseconds(400)) );
+                           (start+senf::ClockService::milliseconds(300))
+                           (senf::ClockService::milliseconds(80)) );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////