X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.test.cc;h=f3f498edf96df3cb91172ab2b803c9749a0deaa9;hb=d6abda313f70c8a849c5e3f3bbfc12ce301789f1;hp=6845277b50e312c6ecfd5d1eeec78bc61be19620;hpb=c5ab87643518405aa5171ed4602f7234873a4900;p=senf.git

diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc
index 6845277..f3f498e 100644
--- a/Scheduler/Scheduler.test.cc
+++ b/Scheduler/Scheduler.test.cc
@@ -1,6 +1,7 @@
+
 // $Id$
 //
-// Copyright (C) 2006 
+// Copyright (C) 2006
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
 //     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
@@ -38,18 +39,18 @@
 
 #include "Scheduler.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-using namespace satcom::lib;
+using namespace senf;
 
 namespace {
-    
+
     char const * SOCK_PATH = "/tmp/sched_test.sock";
-    
+
     void error(char const * fn, char const * proc="")
     {
         std::cerr << "\n" << proc << fn << ": " << strerror(errno) << std::endl;
@@ -107,7 +108,7 @@ namespace {
             error("fork");
             return 0;
         }
-            
+
         sleep(1); // Wait for the server socket to be opened
         return pid;
     }
@@ -143,7 +144,7 @@ namespace {
     void callback(int fd, Scheduler::EventId ev)
     {
         event = ev;
-        switch (event) {
+        switch (event & Scheduler::EV_ALL) {
         case Scheduler::EV_READ:
             size = recv(fd,buffer,1024,0);
             break;
@@ -155,20 +156,15 @@ namespace {
             size = write(fd,buffer,size);
             Scheduler::instance().terminate();
             break;
-        case Scheduler::EV_HUP:
-        case Scheduler::EV_ERR:
-        case Scheduler::EV_NONE:
-        case Scheduler::EV_ALL:
-            ;
         }
         Scheduler::instance().terminate();
     }
 
-    void timeout() 
+    void timeout()
     {
-	Scheduler::instance().terminate();
+        Scheduler::instance().terminate();
     }
-     
+
     struct HandleWrapper
     {
         HandleWrapper(int fd,std::string const & tag) : fd_(fd), tag_(tag) {}
@@ -188,11 +184,11 @@ namespace {
         callback(handle.fd_,event);
     }
 
-    bool is_close(MicroTime a, MicroTime b)
+    bool is_close(ClockService::clock_type a, ClockService::clock_type b)
     {
-	return (a<b ? b-a : a-b) < 10100; // a little bit over 10ms
+        return (a<b ? b-a : a-b) < 10100000UL; // a little bit over 10ms
     }
-	    
+
 }
 
 BOOST_AUTO_UNIT_TEST(scheduler)
@@ -209,7 +205,7 @@ BOOST_AUTO_UNIT_TEST(scheduler)
     memset(&sun,0,sizeof(sun));
     sun.sun_family = AF_UNIX;
     strcpy(sun.sun_path,SOCK_PATH);
-    
+
     if (connect(sock,(struct sockaddr*)&sun,sizeof(sun))<0) {
         error("connect");
         BOOST_FAIL("connect");
@@ -227,14 +223,16 @@ BOOST_AUTO_UNIT_TEST(scheduler)
     buffer[size]=0;
     BOOST_CHECK_EQUAL( buffer, "READ" );
 
-    BOOST_CHECK_NO_THROW( Scheduler::instance().timeout(100,&timeout) );
-    BOOST_CHECK_NO_THROW( Scheduler::instance().timeout(200,&timeout) );
-    MicroTime t (now());
+    BOOST_CHECK_NO_THROW( Scheduler::instance().timeout(
+                              ClockService::now()+ClockService::milliseconds(100),&timeout) );
+    BOOST_CHECK_NO_THROW( Scheduler::instance().timeout(
+                              ClockService::now()+ClockService::milliseconds(200),&timeout) );
+    ClockService::clock_type t (ClockService::now());
     BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
-    BOOST_CHECK_PREDICATE( is_close, (now()) (t+100*1000) );
+    BOOST_CHECK_PREDICATE( is_close, (ClockService::now()) (t+ClockService::milliseconds(100)) );
     BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
-    BOOST_CHECK_PREDICATE( is_close, (now()) (t+200*1000) );
-    
+    BOOST_CHECK_PREDICATE( is_close, (ClockService::now()) (t+ClockService::milliseconds(200)) );
+
     HandleWrapper handle(sock,"TheTag");
     BOOST_CHECK_NO_THROW( Scheduler::instance().add(handle,&handleCallback,Scheduler::EV_WRITE) );
     strcpy(buffer,"WRITE");
@@ -245,8 +243,9 @@ BOOST_AUTO_UNIT_TEST(scheduler)
 
     BOOST_CHECK_NO_THROW( Scheduler::instance().remove(handle,Scheduler::EV_WRITE) );
     event = Scheduler::EV_NONE;
+    sleep(1);
     BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
-    BOOST_CHECK_EQUAL( event, Scheduler::EV_READ );
+    BOOST_CHECK_EQUAL( event, Scheduler::EventId(Scheduler::EV_READ|Scheduler::EV_HUP) );
     BOOST_REQUIRE_EQUAL( size, 2 );
     buffer[size]=0;
     BOOST_CHECK_EQUAL( buffer, "OK" );
@@ -264,5 +263,10 @@ BOOST_AUTO_UNIT_TEST(scheduler)
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: