Packets: Add StringParser ostream operation

[senf.git] / Socket / Protocols / Raw / MACAddress.test.cc

diff --git a/Socket/Protocols/Raw/MACAddress.test.cc b/Socket/Protocols/Raw/MACAddress.test.cc
index 87d0686..34749b0 100644 (file)
--- a/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/Socket/Protocols/Raw/MACAddress.test.cc
@@ -30,6 +30,7 @@
 #include <sstream>
 #include "MACAddress.hh"
 #include "../../../Utils/String.hh"
+#include "EUI64.hh"
 
 #include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
@@ -60,14 +61,14 @@ BOOST_AUTO_UNIT_TEST(macAddress)
     {
         std::stringstream str ( "invalid_mac_address");
         str >> mac;
-        BOOST_CHECK( str.fail());
+        BOOST_CHECK( str.fail() );
     }
     {
         std::stringstream str;
         str << mac;
         BOOST_CHECK_EQUAL( str.str(), "a1:b2:c3:d4:e5:f6" );
         str >> mac;
-        BOOST_CHECK( ! str.fail());
+        BOOST_CHECK( ! str.fail() );
     }
     
     BOOST_CHECK_EQUAL(mac, MACAddress::from_string(test));
@@ -92,7 +93,7 @@ BOOST_AUTO_UNIT_TEST(macAddress)
     BOOST_CHECK( mac == mac2 );
     BOOST_CHECK_EQUAL( senf::str(mac2), "a1:b2:c3:d4:e5:f6" );
 
-    BOOST_CHECK_THROW( MACAddress::from_string("1:2:3:4:5:6"), AddressSyntaxException );
+    BOOST_CHECK_THROW( MACAddress::from_string("123:2:3:4:5:6"), AddressSyntaxException );
     BOOST_CHECK_THROW( MACAddress::from_string("01:02:03:04:05"), AddressSyntaxException );
     // test all invalid ascii ranges
     BOOST_CHECK_THROW( MACAddress::from_string("01:02:03:04:05:z6"), AddressSyntaxException );
@@ -100,8 +101,9 @@ BOOST_AUTO_UNIT_TEST(macAddress)
     BOOST_CHECK_THROW( MACAddress::from_string("01:02:03:04:05:@6"), AddressSyntaxException );
     BOOST_CHECK_THROW( MACAddress::from_string("01:02:03:04:05:[6"), AddressSyntaxException );
 
-    BOOST_CHECK_EQUAL( mac, MACAddress::from_eui64(0xa1b2c3fffed4e5f6llu) );
-    BOOST_CHECK_THROW( MACAddress::from_eui64(0u), AddressSyntaxException );
+    BOOST_CHECK_EQUAL( mac, MACAddress::from_eui64(senf::EUI64(0xa1b2c3fffed4e5f6llu)) );
+    BOOST_CHECK_THROW( MACAddress::from_eui64(senf::EUI64(0ull)),
+                       AddressSyntaxException );
 
     BOOST_CHECK_EQUAL( MACAddress(0x1a2b3c4d5e6fULL).uint64(), 0x1a2b3c4d5e6fULL);
 }