all unit tests: replaced BOOST_AUTO_UNIT_TEST with new SENF_AUTO_UNIT_TEST macro

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

diff --git a/senf/PPI/AnnotationRouter.test.cc b/senf/PPI/AnnotationRouter.test.cc
index 7787864..28de963 100644 (file)
--- a/senf/PPI/AnnotationRouter.test.cc
+++ b/senf/PPI/AnnotationRouter.test.cc
@@ -30,11 +30,15 @@
 #include "AnnotationRouter.hh"
 #include "DebugModules.hh"
 
-#include "../Utils//auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
+namespace ppi = senf::ppi;
+namespace connector = ppi::connector;
+namespace module = ppi::module;
+namespace debug = module::debug;
 
 namespace {
     struct IntAnnotation {
@@ -49,24 +53,29 @@ namespace {
 
     std::ostream & operator<<(std::ostream & os, IntAnnotation const & value)
     { os << value.value; return os; }
+
+    struct AnnotationRouter : public module::AnnotationRouter<IntAnnotation>
+    {
+        using module::AnnotationRouter<IntAnnotation>::connectors;
+    };
 }
 
-BOOST_AUTO_UNIT_TEST(annotationRouter)
+SENF_AUTO_UNIT_TEST(annotationRouter)
 {
-    senf::ppi::module::debug::ActiveSource source;
-    senf::ppi::module::debug::PassiveSink sink1;
-    senf::ppi::module::debug::PassiveSink sink2;
+    debug::ActiveSource source;
+    debug::PassiveSink sink1;
+    debug::PassiveSink sink2;
 
-    senf::ppi::module::AnnotationRouter<IntAnnotation> router;
+    AnnotationRouter router;
     
-    senf::ppi::connect(source, router);
-    senf::ppi::connect(router, sink1, 1);
-    senf::ppi::connect(router, sink2, 2);
+    ppi::connect(source, router);
+    ppi::connect(router, 1, sink1);
+    ppi::connect(router, 2, sink2);
     
-    BOOST_CHECK_THROW( senf::ppi::connect(router, sink2, 2), 
-            senf::ppi::module::AnnotationRouter<IntAnnotation>::DuplicateKeyException);
+    BOOST_CHECK_THROW( connect(router, 2, sink2), 
+            module::AnnotationRouter<IntAnnotation>::DuplicateKeyException);
 
-    senf::ppi::init();
+    ppi::init();
 
     senf::Packet p1 (senf::DataPacket::create());
     p1.annotation<IntAnnotation>() = 1;
@@ -81,6 +90,17 @@ BOOST_AUTO_UNIT_TEST(annotationRouter)
     BOOST_CHECK_EQUAL( sink2.size(), 1u );
     BOOST_CHECK( sink1.front() == p1 );
     BOOST_CHECK( sink2.front() == p2 );
+    BOOST_CHECK_EQUAL(router.connectors().size(), 2u);
+
+    sink1.input.disconnect();
+    BOOST_CHECK_EQUAL(router.connectors().size(), 1u);
+
+    senf::ppi::connect(router, 1, sink1);
+    senf::ppi::init();
+    source.submit(p1);
+ 
+    BOOST_CHECK_EQUAL( sink1.size(), 2u );
+    BOOST_CHECK_EQUAL( sink2.size(), 1u );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////