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

diff --git a/senf/PPI/AnnotationRouter.test.cc b/senf/PPI/AnnotationRouter.test.cc
index d862bd3..651d70e 100644
--- a/senf/PPI/AnnotationRouter.test.cc
+++ b/senf/PPI/AnnotationRouter.test.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -34,7 +34,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace ppi = senf::ppi;
 namespace connector = ppi::connector;
 namespace module = ppi::module;
@@ -60,19 +60,19 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(annotationRouter)
+SENF_AUTO_UNIT_TEST(annotationRouter)
 {
     debug::ActiveSource source;
     debug::PassiveSink sink1;
     debug::PassiveSink sink2;
 
     AnnotationRouter router;
-    
+
     ppi::connect(source, router);
     ppi::connect(router, 1, sink1);
     ppi::connect(router, 2, sink2);
-    
-    BOOST_CHECK_THROW( connect(router, 2, sink2), 
+
+    BOOST_CHECK_THROW( connect(router, 2, sink2),
             module::AnnotationRouter<IntAnnotation>::DuplicateKeyException);
 
     ppi::init();
@@ -94,22 +94,16 @@ BOOST_AUTO_UNIT_TEST(annotationRouter)
 
     sink1.input.disconnect();
     BOOST_CHECK_EQUAL(router.connectors().size(), 1u);
-    
+
+    senf::ppi::connect(router, 1, sink1);
+    senf::ppi::init();
     source.submit(p1);
-    source.submit(p2);
-    BOOST_CHECK_EQUAL( sink1.size(), 1u );
-    BOOST_CHECK_EQUAL( sink2.size(), 2u );
-    
-//    ppi::connect(router, 1, sink1);
-//    ppi::init();
-//    
-//    source.submit(p1);
-//    source.submit(p2);
-//    BOOST_CHECK_EQUAL( sink1.size(), 2u );
-//    BOOST_CHECK_EQUAL( sink2.size(), 3u );
+
+    BOOST_CHECK_EQUAL( sink1.size(), 2u );
+    BOOST_CHECK_EQUAL( sink2.size(), 1u );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_