X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.test.cc;h=e917d7244a6f56499d012da7fb5f7cd0cbce9c88;hb=9cb871b939efe93e35dd96808d25089399acfc46;hp=0581addc065ab589ce800c006e5cb0cfbadce203;hpb=3a43b572a2c0028b353d47e86fa7546633d6e2cf;p=senf.git diff --git a/senf/Packets/Packet.test.cc b/senf/Packets/Packet.test.cc index 0581add..e917d72 100644 --- a/senf/Packets/Packet.test.cc +++ b/senf/Packets/Packet.test.cc @@ -43,7 +43,7 @@ namespace { typedef unsigned key_t; }; - struct FooPacketType + struct FooPacketType : public senf::PacketTypeBase, public senf::PacketTypeMixin { @@ -57,7 +57,7 @@ namespace { // mode. Otherwise, mixin::nextPacketRange() would query the parser for it's size to find // the header size. Since the parser is VoidPacketParser, the header size would therefore be // 0 - static size_type initHeadSize() + static size_type initHeadSize() { return initSize(); } }; typedef senf::ConcretePacket FooPacket; @@ -65,7 +65,7 @@ namespace { struct BarPacketParser : public senf::PacketParserBase { # include SENF_FIXED_PARSER() - + SENF_PARSER_FIELD( type, senf::UInt16Parser ); SENF_PARSER_FIELD( length, senf::Int32Parser ); SENF_PARSER_FIELD( reserved, senf::UInt16Parser ); @@ -77,7 +77,7 @@ namespace { SENF_PARSER_FINALIZE(BarPacketParser); }; - struct BarPacketType + struct BarPacketType : public senf::PacketTypeBase, public senf::PacketTypeMixin { @@ -116,7 +116,7 @@ namespace { std::ostream & operator<<(std::ostream & os, IntAnnotation const & v) { os << v.value; return os; } - + struct LargeAnnotation { char value[32]; }; @@ -152,7 +152,7 @@ namespace { SENF_AUTO_UNIT_TEST(packet) { - senf::Packet packet (FooPacket::create()); + senf::Packet packet (FooPacket::create()); BarPacket::createAfter(packet); BOOST_REQUIRE( packet ); @@ -171,7 +171,7 @@ SENF_AUTO_UNIT_TEST(packet) BOOST_CHECK( packet.next().is() ); BOOST_CHECK( packet.first() == packet ); BOOST_CHECK( packet.last() == packet.next() ); - + senf::Packet p2 (packet.next()); BOOST_CHECK( p2 ); packet.parseNextAs(); @@ -180,7 +180,7 @@ SENF_AUTO_UNIT_TEST(packet) BOOST_CHECK( packet.next().is() ); BOOST_CHECK( ! p2 ); BOOST_CHECK( packet.next().as() ); - + p2 = packet.next().clone(); BOOST_REQUIRE( p2 ); packet.next().append( p2 ); @@ -193,19 +193,19 @@ SENF_AUTO_UNIT_TEST(packet) BOOST_CHECK_EQUAL( senf::PacketRegistry::key(packet), 1u ); packet.next().parseNextAs( senf::PacketRegistry::lookup(2u).factory() ); BOOST_CHECK( packet.next().next().is() ); - + std::stringstream s; packet.dump(s); - BOOST_CHECK_EQUAL( s.str(), + BOOST_CHECK_EQUAL( s.str(), "Annotations:\n" " (anonymous namespace)::ComplexAnnotation: no value\n" " (anonymous namespace)::IntAnnotation: 0\n" "BarPacket:\n" " type: 0\n" " length: 0\n" ); - + packet.finalizeAll(); - BOOST_CHECK_EQUAL( packet.last().as()->type(), + BOOST_CHECK_EQUAL( packet.last().as()->type(), BarPacket::Parser::type_t::value_type(-1) ); packet.last().append(FooPacket::create()); packet.finalizeThis(); @@ -236,7 +236,7 @@ SENF_AUTO_UNIT_TEST(packet) BOOST_CHECK( packet.last().rfind() == packet.last() ); BOOST_CHECK( packet.next() == packet.next() ); BOOST_CHECK( packet.last().prev().prev() == packet ); - + senf::DataPacket::createAfter(packet); BOOST_CHECK_THROW( packet.next().next().next().parseNextAs(), senf::InvalidPacketChainException ); @@ -268,13 +268,13 @@ SENF_AUTO_UNIT_TEST(concretePacket) // No 'u' suffix here to check, that the disable_if works ... BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,10).size(), 10u ); BOOST_CHECK_EQUAL( packet.size(), 14u ); - + BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,2u,senf::noinit).size(), 2u ); BOOST_CHECK_EQUAL( packet.size(), 6u ); - + BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,data).size(), 6u ); BOOST_CHECK_EQUAL( packet.size(), 10u ); - + BOOST_CHECK_EQUAL( FooPacket::createBefore(packet).size(), 14u ); BOOST_CHECK_EQUAL( packet.size(), 10u ); @@ -307,7 +307,7 @@ SENF_AUTO_UNIT_TEST(packetAssign) bar2->type() << 0x2A2Bu; bar1.parser() << bar2; - + BOOST_CHECK_EQUAL( bar1->type(), 0x2A2Bu ); }