Move include files in debian packge into 'senf' subdirectory

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

diff --git a/PPI/SocketWriter.test.cc b/PPI/SocketWriter.test.cc
index 5e40772..09a2450 100644 (file)
--- a/PPI/SocketWriter.test.cc
+++ b/PPI/SocketWriter.test.cc
@@ -27,8 +27,8 @@
 //#include "SocketWriter.test.ih"
 
 // Custom includes
-#include "Socket/Protocols/INet/UDPSocketHandle.hh"
-#include "Socket/Protocols/INet/ConnectedUDPSocketHandle.hh"
+#include "../Socket/Protocols/INet/UDPSocketHandle.hh"
+#include "../Socket/Protocols/INet/ConnectedUDPSocketHandle.hh"
 #include "SocketReader.hh"
 #include "DebugModules.hh"
 #include "SocketWriter.hh"
@@ -56,15 +56,14 @@ BOOST_AUTO_UNIT_TEST(passiveSocketWriter)
     senf::ConnectedUDPv4ClientSocketHandle outputSocket (
         senf::INet4SocketAddress("localhost:44344"));
     module::PassiveSocketWriter<> udpWriter(outputSocket);
-    debug::ActivePacketSource source;
-    ppi::connect(source.output, udpWriter.input);
+    debug::ActiveSource source;
+    ppi::connect(source, udpWriter);
 
     std::string data ("TEST");
     senf::Packet p (senf::DataPacket::create(data));
 
     senf::UDPv4ClientSocketHandle inputSocket;
     inputSocket.bind(senf::INet4SocketAddress("localhost:44344"));
-    inputSocket.blocking(false);
     senf::ppi::init();
     source.submit(p);
 
@@ -77,16 +76,16 @@ BOOST_AUTO_UNIT_TEST(activeSocketWriter)
     senf::ConnectedUDPv4ClientSocketHandle outputSocket (
         senf::INet4SocketAddress("localhost:44344"));
     module::ActiveSocketWriter<> udpWriter(outputSocket);
-    debug::PassivePacketSource source;
-    ppi::connect(source.output, udpWriter.input);
+    debug::PassiveSource source;
+    ppi::connect(source, udpWriter);
 
     std::string data ("TEST");
     senf::Packet p (senf::DataPacket::create(data));
 
     senf::UDPv4ClientSocketHandle inputSocket;
     inputSocket.bind(senf::INet4SocketAddress("localhost:44344"));
-    inputSocket.blocking(false);
-    senf::Scheduler::instance().timeout(1000, &timeout);
+    senf::Scheduler::instance().timeout(
+        senf::ClockService::now() + senf::ClockService::milliseconds(100), &timeout);
     source.submit(p);
     senf::ppi::run();