X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet4Address.test.cc;h=0dc95d984e312a57ae9ab98aedacdda844862486;hb=cb50871835b7a5c37e4fd32d38de67fa12570ebc;hp=c707745e28fea4c927490f161e08c634846112d5;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INet4Address.test.cc b/senf/Socket/Protocols/INet/INet4Address.test.cc
index c707745..0dc95d9 100644
--- a/senf/Socket/Protocols/INet/INet4Address.test.cc
+++ b/senf/Socket/Protocols/INet/INet4Address.test.cc
@@ -30,15 +30,16 @@
 #include <arpa/inet.h>
 #include <sstream>
 #include "INet4Address.hh"
-#include "../../../Utils/String.hh"
+#include <senf/Utils/String.hh>
+#include <senf/Socket/Protocols/AddressExceptions.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(inet4Address)
+SENF_AUTO_UNIT_TEST(inet4Address)
 {
     using senf::INet4Address;
     using senf::AddressSyntaxException;
@@ -46,7 +47,7 @@ BOOST_AUTO_UNIT_TEST(inet4Address)
 
     INet4Address addr (INet4Address::from_string("127.0.0.1"));
     BOOST_CHECK_EQUAL( addr, INet4Address::Loopback );
-    BOOST_CHECK( addr != INet4Address::Broadcast );
+    SENF_CHECK_NOT_EQUAL( addr, INet4Address::Broadcast );
 
     addr = INet4Address::from_string("localhost");
     BOOST_CHECK_EQUAL( addr, INet4Address::Loopback );
@@ -68,7 +69,7 @@ BOOST_AUTO_UNIT_TEST(inet4Address)
     BOOST_CHECK( addr );
     BOOST_CHECK( ! INet4Address() );
     BOOST_CHECK_THROW( INet4Address::from_string(""), AddressSyntaxException );
-    BOOST_CHECK( INet4Address::from_string("www.go6.net") != INet4Address::None );
+    SENF_CHECK_NOT_EQUAL( INet4Address::from_string("www.go6.net"), INet4Address::None );
     BOOST_CHECK_THROW( INet4Address::from_string("invalid.host.fhg.de"), UnknownHostnameException);
 
     {
@@ -91,7 +92,7 @@ BOOST_AUTO_UNIT_TEST(inet4Address)
     }
 }
 
-BOOST_AUTO_UNIT_TEST(inet4Network)
+SENF_AUTO_UNIT_TEST(inet4Network)
 {
     senf::INet4Network net (senf::INet4Address::Loopback,8);
     BOOST_CHECK_EQUAL( net.address().address(), 0x7F000000u );
@@ -103,7 +104,7 @@ BOOST_AUTO_UNIT_TEST(inet4Network)
     BOOST_CHECK_EQUAL( net2.address(), senf::INet4Address::from_string("192.0.0.0") );
     BOOST_CHECK_EQUAL( net2.prefix_len(), 16u );
 
-    BOOST_CHECK( net != net2 );
+    SENF_CHECK_NOT_EQUAL( net, net2 );
     BOOST_CHECK( net.match(senf::INet4Address::from_string("127.0.0.1")) );
     BOOST_CHECK( ! net2.match(senf::INet4Address::from_string("127.0.0.1")) );
     BOOST_CHECK( ! net.match(net2) );
@@ -117,6 +118,22 @@ BOOST_AUTO_UNIT_TEST(inet4Network)
 
     BOOST_CHECK_THROW( senf::INet4Network(""), senf::AddressSyntaxException );
     BOOST_CHECK_THROW( senf::INet4Network("192.0.2.0/24/beef"), senf::AddressSyntaxException );
+
+    {
+        std::stringstream str;
+        senf::INet4Network net;
+        str >> net;
+        BOOST_CHECK( str.fail());
+    }
+    {
+        std::stringstream str;
+        senf::INet4Network net ("128.129.130.131/128");
+        str << net;
+        BOOST_CHECK_EQUAL( str.str(), "128.129.130.131/128");
+        str >> net;
+        BOOST_CHECK( ! str.fail());
+        BOOST_CHECK_EQUAL(net, senf::INet4Network("128.129.130.131/128"));
+    }
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////