// $Id$
//
-// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// 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
BOOST_AUTO_UNIT_TEST(macAddress)
{
- senf::MACAddress mac (senf::MACAddress::from_string("A1-b2-C3:d4:E5:f6"));
+ std::string test ("A1-b2-C3:d4:E5:f6");
+ senf::MACAddress mac (senf::MACAddress::from_string(test));
BOOST_CHECK_EQUAL( mac[0], 0xA1u );
BOOST_CHECK_EQUAL( mac[1], 0xB2u );
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");
+
BOOST_CHECK( ! mac.local() );
BOOST_CHECK( mac.multicast() );
BOOST_CHECK( ! mac.broadcast() );
BOOST_CHECK_EQUAL( boost::lexical_cast<std::string>(mac2), "a1:b2:c3:d4:e5:f6" );
BOOST_CHECK_THROW( senf::MACAddress::from_string("1:2:3:4:5:6"),
- senf::MACAddress::SyntaxException );
+ senf::AddressSyntaxException );
BOOST_CHECK_THROW( senf::MACAddress::from_string("01:02:03:04:05"),
- senf::MACAddress::SyntaxException );
+ senf::AddressSyntaxException );
BOOST_CHECK_THROW( senf::MACAddress::from_string("01:02:03:04:05:z6"),
- senf::MACAddress::SyntaxException );
+ senf::AddressSyntaxException );
BOOST_CHECK_EQUAL( mac, senf::MACAddress::from_eui64(0xa1b2c3fffed4e5f6llu) );
- BOOST_CHECK_THROW( senf::MACAddress::from_eui64(0u), senf::MACAddress::SyntaxException );
+ BOOST_CHECK_THROW( senf::MACAddress::from_eui64(0u), senf::AddressSyntaxException );
}
///////////////////////////////cc.e////////////////////////////////////////