X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FModule.test.cc;h=47795da47aca1889750aaa482128e41dad84a88c;hb=b52002fa2001e6472d6aa3dde263b85f654c6e8e;hp=1fe9b7b433165f06f91950e4d4c21231b43c7b35;hpb=48bbf27e9e89d6eba4754fba65d70a15b115ac8b;p=senf.git diff --git a/PPI/Module.test.cc b/PPI/Module.test.cc index 1fe9b7b..47795da 100644 --- a/PPI/Module.test.cc +++ b/PPI/Module.test.cc @@ -44,6 +44,8 @@ namespace debug = ppi::module::debug; namespace { class TestModule : public ppi::module::Module { + SENF_PPI_MODULE(TestModule); + public: connector::ActiveOutput output; @@ -51,14 +53,14 @@ namespace { 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 +69,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////////////////////////////////////////