X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.test.cc;h=571d1674dbcf8097309394182eb37451d02977d3;hb=c74546060360ac6a739a2f2878c72e21e9135390;hp=34749b05040840a40f9da33b2dcc4d018c749067;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/MACAddress.test.cc b/senf/Socket/Protocols/Raw/MACAddress.test.cc
index 34749b0..571d167 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/senf/Socket/Protocols/Raw/MACAddress.test.cc
@@ -29,16 +29,17 @@
 // Custom includes
 #include <sstream>
 #include "MACAddress.hh"
-#include "../../../Utils/String.hh"
+#include <senf/Utils/String.hh>
 #include "EUI64.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(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,6 +107,9 @@ 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////////////////////////////////////////