removed some useless spaces; not very important, I know :)

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

diff --git a/Socket/Protocols/Raw/LLAddressing.test.cc b/Socket/Protocols/Raw/LLAddressing.test.cc
index 7e1a060..1a2f25e 100644 (file)
--- a/Socket/Protocols/Raw/LLAddressing.test.cc
+++ b/Socket/Protocols/Raw/LLAddressing.test.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// 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
@@ -26,9 +26,10 @@
 //#include "LLAddressing.test.ih"
 
 // Custom includes
+#include <boost/lexical_cast.hpp>
 #include "LLAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -42,11 +43,11 @@ BOOST_AUTO_UNIT_TEST(llAddress)
         BOOST_CHECK_EQUAL( a.protocol(), 0u );
         BOOST_CHECK_EQUAL( a.interface(), "" );
         BOOST_CHECK_EQUAL( a.arptype(), 0u );
-        BOOST_CHECK_EQUAL( a.pkttype(), 0u );
-        BOOST_CHECK_EQUAL( a.address(), "" );
+        BOOST_CHECK_EQUAL( a.pkttype(), senf::LLSocketAddress::Undefined );
+        BOOST_CHECK( ! a.address() );
 
-        a.address(senf::llAddress("05-10-1A-2f-25-30"));
-        BOOST_CHECK_EQUAL( senf::llAddress(a.address()), "05-10-1a-2f-25-30" );
+        a.address(senf::MACAddress::from_string("05-10-1A-2f-25-30"));
+        BOOST_CHECK_EQUAL( boost::lexical_cast<std::string>(a.address()), "05:10:1a:2f:25:30" );
         a.interface("lo");
         BOOST_CHECK_EQUAL( a.interface(), "lo" );
         a.protocol(123);
@@ -55,13 +56,13 @@ BOOST_AUTO_UNIT_TEST(llAddress)
 
     {
         senf::LLSocketAddress a (
-            senf::llAddress("11-12-13-14-15-16"), "lo");
+            senf::MACAddress::from_string("11-12-13-14-15-16"), "lo");
 
         BOOST_CHECK_EQUAL( a.protocol(), 0u );
         BOOST_CHECK_EQUAL( a.interface(), "lo" );
         BOOST_CHECK_EQUAL( a.arptype(), 0u );
-        BOOST_CHECK_EQUAL( a.pkttype(), 0u );
-        BOOST_CHECK_EQUAL( senf::llAddress(a.address()), "11-12-13-14-15-16" );
+        BOOST_CHECK_EQUAL( a.pkttype(), senf::LLSocketAddress::Undefined );
+        BOOST_CHECK_EQUAL( boost::lexical_cast<std::string>(a.address()), "11:12:13:14:15:16" );
     }
 
     {
@@ -70,8 +71,8 @@ BOOST_AUTO_UNIT_TEST(llAddress)
         BOOST_CHECK_EQUAL( a.protocol(), 123u );
         BOOST_CHECK_EQUAL( a.interface(), "lo" );
         BOOST_CHECK_EQUAL( a.arptype(), 0u );
-        BOOST_CHECK_EQUAL( a.pkttype(), 0u );
-        BOOST_CHECK_EQUAL( senf::llAddress(a.address()), "" );
+        BOOST_CHECK_EQUAL( a.pkttype(), senf::LLSocketAddress::Undefined );
+        BOOST_CHECK( ! a.address() );
     }
 }