X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.test.cc;h=62b22c4cc7b3093f82895c786d32c92f97d9f6d1;hb=80550046686fc160f5d7ff076f1b167a13538466;hp=f1b941d67344fb85899bb55fcf6640089583caed;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git diff --git a/senf/Packets/Packet.test.cc b/senf/Packets/Packet.test.cc index f1b941d..62b22c4 100644 --- a/senf/Packets/Packet.test.cc +++ b/senf/Packets/Packet.test.cc @@ -29,6 +29,7 @@ // Custom includes #include #include +#include #include "Packets.hh" #include @@ -43,7 +44,7 @@ namespace { typedef unsigned key_t; }; - struct FooPacketType + struct FooPacketType : public senf::PacketTypeBase, public senf::PacketTypeMixin { @@ -57,7 +58,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 +66,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 +78,7 @@ namespace { SENF_PARSER_FINALIZE(BarPacketParser); }; - struct BarPacketType + struct BarPacketType : public senf::PacketTypeBase, public senf::PacketTypeMixin { @@ -90,8 +91,8 @@ namespace { using mixin::init; static void dump(packet p, std::ostream & os) { os << "BarPacket:\n" - << " type: " << p->type() << "\n" - << " length: " << p->length() << "\n"; + << senf::fieldName("type") << p->type() << "\n" + << senf::fieldName("length") << p->length() << "\n"; } static void finalize(packet p) { if (p.next(senf::nothrow)) @@ -106,17 +107,17 @@ namespace { typedef BarPacketType::packet BarPacket; namespace reg { - senf::PacketRegistry::RegistrationProxy registerFoo(1u); - senf::PacketRegistry::RegistrationProxy registerBar(2u); + senf::PacketRegistry::ScopedRegistrationProxy registerFoo(1u); + senf::PacketRegistry::ScopedRegistrationProxy registerBar(2u); } struct IntAnnotation { - unsigned value; + boost::uint32_t value; }; std::ostream & operator<<(std::ostream & os, IntAnnotation const & v) { os << v.value; return os; } - + struct LargeAnnotation { char value[32]; }; @@ -126,9 +127,12 @@ namespace { struct ComplexAnnotation : senf::ComplexAnnotation { - ComplexAnnotation() : s(), i() {} + ComplexAnnotation() : s("empty"), i(-1) {} std::string s; - int i; + boost::int32_t i; + // padding so the size does not depend on the platform ... + struct _ {std::string s;boost::int32_t i;}; + char __ [32-sizeof(_)]; }; std::ostream & operator<<(std::ostream & os, ComplexAnnotation const & v) @@ -152,15 +156,17 @@ namespace { SENF_AUTO_UNIT_TEST(packet) { - senf::Packet packet (FooPacket::create()); + BOOST_CHECK(! senf::Packet().is() ); + senf::Packet packet (FooPacket::create()); BarPacket::createAfter(packet); BOOST_REQUIRE( packet ); BOOST_CHECK( packet.next() ); BOOST_CHECK( ! packet.next().next(senf::nothrow) ); + BOOST_CHECK( ! packet.next().next(senf::nothrow).is() ); BOOST_CHECK( ! packet.prev(senf::nothrow) ); BOOST_CHECK( packet.next().prev() == packet ); - BOOST_CHECK( packet.next() != packet ); + SENF_CHECK_NOT_EQUAL( packet.next(), packet ); BOOST_CHECK_EQUAL( std::distance(packet.data().begin(), packet.next().data().begin()), 4 ); BOOST_CHECK_EQUAL( std::distance(packet.data().begin(), packet.data().end()), 12 ); BOOST_CHECK_EQUAL( std::distance(packet.next().data().begin(), packet.next().data().end()), 8 ); @@ -171,17 +177,28 @@ SENF_AUTO_UNIT_TEST(packet) BOOST_CHECK( packet.next().is() ); BOOST_CHECK( packet.first() == packet ); BOOST_CHECK( packet.last() == packet.next() ); - + + BOOST_CHECK( ! packet.is_shared() ); + { + senf::Packet p2 (packet); + BOOST_CHECK( packet.is_shared() ); + BOOST_CHECK( p2.is_shared() ); + } + BOOST_CHECK( ! packet.is_shared() ); + senf::Packet p2 (packet.next()); BOOST_CHECK( p2 ); + BOOST_CHECK( packet.is_shared() ); + BOOST_CHECK( p2.is_shared() ); packet.parseNextAs(); BOOST_CHECK_EQUAL( packet.size(), 12u ); BOOST_CHECK_EQUAL( packet.next().size(), 8u ); BOOST_CHECK( packet.next().is() ); BOOST_CHECK( ! p2 ); BOOST_CHECK( packet.next().as() ); - + p2 = packet.next().clone(); + BOOST_CHECK( ! packet.is_shared() ); BOOST_REQUIRE( p2 ); packet.next().append( p2 ); BOOST_REQUIRE( packet.next().next() ); @@ -193,19 +210,18 @@ 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" + " (anonymous namespace)::IntAnnotation : 0\n" "BarPacket:\n" - " type: 0\n" - " length: 0\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 +252,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,20 +284,35 @@ 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 ); BOOST_CHECK_EQUAL( FooPacket::createBefore(packet,senf::noinit).size(), 10u ); BOOST_CHECK_EQUAL( packet.size(), 10u ); - BOOST_CHECK( packet.clone() != packet ); + BOOST_CHECK_EQUAL( FooPacket::createInsertBefore(packet).size(), 14u ); + BOOST_CHECK_EQUAL( packet.size(), 10u ); + BOOST_REQUIRE( packet.prev() ); + BOOST_CHECK_EQUAL( packet.prev().size(), 14u ); + BOOST_REQUIRE( packet.prev().prev() ); + BOOST_CHECK_EQUAL( packet.prev().prev().size(), 14u ); + + BOOST_CHECK_EQUAL( FooPacket::createInsertBefore(packet,senf::noinit).size(), 10u ); + BOOST_CHECK_EQUAL( packet.size(), 10u ); + BOOST_REQUIRE_NO_THROW( packet.prev().prev().prev() ); + BOOST_CHECK_THROW( packet.prev().prev().prev().prev(), senf::InvalidPacketChainException ); + BOOST_CHECK_EQUAL( packet.prev().size(), 10u ); + BOOST_CHECK_EQUAL( packet.prev().prev().size(), 14u ); + BOOST_CHECK_EQUAL( packet.prev().prev().prev().size(), 14u ); + + SENF_CHECK_NOT_EQUAL( packet.clone(), packet ); BOOST_CHECK_EQUAL( BarPacket::create()->reserved(), 0xA0A0u ); } @@ -292,16 +323,22 @@ SENF_AUTO_UNIT_TEST(packetAssign) bar2->type() << 0x2A2Bu; bar1.parser() << bar2; - + BOOST_CHECK_EQUAL( bar1->type(), 0x2A2Bu ); } SENF_AUTO_UNIT_TEST(packetAnnotation) { + typedef senf::detail::AnnotationRegistry Reg; + senf::Packet packet (FooPacket::create()); BarPacket::createAfter(packet); ComplexAnnotation & ca (packet.annotation()); + + BOOST_CHECK_EQUAL( ca.s, "empty" ); + BOOST_CHECK_EQUAL( ca.i, -1 ); + ca.s = "dead beef"; ca.i = 0x12345678; SENF_CHECK_NO_THROW( packet.annotation().value = 0xDEADBEEF ); @@ -312,10 +349,33 @@ SENF_AUTO_UNIT_TEST(packetAnnotation) BOOST_CHECK_EQUAL( p2.annotation().s, "dead beef" ); BOOST_CHECK_EQUAL( p2.annotation().i, 0x12345678 ); - BOOST_CHECK( senf::detail::AnnotationIndexer::Small ); - BOOST_CHECK( ! senf::detail::AnnotationIndexer::Small ); - BOOST_CHECK( ! senf::detail::AnnotationIndexer::Small ); - BOOST_CHECK( ! senf::detail::AnnotationIndexer::Small ); + senf::Packet pClone (packet.clone()); + + p2.clearAnnotations(); + BOOST_CHECK_EQUAL( p2.annotation().s, "empty" ); + BOOST_CHECK_EQUAL( p2.annotation().i, -1 ); + BOOST_CHECK_EQUAL( p2.annotation().value, 0 ); + + BOOST_CHECK_EQUAL( pClone.annotation().value, 0xDEADBEEFu ); + BOOST_CHECK_EQUAL( pClone.annotation().s, "dead beef" ); + BOOST_CHECK_EQUAL( pClone.annotation().i, 0x12345678 ); + + BOOST_CHECK( Reg::lookup() >= 0 ); + BOOST_CHECK( Reg::lookup() < 0 ); + BOOST_CHECK( Reg::lookup() < 0 ); + BOOST_CHECK( Reg::lookup() < 0 ); + + std::stringstream ss; + senf::dumpPacketAnnotationRegistry(ss); + BOOST_CHECK_EQUAL( + ss.str(), + "SENF_PACKET_ANNOTATION_SLOTS = 8\n" + "SENF_PACKET_ANNOTATION_SLOTSIZE = 16\n" + "TYPE FAST COMPLEX SIZE\n" + "(anonymous namespace)::ComplexAnnotation no yes 32\n" + "(anonymous namespace)::ComplexEmptyAnnotation no yes 1\n" + "(anonymous namespace)::IntAnnotation yes no 4\n" + "(anonymous namespace)::LargeAnnotation no no 32\n" ); } #ifdef COMPILE_CHECK @@ -326,7 +386,7 @@ COMPILE_FAIL(invalidAnnotation) # ifdef BOOST_HAS_TYPE_TRAITS_INTRINSICS senf::Packet packet (FooPacket::create()); - (void) packet.annotation(); + senf::IGNORE( packet.annotation() ); # else # endif