X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FRateFilter.test.cc;h=35ec9bc6946968a42d6c59021746a9f0301b3f57;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=6557c0785c41db7b81d9356c2307a3f2f542af8e;hpb=b3f18227e13770f6943ab867b9b1eef9dbbea773;p=senf.git diff --git a/senf/PPI/RateFilter.test.cc b/senf/PPI/RateFilter.test.cc index 6557c07..35ec9bc 100644 --- a/senf/PPI/RateFilter.test.cc +++ b/senf/PPI/RateFilter.test.cc @@ -44,24 +44,24 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(rateFilter) +SENF_AUTO_UNIT_TEST(rateFilter) { module::RateFilter rateFilter ( senf::ClockService::milliseconds(100) ); debug::PassiveSource source; debug::PassiveSink sink; - + ppi::connect(source, rateFilter); ppi::connect(rateFilter, sink); - + std::string data ("TEST"); senf::Packet p (senf::DataPacket::create(data)); for (int i=0; i<10; i++) - source.submit(p); - + source.submit(p); + senf::scheduler::TimerEvent timer ( "rateFilter test timer", &timeout, senf::ClockService::now() + senf::ClockService::milliseconds(250)); - + senf::ppi::run(); BOOST_CHECK_EQUAL( rateFilter.interval(), senf::ClockService::milliseconds(100) ); @@ -80,7 +80,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(rateFilter_changeInterval) +SENF_AUTO_UNIT_TEST(rateFilter_changeInterval) { char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS")); if (! enabled) { @@ -90,24 +90,24 @@ BOOST_AUTO_UNIT_TEST(rateFilter_changeInterval) module::RateFilter rateFilter ( senf::ClockService::milliseconds(100) ); debug::PassiveSource source; debug::PassiveSink sink; - + ppi::connect(source, rateFilter); ppi::connect(rateFilter, sink); - + std::string data ("TEST"); senf::Packet p (senf::DataPacket::create(data)); for (int i=0; i<10; i++) - source.submit(p); - + source.submit(p); + senf::scheduler::TimerEvent timeoutTimer ( "rateFilter test timer", &timeout, senf::ClockService::now() + senf::ClockService::milliseconds(675)); - + RateFilter_IntervalChanger intervalChanger (rateFilter); - senf::scheduler::TimerEvent timer ( "RateFilter_IntervalChanger timer", + senf::scheduler::TimerEvent timer ( "RateFilter_IntervalChanger timer", senf::membind(&RateFilter_IntervalChanger::changeInterval, intervalChanger), senf::ClockService::now() + senf::ClockService::milliseconds(250)); - + senf::ppi::run(); BOOST_CHECK_EQUAL( rateFilter.interval(), senf::ClockService::milliseconds(200) );