X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINet4Address.test.cc;h=05a682f5c55acbc7fd60d94128d225e81730c3aa;hb=b9bc7df8121501f84f5a48e854ebaa4984a44932;hp=a4b14410de8513e131c6cabb23ec7f36169f86ce;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Socket/Protocols/INet/INet4Address.test.cc b/senf/Socket/Protocols/INet/INet4Address.test.cc index a4b1441..05a682f 100644 --- a/senf/Socket/Protocols/INet/INet4Address.test.cc +++ b/senf/Socket/Protocols/INet/INet4Address.test.cc @@ -31,6 +31,7 @@ #include #include "INet4Address.hh" #include +#include #include #include @@ -38,7 +39,7 @@ #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) ); @@ -122,7 +123,7 @@ BOOST_AUTO_UNIT_TEST(inet4Network) ///////////////////////////////cc.e//////////////////////////////////////// #undef prefix_ - + // Local Variables: // mode: c++ // fill-column: 100