X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.test.cc;h=5dbfb95c945a955f94db0fdda6a388e7963b6479;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=a7b1e718b83a04d8e36848a7e8ae28fd060e065c;hpb=3fe2ed38b800bcb57afff676698462e763724245;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/MACAddress.test.cc b/senf/Socket/Protocols/Raw/MACAddress.test.cc
index a7b1e71..5dbfb95 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/senf/Socket/Protocols/Raw/MACAddress.test.cc
@@ -31,14 +31,15 @@
 #include "MACAddress.hh"
 #include <senf/Utils/String.hh>
 #include "EUI64.hh"
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(macAddress)
+SENF_AUTO_UNIT_TEST(macAddress)
 {
     using senf::MACAddress;
     using senf::AddressSyntaxException;
@@ -70,7 +71,7 @@ BOOST_AUTO_UNIT_TEST(macAddress)
         str >> mac;
         BOOST_CHECK( ! str.fail() );
     }
-    
+
     BOOST_CHECK_EQUAL(mac, MACAddress::from_string(test));
     BOOST_CHECK( ! mac.local() );
     BOOST_CHECK( mac.multicast() );
@@ -88,7 +89,7 @@ BOOST_AUTO_UNIT_TEST(macAddress)
     char data[] = { 0x01,0x02,0x03,0x04,0x05,0x06 };
     mac2 = MACAddress::from_data(data);
     BOOST_CHECK_EQUAL( senf::str(mac2), "01:02:03:04:05:06" );
-    BOOST_CHECK( mac != mac2 );
+    SENF_CHECK_NOT_EQUAL( mac, mac2 );
     mac2 = mac;
     BOOST_CHECK( mac == mac2 );
     BOOST_CHECK_EQUAL( senf::str(mac2), "a1:b2:c3:d4:e5:f6" );
@@ -106,12 +107,15 @@ BOOST_AUTO_UNIT_TEST(macAddress)
                        AddressSyntaxException );
 
     BOOST_CHECK_EQUAL( MACAddress(0x1a2b3c4d5e6fULL).uint64(), 0x1a2b3c4d5e6fULL);
+
+    BOOST_CHECK_EQUAL( mac, senf::EUI64::from_mac(mac) );
+    BOOST_CHECK_EQUAL( senf::EUI64::from_mac(mac), mac );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100