X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FActiveFeeder.test.cc;h=8ef1a703d9c23977e4fd5397e8d0dfe210848f91;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=995f477a0403defa3bba0bc49eb42fde5e62fcaa;hpb=75090e87ca43f18139c0ba627aedae1b773bf364;p=senf.git

diff --git a/senf/PPI/ActiveFeeder.test.cc b/senf/PPI/ActiveFeeder.test.cc
index 995f477..8ef1a70 100644
--- a/senf/PPI/ActiveFeeder.test.cc
+++ b/senf/PPI/ActiveFeeder.test.cc
@@ -32,7 +32,6 @@
 #include "Setup.hh"
 #include "CloneSource.hh"
 #include <senf/Scheduler/Scheduler.hh>
-#include <senf/Utils/membind.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
@@ -45,18 +44,14 @@ namespace module = senf::ppi::module;
 namespace scheduler = senf::scheduler;
 
 namespace {
-    void timeout() {
-        scheduler::terminate();
-    }
-    
     void run(senf::ClockService::clock_type t) {
-        scheduler::TimerEvent timeoutTimer ("timeoutTimer", &timeout,
-                senf::ClockService::now() + t);
+        scheduler::TimerEvent timeout(
+                "test-timeout", &scheduler::terminate, scheduler::now() + t);
         ppi::run();
     }
 }
 
-BOOST_AUTO_UNIT_TEST(activeFeeder)
+SENF_AUTO_UNIT_TEST(activeFeeder)
 {
     senf::PacketData::byte data[] = { 0xab };
     senf::Packet p (senf::DataPacket::create(data));
@@ -68,9 +63,9 @@ BOOST_AUTO_UNIT_TEST(activeFeeder)
     ppi::connect( source, feeder );
     ppi::connect( feeder, sink   );
 
-    senf::ClockService::clock_type start (senf::ClockService::now());    
+    senf::ClockService::clock_type start (senf::ClockService::now());
     run( senf::ClockService::seconds(1));
-    std::cerr << "\nActiveFeeder: " 
+    std::cerr << "\nActiveFeeder: "
               << (sink.size()*1e9)/(senf::ClockService::now()-start)
               << " packets/s" << std::endl;
     BOOST_CHECK( sink.size() > 0);