X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FINet4Address.test.cc;h=3c75262084350eab7155d2fd746ecef40ebd9a58;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=b026788d04f01881aed065d5c4237a2dba07d2b0;hpb=d001b1fe2a8fb121145d2a111d737219abae20d7;p=senf.git

diff --git a/Socket/Protocols/INet/INet4Address.test.cc b/Socket/Protocols/INet/INet4Address.test.cc
index b026788..3c75262 100644
--- a/Socket/Protocols/INet/INet4Address.test.cc
+++ b/Socket/Protocols/INet/INet4Address.test.cc
@@ -21,16 +21,16 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief INet4Address.test unit tests */
+    \brief INet4Address unit tests */
 
 //#include "INet4Address.test.hh"
 //#include "INet4Address.test.ih"
 
 // Custom includes
 #include <arpa/inet.h>
-#include <boost/lexical_cast.hpp>
 #include <sstream>
 #include "INet4Address.hh"
+#include "../../../Utils/String.hh"
 
 #include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
@@ -71,15 +71,24 @@ BOOST_AUTO_UNIT_TEST(inet4Address)
     BOOST_CHECK( INet4Address::from_string("www.6bone.net") != INet4Address::None );
     BOOST_CHECK_THROW( INet4Address::from_string("invalid.host.fhg.de"), UnknownHostnameException);
 
-    std::stringstream str;
-    str >> addr;
-    BOOST_CHECK( str.fail());
-    str.clear();
-    str << addr;
-    BOOST_CHECK_EQUAL( str.str(), "128.129.130.131" );
-    str >> addr;
-    BOOST_CHECK( ! str.fail());
-    BOOST_CHECK_EQUAL(addr, INet4Address::from_string("128.129.130.131") );
+    {
+        std::stringstream str;
+        str >> addr;
+        BOOST_CHECK( str.fail());
+    }
+    {
+        std::stringstream str ("invalid.host.fhg.de");
+        str >> addr;
+        BOOST_CHECK( str.fail());
+    }
+    {
+        std::stringstream str;
+        str << addr;
+        BOOST_CHECK_EQUAL( str.str(), "128.129.130.131" );
+        str >> addr;
+        BOOST_CHECK( ! str.fail());
+        BOOST_CHECK_EQUAL(addr, INet4Address::from_string("128.129.130.131") );
+    }
 }
 
 BOOST_AUTO_UNIT_TEST(inet4Network)
@@ -101,10 +110,10 @@ BOOST_AUTO_UNIT_TEST(inet4Network)
     BOOST_CHECK( net2.match(senf::INet4Network("192.0.111.0/24")) );
     BOOST_CHECK( ! net2.match(senf::INet4Network("192.0.0.0/15")) );
 
-    BOOST_CHECK_EQUAL( boost::lexical_cast<std::string>(net2), "192.0.0.0/16" );
+    BOOST_CHECK_EQUAL( senf::str(net2), "192.0.0.0/16" );
 
     BOOST_CHECK_EQUAL( net2.host(-1), senf::INet4Address::from_string("192.0.255.255") );
-    BOOST_CHECK_EQUAL( boost::lexical_cast<std::string>(net2.subnet(2u,24u)), "192.0.2.0/24" );
+    BOOST_CHECK_EQUAL( senf::str(net2.subnet(2u,24u)), "192.0.2.0/24" );
 
     BOOST_CHECK_THROW( senf::INet4Network(""), senf::AddressSyntaxException );
     BOOST_CHECK_THROW( senf::INet4Network("192.0.2.0/24/beef"), senf::AddressSyntaxException );