PPI: Clean up time interface

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

diff --git a/PPI/SocketWriter.test.cc b/PPI/SocketWriter.test.cc
index 78814ca..63dd2a8 100644 (file)
--- a/PPI/SocketWriter.test.cc
+++ b/PPI/SocketWriter.test.cc
@@ -57,7 +57,7 @@ BOOST_AUTO_UNIT_TEST(passiveSocketWriter)
         senf::INet4SocketAddress("localhost:44344"));
     module::PassiveSocketWriter<> udpWriter(outputSocket);
     debug::ActivePacketSource source;
-    ppi::connect(source.output, udpWriter.input);
+    ppi::connect(source, udpWriter);
 
     std::string data ("TEST");
     senf::Packet p (senf::DataPacket::create(data));
@@ -77,14 +77,15 @@ BOOST_AUTO_UNIT_TEST(activeSocketWriter)
         senf::INet4SocketAddress("localhost:44344"));
     module::ActiveSocketWriter<> udpWriter(outputSocket);
     debug::PassivePacketSource source;
-    ppi::connect(source.output, udpWriter.input);
+    ppi::connect(source, udpWriter);
 
     std::string data ("TEST");
     senf::Packet p (senf::DataPacket::create(data));
 
     senf::UDPv4ClientSocketHandle inputSocket;
     inputSocket.bind(senf::INet4SocketAddress("localhost:44344"));
-    senf::Scheduler::instance().timeout(100, &timeout);
+    senf::Scheduler::instance().timeout(
+        senf::ClockService::now() + senf::ClockService::milliseconds(100), &timeout);
     source.submit(p);
     senf::ppi::run();