X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FRoute.test.cc;h=24892bf8f7ba8270e02d4128d43f59931d5ff792;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=f31b8a9d7cfb548db2618c81f220d3ba3d5e3047;hpb=122719831e4d0ce7c335a66ed7c80a7ffc2e00e8;p=senf.git

diff --git a/PPI/Route.test.cc b/PPI/Route.test.cc
index f31b8a9..24892bf 100644
--- a/PPI/Route.test.cc
+++ b/PPI/Route.test.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Route.test unit tests */
+    \brief Route unit tests */
 
 //#include "Route.test.hh"
 //#include "Route.test.ih"
@@ -33,7 +33,7 @@
 #include "Module.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -50,11 +50,11 @@ namespace {
         SENF_PPI_MODULE(RouteTester);
 
     public:
-        connector::ActiveInput activeIn;
-        connector::PassiveInput passiveIn;
+        connector::ActiveInput<> activeIn;
+        connector::PassiveInput<> passiveIn;
 
-        connector::ActiveOutput activeOut;
-        connector::PassiveOutput passiveOut;
+        connector::ActiveOutput<> activeOut;
+        connector::PassiveOutput<> passiveOut;
 
         ppi::DebugEvent event;
 
@@ -70,7 +70,7 @@ namespace {
 
             passiveIn.onRequest(&RouteTester::inputRequest);
             passiveOut.onRequest(&RouteTester::outputRequest);
-            registerEvent(&RouteTester::onEvent, event);
+            registerEvent(event, &RouteTester::onEvent);
 
             activeIn.onThrottle(&RouteTester::throttleRequest);
             activeIn.onUnthrottle(&RouteTester::unthrottleRequest);
@@ -105,16 +105,16 @@ namespace {
 
 BOOST_AUTO_UNIT_TEST(route)
 {
-    debug::PassivePacketSource passiveSource;
-    debug::ActivePacketSource activeSource;
-    debug::PassivePacketSink passiveSink;
-    debug::ActivePacketSink activeSink;
+    debug::PassiveSource passiveSource;
+    debug::ActiveSource activeSource;
+    debug::PassiveSink passiveSink;
+    debug::ActiveSink activeSink;
     RouteTester tester;
 
-    ppi::connect(passiveSource.output, tester.activeIn);
-    ppi::connect(activeSource.output, tester.passiveIn);
-    ppi::connect(tester.activeOut, passiveSink.input);
-    ppi::connect(tester.passiveOut, activeSink.input);
+    ppi::connect(passiveSource, tester.activeIn);
+    ppi::connect(activeSource, tester.passiveIn);
+    ppi::connect(tester.activeOut, passiveSink);
+    ppi::connect(tester.passiveOut, activeSink);
 
     ppi::init();