X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FMACAddress.test.cc;h=ca88366c8a22a999a72b46f8745fef53486db0d5;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=e4ca6276f604eb7fbaebfae768dc82e33c777dff;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/MACAddress.test.cc b/senf/Socket/Protocols/Raw/MACAddress.test.cc
index e4ca627..ca88366 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/senf/Socket/Protocols/Raw/MACAddress.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief MACAddress unit tests */
@@ -31,12 +36,13 @@
 #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////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 SENF_AUTO_UNIT_TEST(macAddress)
 {
@@ -70,7 +76,7 @@ SENF_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 +94,7 @@ SENF_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 +112,15 @@ SENF_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