minor fixes

[senf.git] / Packets / PacketParser.test.cc

diff --git a/Packets/PacketParser.test.cc b/Packets/PacketParser.test.cc
index 49760ce..66d84f3 100644 (file)
--- a/Packets/PacketParser.test.cc
+++ b/Packets/PacketParser.test.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// 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
@@ -42,7 +42,7 @@ namespace {
     {
 #       include SENF_FIXED_PARSER()
         SENF_PARSER_FINALIZE(SimpleParser);
-        
+
         using senf::PacketParserBase::check;
         using senf::PacketParserBase::validate;
     };
@@ -51,8 +51,8 @@ namespace {
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSER_FIELD( name, senf::Parse_UInt16 );
-        SENF_PARSER_FIELD( id,   senf::Parse_Int32  );
+        SENF_PARSER_FIELD( name, senf::UInt16Parser );
+        SENF_PARSER_FIELD( id,   senf::Int32Parser  );
 
         SENF_PARSER_FINALIZE(FooParser);
     };
@@ -61,8 +61,8 @@ namespace {
     {
 #       include SENF_PARSER()
 
-        SENF_PARSER_FIELD( name, senf::Parse_UInt16 );
-        SENF_PARSER_FIELD( id,   senf::Parse_Int32  );
+        SENF_PARSER_FIELD( name, senf::UInt16Parser );
+        SENF_PARSER_FIELD( id,   senf::Int32Parser  );
 
         SENF_PARSER_FINALIZE(BarParser);
     };
@@ -70,7 +70,8 @@ namespace {
 
 BOOST_AUTO_UNIT_TEST(packetParserBase)
 {
-    senf::PacketInterpreter<VoidPacket>::ptr pi (senf::PacketInterpreter<VoidPacket>::create(6u));
+    senf::PacketInterpreter<VoidPacket>::ptr pi (senf::PacketInterpreter<VoidPacket>::create(
+            senf::PacketInterpreterBase::size_type(6u)));
     SimpleParser p (pi->data().begin(),&pi->data());
 
     BOOST_CHECK( pi->data().begin() == p.i() );
@@ -83,7 +84,7 @@ BOOST_AUTO_UNIT_TEST(packetParserBase)
     // otherwise ...
     BOOST_CHECK_EQUAL( FooParser::fixed_bytes+0, 6u );
     BOOST_CHECK_EQUAL( BarParser(pi->data().begin(),&pi->data()).bytes(), 6u );
-    BOOST_CHECK_EQUAL( senf::bytes(senf::Parse_UInt16(pi->data().begin(),&pi->data())), 2u );
+    BOOST_CHECK_EQUAL( senf::bytes(senf::UInt16Parser(pi->data().begin(),&pi->data())), 2u );
     BOOST_CHECK_EQUAL( senf::bytes(FooParser(pi->data().begin(),&pi->data())), 6u );
     BOOST_CHECK_EQUAL( senf::bytes(BarParser(pi->data().begin(),&pi->data())), 6u );
 
@@ -91,31 +92,10 @@ BOOST_AUTO_UNIT_TEST(packetParserBase)
     BOOST_CHECK_EQUAL( senf::init_bytes<BarParser>::value, 6u );
 }
 
-BOOST_AUTO_UNIT_TEST(safePacketParser)
-{
-    senf::PacketInterpreter<VoidPacket>::ptr pi (senf::PacketInterpreter<VoidPacket>::create(6u));
-    senf::SafePacketParser<senf::Parse_UInt16> p;
-    
-    BOOST_CHECK( !p );
-
-    p =  senf::Parse_UInt16(pi->data().begin(),&pi->data());
-
-    BOOST_CHECK( p );
-    (*p) = 0x1234u;
-    
-    BOOST_CHECK_EQUAL( (*p), 0x1234u );
-    BOOST_CHECK_EQUAL( p->data()[0], 0x12u );
-
-    p->data().resize(1024u);
-    BOOST_CHECK_EQUAL( (*p), 0x1234u );
-    (*p) = 0x2345u;
-    BOOST_CHECK_EQUAL( p->data()[0], 0x23u );
-}
-
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 
-\f
+
 // Local Variables:
 // mode: c++
 // fill-column: 100