Packets/80211Bundle: Complete radiotap dump (incl. unit-test)

[senf.git] / senf / PPI / ActiveFeeder.test.cc

diff --git a/senf/PPI/ActiveFeeder.test.cc b/senf/PPI/ActiveFeeder.test.cc
index 4418d55..8ef1a70 100644 (file)
--- 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,13 +44,9 @@ 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();
     }
 }
@@ -68,9 +63,9 @@ SENF_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);