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

[senf.git] / senf / Scheduler / ClockService.test.cc

diff --git a/senf/Scheduler/ClockService.test.cc b/senf/Scheduler/ClockService.test.cc
index b3fb4a6..c6e633d 100644 (file)
--- a/senf/Scheduler/ClockService.test.cc
+++ b/senf/Scheduler/ClockService.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 ClockService unit tests */
@@ -34,11 +39,11 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
-    bool is_close_clock(senf::ClockService::clock_type a, senf::ClockService::clock_type b, 
+    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;
@@ -54,17 +59,24 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(clockService)
+SENF_AUTO_UNIT_TEST(clockService)
 {
+    BOOST_CHECK( senf::ClockService::abstime(senf::ClockService::clock_type(0)).is_not_a_date_time());
+
+    char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS"));
+    BOOST_WARN_MESSAGE(enabled, "Set SENF_TIMING_CRITICAL_TESTS to not skip timing critical tests");
+    BOOST_CHECK( true );
+
     senf::ClockService::restart(); // So we know, when the signal will be delivered
-    
+
     senf::ClockService::clock_type t1 (senf::ClockService::now());
     delay(200);
     senf::ClockService::clock_type t2 (senf::ClockService::now());
-    BOOST_CHECK_PREDICATE( is_close_clock,
-                           (t1 + senf::ClockService::milliseconds(200)) 
-                           (t2)
-                           (senf::ClockService::milliseconds(100)) );
+    if (enabled)
+        BOOST_CHECK_PREDICATE( is_close_clock,
+                               (t1 + senf::ClockService::milliseconds(200))
+                               (t2)
+                               (senf::ClockService::milliseconds(100)) );
 
     t1 = t2;
 
@@ -72,29 +84,34 @@ BOOST_AUTO_UNIT_TEST(clockService)
     delay(1*1000);
 
     t2 = senf::ClockService::now();
-    BOOST_CHECK_PREDICATE( is_close_clock,
-                           (t1 + senf::ClockService::seconds(1))
-                           (t2)
-                           (senf::ClockService::milliseconds(500)) );
+    if (enabled)
+        BOOST_CHECK_PREDICATE( is_close_clock,
+                               (t1 + senf::ClockService::seconds(1))
+                               (t2)
+                               (senf::ClockService::milliseconds(500)) );
 
     t1 = t2;
 
     delay(200);
-    BOOST_CHECK_PREDICATE( is_close_clock,
-                           (t1 + senf::ClockService::milliseconds(200))
-                           (senf::ClockService::now())
-                           (senf::ClockService::milliseconds(100)) );
+    if (enabled)
+        BOOST_CHECK_PREDICATE( is_close_clock,
+                               (t1 + senf::ClockService::milliseconds(200))
+                               (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::milliseconds(100)) );
+    if (enabled)
+        BOOST_CHECK_PREDICATE( is_close_clock,
+                               (t1 + senf::ClockService::milliseconds(200))
+                               (senf::ClockService::now())
+                               (senf::ClockService::milliseconds(100)) );
+
+    BOOST_CHECK_EQUAL( senf::ClockService::seconds(1),  senf::ClockService::milliseconds(1000) );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f