X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FClockService.test.cc;h=21b9288f9e38825af5cad83a8bf16c6218e65af8;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=182755b21fb85c4b81df91288233071825130f2d;hpb=c6811d4b2fdd60eb33af627ae287dd228f435d14;p=senf.git

diff --git a/Scheduler/ClockService.test.cc b/Scheduler/ClockService.test.cc
index 182755b..21b9288 100644
--- a/Scheduler/ClockService.test.cc
+++ b/Scheduler/ClockService.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ClockService.test unit tests */
+    \brief ClockService unit tests */
 
 //#include "ClockService.test.hh"
 //#include "ClockService.test.ih"
@@ -39,13 +39,7 @@
 namespace {
 
     bool is_close_clock(senf::ClockService::clock_type a, senf::ClockService::clock_type b, 
-                        unsigned long delta = senf::ClockService::milliseconds(100))
-    {
-        return (a<b ? b-a : a-b ) < delta;
-    }
-
-    bool is_close_pt(boost::posix_time::ptime a, boost::posix_time::ptime b,
-                     boost::posix_time::time_duration delta = boost::posix_time::milliseconds(100) )
+                        senf::ClockService::clock_type delta)
     {
         return (a<b ? b-a : a-b ) < delta;
     }
@@ -69,7 +63,8 @@ BOOST_AUTO_UNIT_TEST(clockService)
     senf::ClockService::clock_type t2 (senf::ClockService::now());
     BOOST_CHECK_PREDICATE( is_close_clock,
                            (t1 + senf::ClockService::milliseconds(200)) 
-                           (t2) );
+                           (t2)
+                           (senf::ClockService::milliseconds(100)) );
 
     t1 = t2;
 
@@ -87,14 +82,16 @@ BOOST_AUTO_UNIT_TEST(clockService)
     delay(200);
     BOOST_CHECK_PREDICATE( is_close_clock,
                            (t1 + senf::ClockService::milliseconds(200))
-                           (senf::ClockService::now()) );
+                           (senf::ClockService::now())
+                           (senf::ClockService::milliseconds(100)) );
 
     // The next check validates that the clock service itimer/heartbeat_ is correctly reset after a
     // clock-skew is detected
 
     BOOST_CHECK_PREDICATE( is_close_clock,
                            (t1 + senf::ClockService::milliseconds(200))
-                           (senf::ClockService::now()) );
+                           (senf::ClockService::now()) 
+                           (senf::ClockService::milliseconds(100)) );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////