X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FConnectors.test.cc;h=7482a1a6aa4e57a8cc97d76a3d45fe173c5dede4;hb=c505c034e5fdc932c02aa3dc3847a5551011d87e;hp=20b7e3e405b21d715d3b8197b35e06fc44c188f9;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/Connectors.test.cc b/senf/PPI/Connectors.test.cc
index 20b7e3e..7482a1a 100644
--- a/senf/PPI/Connectors.test.cc
+++ b/senf/PPI/Connectors.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -44,7 +44,7 @@ namespace debug = ppi::module::debug;
 // the corresponding connected module since otherwise the connectors cannot be connected anywhere
 // and will be unusable.
 
-BOOST_AUTO_UNIT_TEST(connector)
+SENF_AUTO_UNIT_TEST(connector)
 {
     // It doesn't matter, which type of connectors we use here since they are all based on
     // Connector.
@@ -61,7 +61,7 @@ BOOST_AUTO_UNIT_TEST(connector)
     BOOST_CHECK_EQUAL( & target.input.peer(), & source.output );
 }
 
-BOOST_AUTO_UNIT_TEST(passiveConnector)
+SENF_AUTO_UNIT_TEST(passiveConnector)
 {
     debug::ActiveSource source;
     debug::PassiveSink target;
@@ -75,7 +75,7 @@ BOOST_AUTO_UNIT_TEST(passiveConnector)
     target.input.throttle();
     BOOST_CHECK( target.input.throttled() );
     BOOST_CHECK( target.input.nativeThrottled() );
-    
+
     target.input.unthrottle();
     BOOST_CHECK( ! target.input.throttled() );
     BOOST_CHECK( ! target.input.nativeThrottled() );
@@ -84,13 +84,13 @@ BOOST_AUTO_UNIT_TEST(passiveConnector)
 }
 
 namespace {
-    
+
     bool called = false;
-    
+
     void handler() { called = true; }
 }
 
-BOOST_AUTO_UNIT_TEST(activeConnector)
+SENF_AUTO_UNIT_TEST(activeConnector)
 {
     debug::ActiveSource source;
     debug::PassiveSink target;
@@ -122,7 +122,7 @@ BOOST_AUTO_UNIT_TEST(activeConnector)
     BOOST_CHECK_EQUAL( & source.output.peer(), & target.input );
 }
 
-BOOST_AUTO_UNIT_TEST(inputConnector)
+SENF_AUTO_UNIT_TEST(inputConnector)
 {
     debug::ActiveSource source;
     debug::PassiveSink target;
@@ -136,13 +136,13 @@ BOOST_AUTO_UNIT_TEST(inputConnector)
     // peek() is implicitly tested within the Active/PassiveSink implementation
 
     BOOST_CHECK_EQUAL ( & target.input.peer(), & source.output );
-    
+
     BOOST_CHECK( target.input.begin() == target.input.end() );
     BOOST_CHECK_EQUAL( target.input.queueSize(), 0u );
     BOOST_CHECK( target.input.empty() );
 }
 
-BOOST_AUTO_UNIT_TEST(outputConnector)
+SENF_AUTO_UNIT_TEST(outputConnector)
 {
     debug::ActiveSource source;
     debug::PassiveSink target;
@@ -179,7 +179,7 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(passiveInput)
+SENF_AUTO_UNIT_TEST(passiveInput)
 {
     debug::ActiveSource source;
     PassiveInputTest target;
@@ -188,23 +188,23 @@ BOOST_AUTO_UNIT_TEST(passiveInput)
     ppi::init();
 
     BOOST_CHECK_EQUAL( & target.input.peer(), & source.output );
-    
+
     target.input.throttle();
     senf::Packet p (senf::DataPacket::create());
     source.submit(p);
-    
+
     BOOST_CHECK_EQUAL( target.counter, 0u );
     BOOST_CHECK( target.input );
     BOOST_CHECK_EQUAL( target.input.queueSize(), 1u );
     target.input.unthrottle();
     BOOST_CHECK( target.input );
     BOOST_CHECK_EQUAL( target.counter, 1u );
-    
+
     BOOST_CHECK( target.input() == p );
     BOOST_CHECK( ! target.input );
-    
+
     source.submit(p);
-    
+
     BOOST_CHECK_EQUAL( target.counter, 2u );
     BOOST_CHECK( target.input.throttled() );
     BOOST_CHECK( target.input() == p );
@@ -222,7 +222,7 @@ BOOST_AUTO_UNIT_TEST(passiveInput)
     BOOST_CHECK( ! target.input.throttled() );
 }
 
-BOOST_AUTO_UNIT_TEST(passiveOutput)
+SENF_AUTO_UNIT_TEST(passiveOutput)
 {
     debug::PassiveSource source;
     debug::ActiveSink target;
@@ -239,11 +239,11 @@ BOOST_AUTO_UNIT_TEST(passiveOutput)
 
     source.submit(p);
     BOOST_CHECK( target.request() == p );
-    
+
     // connect() is tested indirectly via ppi::connect
 }
 
-BOOST_AUTO_UNIT_TEST(activeInput)
+SENF_AUTO_UNIT_TEST(activeInput)
 {
     debug::PassiveSource source;
     debug::ActiveSink target;
@@ -268,14 +268,14 @@ BOOST_AUTO_UNIT_TEST(activeInput)
     BOOST_CHECK( target.request() == p );
 }
 
-BOOST_AUTO_UNIT_TEST(activeOutput)
+SENF_AUTO_UNIT_TEST(activeOutput)
 {
     debug::ActiveSource source;
     debug::PassiveSink target;
 
     ppi::connect(source,target);
     ppi::init();
-    
+
     BOOST_CHECK_EQUAL( & source.output.peer(), & target.input );
     BOOST_CHECK( source.output );
     target.input.throttle();
@@ -301,8 +301,8 @@ namespace {
         }
 
         void request() {
-            (void) input();
-            (void) input.read();
+            senf::IGNORE( input() );
+            senf::IGNORE( input.read() );
         }
     };
 
@@ -362,7 +362,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(typedInput)
+SENF_AUTO_UNIT_TEST(typedInput)
 {
     debug::ActiveSource source;
     TypedPassiveInput<> target;
@@ -372,31 +372,35 @@ BOOST_AUTO_UNIT_TEST(typedInput)
 
     senf::Packet p (senf::DataPacket::create());
     source.submit(p);
+
+    BOOST_CHECK( true );
 }
 
-BOOST_AUTO_UNIT_TEST(tyepdOutput)
+SENF_AUTO_UNIT_TEST(tyepdOutput)
 {
     TypedPassiveOutput<> source;
     debug::ActiveSink target;
 
     ppi::connect(source,target);
     ppi::init();
-    
-    (void) target.request();
+
+    senf::IGNORE( target.request() );
+
+    BOOST_CHECK( true );
 }
 
-BOOST_AUTO_UNIT_TEST(connectorTest)
+SENF_AUTO_UNIT_TEST(connectorTest)
 {
     {
         TypedPassiveInput<> input;
         TypedActiveOutput<MyPacket> output;
-        BOOST_CHECK_THROW( ppi::connect(output, input), 
+        BOOST_CHECK_THROW( ppi::connect(output, input),
                            ppi::connector::IncompatibleConnectorsException );
     }
     {
         TypedPassiveInput<MyPacket> input;
         TypedActiveOutput<> output;
-        BOOST_CHECK_THROW( ppi::connect(output, input), 
+        BOOST_CHECK_THROW( ppi::connect(output, input),
                            ppi::connector::IncompatibleConnectorsException );
     }
     {
@@ -404,7 +408,7 @@ BOOST_AUTO_UNIT_TEST(connectorTest)
         TypedActiveOutput<> output;
         SENF_CHECK_NO_THROW( ppi::connect(output, input) );
     }
-    { 
+    {
         TypedPassiveInput<> input;
         debug::ActiveSource output;
         SENF_CHECK_NO_THROW( ppi::connect(output, input) );
@@ -421,7 +425,7 @@ BOOST_AUTO_UNIT_TEST(connectorTest)
     }
 }
 
-BOOST_AUTO_UNIT_TEST(delayedConnect)
+SENF_AUTO_UNIT_TEST(delayedConnect)
 {
     {
         debug::PassiveSource source;
@@ -472,13 +476,13 @@ BOOST_AUTO_UNIT_TEST(delayedConnect)
 
         ppi::connect(source, target);
         ppi::init();
-        
+
         BOOST_CHECK( source.output );
 
         senf::Packet p (senf::DataPacket::create());
         source.submit(p);
 
-        BOOST_CHECK( target.front() == p );        
+        BOOST_CHECK( target.front() == p );
         BOOST_CHECK_EQUAL( target.size(), 1u );
     }
 
@@ -494,14 +498,14 @@ BOOST_AUTO_UNIT_TEST(delayedConnect)
 
         ppi::connect(source, target);
         ppi::init();
-        
+
         BOOST_CHECK( ! source.output );
         target.unthrottle();
         BOOST_CHECK( source.output );
     }
 }
 
-BOOST_AUTO_UNIT_TEST(disconnect)
+SENF_AUTO_UNIT_TEST(disconnect)
 {
     {
         debug::PassiveSource source;
@@ -516,10 +520,10 @@ BOOST_AUTO_UNIT_TEST(disconnect)
         source.submit(p);
 
         BOOST_CHECK( target.input );
-        
+
         target.input.disconnect();
         ppi::init();
-        
+
         BOOST_CHECK( ! target.input );
     }
     {