X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FActiveFeeder.test.cc;h=ec4c378a11ff3c400790c19f7f7f3f8d2e3e1b94;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=fca6880331fdfe88a2eba8af97e39ce4db68e1de;hpb=22f72ccea5685d22d33f8c38b5ffb12dcf51928d;p=senf.git

diff --git a/senf/PPI/ActiveFeeder.test.cc b/senf/PPI/ActiveFeeder.test.cc
index fca6880..ec4c378 100644
--- a/senf/PPI/ActiveFeeder.test.cc
+++ b/senf/PPI/ActiveFeeder.test.cc
@@ -32,31 +32,26 @@
 #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>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace debug = senf::ppi::module::debug;
 namespace ppi = senf::ppi;
 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,14 +63,15 @@ 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);
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_