Fix documentation build under maverick (doxygen 1.7.1)

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

diff --git a/senf/PPI/SocketSink.test.cc b/senf/PPI/SocketSink.test.cc
index 5b7f420..ee4e2fe 100644 (file)
--- a/senf/PPI/SocketSink.test.cc
+++ b/senf/PPI/SocketSink.test.cc
@@ -27,18 +27,18 @@
 //#include "SocketSink.test.ih"
 
 // Custom includes
-#include "../Socket/Protocols/INet/UDPSocketHandle.hh"
-#include "../Socket/Protocols/INet/ConnectedUDPSocketHandle.hh"
+#include <senf/Socket/Protocols/INet/UDPSocketHandle.hh>
+#include <senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh>
 #include "SocketSource.hh"
 #include "DebugModules.hh"
 #include "SocketSink.hh"
 #include "Setup.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace ppi = senf::ppi;
 namespace module = ppi::module;
 namespace debug = module::debug;
@@ -47,12 +47,31 @@ namespace {
     void timeout() {
         senf::scheduler::terminate();
     }
+
+    int base_pid = 0;
+
+    unsigned port(unsigned i)
+    {
+        if (! base_pid)
+            base_pid = ::getpid();
+        return 23456u + (((base_pid^(base_pid>>8)^(base_pid>>16)^(base_pid>>24))&0xff)<<2) + i;
+    }
+
+    std::string localhost4str(unsigned i)
+    {
+        return (boost::format("localhost:%d") % port(i)).str();
+    }
+
+    std::string localhost6str(unsigned i)
+    {
+        return (boost::format("[::1]:%d") % port(i)).str();
+    }
 }
 
-BOOST_AUTO_UNIT_TEST(passiveSocketSink)
+SENF_AUTO_UNIT_TEST(passiveSocketSink)
 {
     senf::ConnectedUDPv4ClientSocketHandle outputSocket (
-        senf::INet4SocketAddress("localhost:44344"));
+        senf::INet4SocketAddress(localhost4str(0)));
     module::PassiveSocketSink<> udpSink(outputSocket);
     debug::ActiveSource source;
     ppi::connect(source, udpSink);
@@ -61,7 +80,7 @@ BOOST_AUTO_UNIT_TEST(passiveSocketSink)
     senf::Packet p (senf::DataPacket::create(data));
 
     senf::UDPv4ClientSocketHandle inputSocket;
-    inputSocket.bind(senf::INet4SocketAddress("localhost:44344"));
+    inputSocket.bind(senf::INet4SocketAddress(localhost4str(0)));
     senf::ppi::init();
     source.submit(p);
 
@@ -69,10 +88,10 @@ BOOST_AUTO_UNIT_TEST(passiveSocketSink)
     BOOST_CHECK_EQUAL( data, input );
 }
 
-BOOST_AUTO_UNIT_TEST(activeSocketSink)
+SENF_AUTO_UNIT_TEST(activeSocketSink)
 {
     senf::ConnectedUDPv4ClientSocketHandle outputSocket (
-        senf::INet4SocketAddress("localhost:44344"));
+        senf::INet4SocketAddress(localhost4str(0)));
     module::ActiveSocketSink<> udpSink(outputSocket);
     debug::PassiveSource source;
     ppi::connect(source, udpSink);
@@ -81,7 +100,7 @@ BOOST_AUTO_UNIT_TEST(activeSocketSink)
     senf::Packet p (senf::DataPacket::create(data));
 
     senf::UDPv4ClientSocketHandle inputSocket;
-    inputSocket.bind(senf::INet4SocketAddress("localhost:44344"));
+    inputSocket.bind(senf::INet4SocketAddress(localhost4str(0)));
     senf::scheduler::TimerEvent timer (
         "activeSocketSink test timer", &timeout,
         senf::ClockService::now() + senf::ClockService::milliseconds(100));
@@ -92,7 +111,7 @@ BOOST_AUTO_UNIT_TEST(activeSocketSink)
     BOOST_CHECK_EQUAL( data, input );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f