X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FIPv4Packet.test.cc;h=a93e631511f0f0241785ff059ec8a6edd5dea6f9;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=972b944027e3bd3c28b35e30850cde16aa4bf1f8;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git

diff --git a/Packets/DefaultBundle/IPv4Packet.test.cc b/Packets/DefaultBundle/IPv4Packet.test.cc
index 972b944..a93e631 100644
--- a/Packets/DefaultBundle/IPv4Packet.test.cc
+++ b/Packets/DefaultBundle/IPv4Packet.test.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief IPv4Packet unit tests */
 
 //#include "IPv4Packet.test.hh"
 //#include "IPv4Packet.test.ih"
@@ -37,15 +38,13 @@
 
 using namespace senf;
 
-BOOST_AUTO_UNIT_TEST(ipV4Packet_packet)
+BOOST_AUTO_UNIT_TEST(ipV4Packet_parse)
 {
-
-    unsigned char data[] = { 0x01, 0x02, 0x03, 0x04,
-                             0x05, 0x06, 0x07, 0x08,
-                             0x09, 0x0A, 0x0B, 0x0C,
-                             0x11, 0x12, 0x13, 0x14,
-                             0x15, 0x16, 0x17, 0x18
-                           };
+    unsigned char data[] = {
+            0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+            0x09, 0x0A, 0x0B, 0x0C, 0x11, 0x12, 0x13, 0x14,
+            0x15, 0x16, 0x17, 0x18
+    };
 
     senf::IPv4Packet p (senf::IPv4Packet::create(data));
 
@@ -54,7 +53,6 @@ BOOST_AUTO_UNIT_TEST(ipV4Packet_packet)
     BOOST_CHECK_EQUAL( p->tos(),         0x02u       );
     BOOST_CHECK_EQUAL( p->length(),      0x0304u     );
     BOOST_CHECK_EQUAL( p->identifier(),  0x0506u     );
-    BOOST_CHECK_EQUAL( p->reserved(),    0           );
     BOOST_CHECK_EQUAL( p->df(),          0           );
     BOOST_CHECK_EQUAL( p->mf(),          0           );
     BOOST_CHECK_EQUAL( p->frag(),        0x0708u     );
@@ -63,6 +61,9 @@ BOOST_AUTO_UNIT_TEST(ipV4Packet_packet)
     BOOST_CHECK_EQUAL( p->checksum(),    0x0B0Cu     );
     BOOST_CHECK_EQUAL( p->source().value(), senf::INet4Address(0x11121314u) );
     BOOST_CHECK_EQUAL( p->destination().value(), senf::INet4Address(0x15161718u) );
+
+    std::ostringstream oss (std::ostringstream::out);
+    SENF_CHECK_NO_THROW( p.dump( oss));
 }
 
 BOOST_AUTO_UNIT_TEST(ipV4Packet_create)
@@ -77,13 +78,13 @@ BOOST_AUTO_UNIT_TEST(ipV4Packet_create)
 
     BOOST_CHECK( ! ip->validateChecksum() );
 
-    ip.finalize();
+    ip.finalizeAll();
     BOOST_CHECK_EQUAL( ip->length(), 28u );
     BOOST_CHECK_EQUAL( ip->protocol(), 17u );
     BOOST_CHECK_EQUAL( ip->checksum(), 0xbad2 );
 
     // Check, that the checksum field is correctly skipped
-    ip.finalize();
+    ip.finalizeAll();
     BOOST_CHECK_EQUAL( ip->checksum(), 0xbad2 );
 
     BOOST_CHECK( ip->validateChecksum() );
@@ -92,7 +93,7 @@ BOOST_AUTO_UNIT_TEST(ipV4Packet_create)
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100