X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FModule.test.cc;h=ca678443d48da2073151d34f9fd63d3bdb791421;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=1fe9b7b433165f06f91950e4d4c21231b43c7b35;hpb=48bbf27e9e89d6eba4754fba65d70a15b115ac8b;p=senf.git

diff --git a/PPI/Module.test.cc b/PPI/Module.test.cc
index 1fe9b7b..ca67844 100644
--- a/PPI/Module.test.cc
+++ b/PPI/Module.test.cc
@@ -1,6 +1,8 @@
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// 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
@@ -19,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Module.test unit tests */
+    \brief Module unit tests */
 
 //#include "Module.test.hh"
 //#include "Module.test.ih"
@@ -30,7 +32,7 @@
 #include "Setup.hh"
 #include "Module.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include <boost/type_traits.hpp>
 
@@ -44,21 +46,23 @@ namespace debug = ppi::module::debug;
 namespace {
     class TestModule : public ppi::module::Module
     {
+        SENF_PPI_MODULE(TestModule);
+
     public:
-        connector::ActiveOutput output;
+        connector::ActiveOutput<> output;
 
         ppi::DebugEvent event;
 
         TestModule() {
             noroute(output);
-            registerEvent(&TestModule::onEvent, event);
+            registerEvent(event, &TestModule::onEvent);
         }
 
         void onEvent() {
             output(senf::DataPacket::create());
         }
 
-        using ppi::module::Module::eventTime;
+        using ppi::module::Module::time;
     };
 }
 
@@ -67,14 +71,13 @@ BOOST_AUTO_UNIT_TEST(module)
     // route and registerEvent are tested in Route.test.cc
 
     TestModule tester;
-    debug::PassivePacketSink sink;
-    ppi::connect(tester.output, sink.input);
+    debug::PassiveSink sink;
+    ppi::connect(tester, sink);
     ppi::init();
 
     tester.event.trigger();
     BOOST_CHECK_EQUAL( sink.size(), 1u );
-    BOOST_CHECK_EQUAL( (boost::posix_time::microsec_clock::universal_time() - 
-                        tester.eventTime()).total_seconds(), 0 );
+    BOOST_CHECK( senf::ClockService::now() - tester.time() < senf::ClockService::seconds(1) );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////