namespace {
struct VoidPacket : public PacketTypeBase
{};
-
+}
+
#define CHECK_TLVParser(tlvParser, ptype, plength) \
{ \
BOOST_CHECK_EQUAL( tlvParser.type(), ptype ); \
dataIterator++; \
} \
}
-}
-BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_simple_length)
+SENF_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_simple_length)
{
PacketInterpreterBase::byte data[] = {
0x01, // type
}
-BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_extended_length)
+SENF_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_extended_length)
{
PacketInterpreterBase::byte data[] = {
0x01, // type
}
-BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_simple_length)
+SENF_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);
- tlvParser.finalizeLength();
+ tlvParser.finalize();
CHECK_TLVParser( tlvParser, 42u, 0x0Au );
}
-BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_extended_length)
+SENF_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.maxLength( MIHTLVLengthParser::max_value);
tlvParser.type() = 42u;
tlvParser.value( value);
- tlvParser.finalizeLength();
+ tlvParser.finalize();
CHECK_TLVParser( tlvParser, 42u, sizeof(value) );
}
-BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_invalid)
+SENF_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();
+ tlvParser.finalize();
PacketInterpreterBase::byte value[255];
for (unsigned i=0; i<sizeof(value); i++)
value[i] = i;
BOOST_CHECK_THROW( tlvParser.value( value), MIHTLVLengthException);
- tlvParser.maxLengthValue( sizeof(value));
+ tlvParser.maxLength( sizeof(value));
tlvParser.value( value);
- tlvParser.finalizeLength();
+ tlvParser.finalize();
CHECK_TLVParser( tlvParser, 42u, sizeof(value) );
}
using mixin::initSize;
static void finalize(ConcretePacket<TestMacAddressTLVPacketType> p) {
- p->finalizeLength();
+ p->finalize();
}
};
typedef ConcretePacket<TestMacAddressTLVPacketType> TestMacAddressTLVPacket;
}
-BOOST_AUTO_UNIT_TEST(TestMacAddressTLVPacket_create)
+SENF_AUTO_UNIT_TEST(TestMacAddressTLVPacket_create)
{
TestMacAddressTLVPacket tlvPacket (TestMacAddressTLVPacket::create());
tlvPacket->type() = 42;
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() );
}