X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.test.cc;h=b2191c8eba0787621c006c8ac26eff9b42ce710e;hb=7ee689fe38d66aa3a0004d55e8708750d35adc0b;hp=72e05696beb14cb70471e967d41ecdf2ccce921b;hpb=84f14a42f9993e186c7897ce0db021300e0a2d48;p=senf.git

diff --git a/senf/Packets/Packet.test.cc b/senf/Packets/Packet.test.cc
index 72e0569..b2191c8 100644
--- a/senf/Packets/Packet.test.cc
+++ b/senf/Packets/Packet.test.cc
@@ -36,7 +36,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -160,6 +160,9 @@ SENF_AUTO_UNIT_TEST(packet)
     senf::Packet packet (FooPacket::create());
     BarPacket::createAfter(packet);
 
+    BOOST_CHECK_THROW( senf::Packet().as<BarPacket>(), senf::WrapException<std::bad_cast> );
+    BOOST_CHECK_THROW( packet.as<BarPacket>(), senf::WrapException<std::bad_cast> );
+
     BOOST_REQUIRE( packet );
     BOOST_CHECK( packet.next() );
     BOOST_CHECK( ! packet.next().next(senf::nothrow) );
@@ -178,8 +181,18 @@ SENF_AUTO_UNIT_TEST(packet)
     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<FooPacket>();
     BOOST_CHECK_EQUAL( packet.size(), 12u );
     BOOST_CHECK_EQUAL( packet.next().size(), 8u );
@@ -188,6 +201,7 @@ SENF_AUTO_UNIT_TEST(packet)
     BOOST_CHECK( packet.next().as<FooPacket>() );
 
     p2 = packet.next().clone();
+    BOOST_CHECK( ! packet.is_shared() );
     BOOST_REQUIRE( p2 );
     packet.next().append( p2 );
     BOOST_REQUIRE( packet.next().next() );
@@ -338,14 +352,23 @@ SENF_AUTO_UNIT_TEST(packetAnnotation)
     BOOST_CHECK_EQUAL( p2.annotation<ComplexAnnotation>().s, "dead beef" );
     BOOST_CHECK_EQUAL( p2.annotation<ComplexAnnotation>().i, 0x12345678 );
 
+    senf::Packet pClone (packet.clone());
+
+    p2.clearAnnotations();
+    BOOST_CHECK_EQUAL( p2.annotation<ComplexAnnotation>().s, "empty" );
+    BOOST_CHECK_EQUAL( p2.annotation<ComplexAnnotation>().i, -1 );
+    BOOST_CHECK_EQUAL( p2.annotation<IntAnnotation>().value, 0 );
+
+    BOOST_CHECK_EQUAL( pClone.annotation<IntAnnotation>().value, 0xDEADBEEFu );
+    BOOST_CHECK_EQUAL( pClone.annotation<ComplexAnnotation>().s, "dead beef" );
+    BOOST_CHECK_EQUAL( pClone.annotation<ComplexAnnotation>().i, 0x12345678 );
+
     BOOST_CHECK( Reg::lookup<IntAnnotation>() >= 0 );
     BOOST_CHECK( Reg::lookup<LargeAnnotation>() < 0 );
     BOOST_CHECK( Reg::lookup<ComplexAnnotation>() < 0 );
     BOOST_CHECK( Reg::lookup<ComplexEmptyAnnotation>() < 0 );
 
-#ifdef SENF_DEBUG
     std::stringstream ss;
-
     senf::dumpPacketAnnotationRegistry(ss);
     BOOST_CHECK_EQUAL(
         ss.str(),
@@ -356,7 +379,6 @@ SENF_AUTO_UNIT_TEST(packetAnnotation)
         "(anonymous namespace)::ComplexEmptyAnnotation             no    yes          1\n"
         "(anonymous namespace)::IntAnnotation                      yes   no           4\n"
         "(anonymous namespace)::LargeAnnotation                    no    no          32\n" );
-#endif
 }
 
 #ifdef COMPILE_CHECK
@@ -379,7 +401,7 @@ COMPILE_FAIL(invalidAnnotation)
 
 #endif
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_