X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FSyslogUDPTarget.test.cc;h=f2561fb8aa179ac6fcf61f4ab4ab1a04b9c58a50;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=eff65c19833de3eb9c37a7de9c3f7ff33cf222d9;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Logger/SyslogUDPTarget.test.cc b/senf/Utils/Logger/SyslogUDPTarget.test.cc
index eff65c1..f2561fb 100644
--- a/senf/Utils/Logger/SyslogUDPTarget.test.cc
+++ b/senf/Utils/Logger/SyslogUDPTarget.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>
@@ -28,21 +28,45 @@
 
 // Custom includes
 #include "SyslogUDPTarget.hh"
-#include "../../Socket/Protocols/INet/UDPSocketHandle.hh"
+#include <senf/Socket/Protocols/INet/UDPSocketHandle.hh>
+#include <boost/format.hpp>
 #include "Logger.hh"
 
-#include "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(syslogUDPTarget)
+namespace {
+
+    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();
+    }
+
+}
+
+SENF_AUTO_UNIT_TEST(syslogUDPTarget)
 {
     senf::log::SyslogUDPTarget udplog (
-        senf::INet4SocketAddress(senf::INet4Address::Loopback, 23444u));
+        senf::INet4SocketAddress(senf::INet4Address::Loopback, port(0)));
     senf::UDPv4ClientSocketHandle server (
-        senf::INet4SocketAddress(senf::INet4Address::Loopback, 23444u));
+        senf::INet4SocketAddress(senf::INet4Address::Loopback, port(0)));
 
     udplog.tag("");
     udplog.showTime(false);
@@ -64,7 +88,7 @@ BOOST_AUTO_UNIT_TEST(syslogUDPTarget)
     BOOST_CHECK_EQUAL( server.read(), "<13> 0000000000.000000000 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_