X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FRaw%2FMACAddress.test.cc;h=34749b05040840a40f9da33b2dcc4d018c749067;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=df256c9c97fa887fbc035ed7735e8e93909803a2;hpb=0cb9d9525b4e6362bd32429bf053df4cd4ee8011;p=senf.git

diff --git a/Socket/Protocols/Raw/MACAddress.test.cc b/Socket/Protocols/Raw/MACAddress.test.cc
index df256c9..34749b0 100644
--- a/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/Socket/Protocols/Raw/MACAddress.test.cc
@@ -21,15 +21,16 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief MACAddress.test unit tests */
+    \brief MACAddress unit tests */
 
 //#include "MACAddress.test.hh"
 //#include "MACAddress.test.ih"
 
 // Custom includes
 #include <sstream>
-#include <boost/lexical_cast.hpp>
 #include "MACAddress.hh"
+#include "../../../Utils/String.hh"
+#include "EUI64.hh"
 
 #include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
@@ -39,8 +40,11 @@
 
 BOOST_AUTO_UNIT_TEST(macAddress)
 {
-	std::string test ("A1-b2-C3:d4:E5:f6");
-    senf::MACAddress mac (senf::MACAddress::from_string(test));
+    using senf::MACAddress;
+    using senf::AddressSyntaxException;
+
+    std::string test ("A1-b2-C3:d4:E5:f6");
+    MACAddress mac (MACAddress::from_string(test));
 
     BOOST_CHECK_EQUAL( mac[0], 0xA1u );
     BOOST_CHECK_EQUAL( mac[1], 0xB2u );
@@ -49,11 +53,25 @@ BOOST_AUTO_UNIT_TEST(macAddress)
     BOOST_CHECK_EQUAL( mac[4], 0xE5u );
     BOOST_CHECK_EQUAL( mac[5], 0xF6u );
 
-    std::stringstream str;
-    str << mac;
-    BOOST_CHECK_EQUAL( str.str(), "a1:b2:c3:d4:e5:f6" );
-    BOOST_CHECK_EQUAL (mac.toString(), "a1:b2:c3:d4:e5:f6");
+    {
+        std::stringstream str;
+        str >> mac;
+        BOOST_CHECK( str.fail());
+    }
+    {
+        std::stringstream str ( "invalid_mac_address");
+        str >> mac;
+        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_EQUAL(mac, MACAddress::from_string(test));
     BOOST_CHECK( ! mac.local() );
     BOOST_CHECK( mac.multicast() );
     BOOST_CHECK( ! mac.broadcast() );
@@ -62,34 +80,38 @@ BOOST_AUTO_UNIT_TEST(macAddress)
     BOOST_CHECK_EQUAL( mac.nic(), 0xd4e5f6u );
     BOOST_CHECK_EQUAL( mac.eui64(), 0xa1b2c3fffed4e5f6llu );
 
-    senf::MACAddress mac2;
+    MACAddress mac2;
     BOOST_CHECK( ! mac2 );
-    mac2 = senf::MACAddress::from_string("ff:ff:ff:ff:ff:ff");
+    mac2 = MACAddress::from_string("ff:ff:ff:ff:ff:ff");
     BOOST_CHECK( mac2.broadcast() );
-    BOOST_CHECK_EQUAL( mac2, senf::MACAddress::Broadcast );
+    BOOST_CHECK_EQUAL( mac2, MACAddress::Broadcast );
     char data[] = { 0x01,0x02,0x03,0x04,0x05,0x06 };
-    mac2 = senf::MACAddress::from_data(data);
-    BOOST_CHECK_EQUAL( boost::lexical_cast<std::string>(mac2), "01:02:03:04:05:06" );
+    mac2 = MACAddress::from_data(data);
+    BOOST_CHECK_EQUAL( senf::str(mac2), "01:02:03:04:05:06" );
     BOOST_CHECK( mac != mac2 );
     mac2 = mac;
     BOOST_CHECK( mac == mac2 );
-    BOOST_CHECK_EQUAL( boost::lexical_cast<std::string>(mac2), "a1:b2:c3:d4:e5:f6" );
+    BOOST_CHECK_EQUAL( senf::str(mac2), "a1:b2:c3:d4:e5:f6" );
+
+    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 );
+    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_THROW( MACAddress::from_string("01:02:03:04:05:[6"), AddressSyntaxException );
 
-    BOOST_CHECK_THROW( senf::MACAddress::from_string("1:2:3:4:5:6"), 
-                       senf::AddressSyntaxException );
-    BOOST_CHECK_THROW( senf::MACAddress::from_string("01:02:03:04:05"), 
-                       senf::AddressSyntaxException );
-    BOOST_CHECK_THROW( senf::MACAddress::from_string("01:02:03:04:05:z6"), 
-                       senf::AddressSyntaxException );
+    BOOST_CHECK_EQUAL( mac, MACAddress::from_eui64(senf::EUI64(0xa1b2c3fffed4e5f6llu)) );
+    BOOST_CHECK_THROW( MACAddress::from_eui64(senf::EUI64(0ull)),
+                       AddressSyntaxException );
 
-    BOOST_CHECK_EQUAL( mac, senf::MACAddress::from_eui64(0xa1b2c3fffed4e5f6llu) );
-    BOOST_CHECK_THROW( senf::MACAddress::from_eui64(0u), senf::AddressSyntaxException );
+    BOOST_CHECK_EQUAL( MACAddress(0x1a2b3c4d5e6fULL).uint64(), 0x1a2b3c4d5e6fULL);
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100