Packets/GenericTLV: some GenericTLVParserRegistry modifications; not sure if it goes...

[senf.git] / senf / Packets / 80221Bundle / TLVParser.test.cc

diff --git a/senf/Packets/80221Bundle/TLVParser.test.cc b/senf/Packets/80221Bundle/TLVParser.test.cc
index bea19dd..5270580 100644 (file)
--- a/senf/Packets/80221Bundle/TLVParser.test.cc
+++ b/senf/Packets/80221Bundle/TLVParser.test.cc
@@ -101,7 +101,8 @@ BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_simple_length)
     PacketInterpreterBase::byte value[] = {
            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
     };
-    PacketInterpreterBase::ptr p (PacketInterpreter<VoidPacket>::create(2u));
+    PacketInterpreterBase::ptr p (PacketInterpreter<VoidPacket>::create(
+            senf::PacketInterpreterBase::size_type(2u)));
     MIHGenericTLVParser tlvParser( p->data().begin(), &p->data());
     tlvParser.type() = 42u;
     tlvParser.value( value);
@@ -124,7 +125,8 @@ BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_extended_length)
     PacketInterpreterBase::byte value[255];
     for (unsigned i=0; i<sizeof(value); i++)
         value[i] = i;
-    PacketInterpreterBase::ptr p (PacketInterpreter<VoidPacket>::create(2u));
+    PacketInterpreterBase::ptr p (PacketInterpreter<VoidPacket>::create(
+            senf::PacketInterpreterBase::size_type(2u)));
     MIHGenericTLVParser tlvParser( p->data().begin(), &p->data());
     tlvParser.maxLengthValue( MIHTLVLengthParser::max_value);
     tlvParser.type() = 42u;
@@ -146,7 +148,8 @@ BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_extended_length)
 
 BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_invalid)
 {
-    PacketInterpreterBase::ptr p (PacketInterpreter<VoidPacket>::create(2u));
+    PacketInterpreterBase::ptr p (PacketInterpreter<VoidPacket>::create(
+            senf::PacketInterpreterBase::size_type(2u)));
     MIHGenericTLVParser tlvParser( p->data().begin(), &p->data());
     tlvParser.type() = 42u;
     tlvParser.finalizeLength();
@@ -204,7 +207,8 @@ BOOST_AUTO_UNIT_TEST(TestMacAddressTLVPacket_create)
         0x0c, // length
         0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67  // value
     };
-    BOOST_CHECK( equal( tlvPacket.data().begin(), tlvPacket.data().end(), data ));
+    SENF_CHECK_EQUAL_COLLECTIONS( 
+            data, data+sizeof(data), tlvPacket.data().begin(), tlvPacket.data().end() );
 }