X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FINetAddressing.test.cc;h=52f94aacd5c8f71f20abb7d7c5ded8179232f812;hb=d6abda313f70c8a849c5e3f3bbfc12ce301789f1;hp=e512761638e84be7bbe54a51f10f1502f9e4ffa0;hpb=fa696fb7164ff243f6b7c1c5bda35ed75af153dc;p=senf.git

diff --git a/Socket/Protocols/INet/INetAddressing.test.cc b/Socket/Protocols/INet/INetAddressing.test.cc
index e512761..52f94aa 100644
--- a/Socket/Protocols/INet/INetAddressing.test.cc
+++ b/Socket/Protocols/INet/INetAddressing.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "INetAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -45,7 +45,7 @@ BOOST_AUTO_UNIT_TEST(inet4SocketAddress)
         BOOST_CHECK( ! addr );
 
         addr = INet4SocketAddress("127.0.0.1:12345");
-        BOOST_CHECK ( addr != INet4SocketAddress() );
+        BOOST_CHECK ( addr != INet4SocketAddress("127.0.0.2:12345") );
     }
 
     {
@@ -57,7 +57,8 @@ BOOST_AUTO_UNIT_TEST(inet4SocketAddress)
                        INet4SocketAddress(INet4Address::Loopback,12345) );
 
     BOOST_CHECK_THROW( INet4SocketAddress("127.0.0.1"), INet4SocketAddress::SyntaxException );
-    BOOST_CHECK_THROW( INet4SocketAddress("foo@bar:12345"), INet4Address::SyntaxException );
+    BOOST_CHECK_THROW( INet4SocketAddress("foo:bar"), INet4SocketAddress::SyntaxException );
+    BOOST_CHECK_THROW( INet4SocketAddress(":12345"), INet4SocketAddress::SyntaxException );
     BOOST_CHECK_THROW( INet4SocketAddress("127.0.0.1:1234a"), INet4SocketAddress::SyntaxException );
 
     BOOST_CHECK_EQUAL( INet4SocketAddress("127.0.0.1:12345").address(), INet4Address::Loopback );
@@ -94,6 +95,9 @@ BOOST_AUTO_UNIT_TEST(inet6SocketAddress)
         BOOST_CHECK_EQUAL( addr.iface(), "" );
         BOOST_CHECK_EQUAL( addr, INet6SocketAddress("[12::21]:12345") );
         BOOST_CHECK_NO_THROW( INet6SocketAddress("www.6bone.net:80") );
+        addr = senf::INet6SocketAddress("1.2.3.4:12345", INet6Address::ResolveINet4);
+        BOOST_CHECK_EQUAL( addr.address(), INet6Address::from_string("::ffff:1.2.3.4") );
+        BOOST_CHECK_EQUAL( addr.port(), 12345u );
     }
 
     {