X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FModule.test.cc;h=2cf6334d239add643107f94f3edc912403fb7c5a;hb=82ad2ed94c12c3e53097fef92978de8c28239fab;hp=c54ef51f0447e9843293863d7c94e8bc635de6e4;hpb=122719831e4d0ce7c335a66ed7c80a7ffc2e00e8;p=senf.git diff --git a/PPI/Module.test.cc b/PPI/Module.test.cc index c54ef51..2cf6334 100644 --- a/PPI/Module.test.cc +++ b/PPI/Module.test.cc @@ -30,7 +30,7 @@ #include "Setup.hh" #include "Module.hh" -#include +#include "../Utils/auto_unit_test.hh" #include #include @@ -53,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; }; } @@ -69,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////////////////////////////////////////