X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FAnnotationRouter.test.cc;h=25fac4cc7a416a67bce747346adcb9a0481dcbe1;hb=45b346fa3a120720280b67b0f405b1954c0885d4;hp=778786457e11fc561822f1fbdbbdfdb70e32790b;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/AnnotationRouter.test.cc b/senf/PPI/AnnotationRouter.test.cc
index 7787864..25fac4c 100644
--- a/senf/PPI/AnnotationRouter.test.cc
+++ b/senf/PPI/AnnotationRouter.test.cc
@@ -30,7 +30,7 @@
 #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_
@@ -49,6 +49,11 @@ namespace {
 
     std::ostream & operator<<(std::ostream & os, IntAnnotation const & value)
     { os << value.value; return os; }
+
+    struct AnnotationRouter : public senf::ppi::module::AnnotationRouter<IntAnnotation>
+    {
+        using senf::ppi::module::AnnotationRouter<IntAnnotation>::connectors;
+    };
 }
 
 BOOST_AUTO_UNIT_TEST(annotationRouter)
@@ -57,13 +62,13 @@ BOOST_AUTO_UNIT_TEST(annotationRouter)
     senf::ppi::module::debug::PassiveSink sink1;
     senf::ppi::module::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);
+    senf::ppi::connect(router, 1, sink1);
+    senf::ppi::connect(router, 2, sink2);
     
-    BOOST_CHECK_THROW( senf::ppi::connect(router, sink2, 2), 
+    BOOST_CHECK_THROW( senf::ppi::connect(router, 2, sink2), 
             senf::ppi::module::AnnotationRouter<IntAnnotation>::DuplicateKeyException);
 
     senf::ppi::init();
@@ -81,6 +86,9 @@ 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();
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////