X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Extensions.test.cc;h=7b6791c58b0b8215d6a21e455ddcd506650c72ca;hb=b559d8e50f059a49d0ac98aba08b4480a3da5b22;hp=d92a354a67e4a6bef53a2a4a2468e4ffb334b1d8;hpb=6c0332484574ed1cb571bbc0dc9f0a37d6653282;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
index d92a354..7b6791c 100644
--- a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
+++ b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc
@@ -41,7 +41,7 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(ipv6Extensions_fragment)
+SENF_AUTO_UNIT_TEST(ipv6Extensions_fragment)
 {
     // Just for the fun of it, we test a nice chain: A fragment of a fragmented UDP packet
     unsigned char Fragment_packetData[] = {
@@ -104,7 +104,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_fragment)
 }
 
 
-BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing)
+SENF_AUTO_UNIT_TEST(ipv6Extensions_routing)
 {
     unsigned char Routing_packetData[] = {
         // IP header
@@ -161,7 +161,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing)
 }
 
 
-BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse)
+SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse)
 {
     unsigned char HopByHop_packetData[] = {
         0x60, 0x00, 0x00, 0x00, // IP version, class, flow label
@@ -224,7 +224,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse)
 }
 
 
-BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)
+SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)
 {
     std::ostringstream oss (std::ostringstream::out);
     unsigned char HopByHop_packetData[] = {
@@ -277,7 +277,6 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create)
 
     senf::IPv6HopByHopOptionsPacket pext (senf::IPv6HopByHopOptionsPacket::createAfter(ip) );
     pext->nextHeader() = 58u;
-    pext->headerLength() = 0u;
     {
         senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optC(pext->options() );
         {
@@ -329,7 +328,7 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN)
+SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN)
 {    
     senf::IPv6HopByHopOptionsPacket p ( senf::IPv6HopByHopOptionsPacket::create() );
     p->nextHeader() = 0x3a;
@@ -355,7 +354,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN)
 }
 
 
-BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse_SN)
+SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse_SN)
 {
     unsigned char data[] = { 
             0x3a, 0x01,  // Hop-By-Hop Header (nextHeader, length) 
@@ -369,15 +368,20 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse_SN)
     senf::IPv6HopByHopOptionsPacket p ( senf::IPv6HopByHopOptionsPacket::create(data) );
     BOOST_CHECK_EQUAL( p->nextHeader(), 0x3a);
     
-    typedef senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optContainer_t; 
-    optContainer_t optC (p->options() );
-    optContainer_t::iterator listIter (optC.begin());
+    {
+        typedef senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optContainer_t;
+        optContainer_t optC (p->options() );
+        optContainer_t::iterator listIter (optC.begin());
     
-    BOOST_CHECK_EQUAL( listIter->optionType(), 0x0d);
-    BOOST_CHECK( listIter->is<IPv6ChecksumOptionParser>());
-    IPv6ChecksumOptionParser opt ( listIter->as<IPv6ChecksumOptionParser>());
-    BOOST_CHECK_EQUAL( opt.extendedType(), 0x4d);
-    BOOST_CHECK_EQUAL( opt.checksum(), 0x01234567);
+        BOOST_CHECK_EQUAL( listIter->optionType(), 0x0d);
+        BOOST_CHECK( listIter->is<IPv6ChecksumOptionParser>());
+        IPv6ChecksumOptionParser opt ( listIter->as<IPv6ChecksumOptionParser>());
+        BOOST_CHECK_EQUAL( opt.extendedType(), 0x4d);
+        BOOST_CHECK_EQUAL( opt.checksum(), 0x01234567);
+    }
+
+    std::ostringstream oss (std::ostringstream::out);
+    SENF_CHECK_NO_THROW( p.dump( oss));
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////