X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FParseHelpers.test.cc;h=e4aa5bd094dc20854d3404a5d77c4b8140f7ac76;hb=b2689b6d92c4d22ecaea5ab271c0af8564a7d39b;hp=3d42cff6dca767fb99d43bd245f5a1580eaf1bc3;hpb=ab243554f940af9f873e1a920d0a6b7886c6f5cf;p=senf.git

diff --git a/Packets/ParseHelpers.test.cc b/Packets/ParseHelpers.test.cc
index 3d42cff..e4aa5bd 100644
--- a/Packets/ParseHelpers.test.cc
+++ b/Packets/ParseHelpers.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
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -41,11 +41,11 @@ namespace {
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSER_FIELD        ( normalField          , senf::Parse_UInt16 );
-        SENF_PARSER_FIELD_RO     ( roField              , senf::Parse_UInt16 );
+        SENF_PARSER_FIELD        ( normalField          , senf::UInt16Parser );
+        SENF_PARSER_FIELD_RO     ( roField              , senf::UInt16Parser );
 
         SENF_PARSER_CUSTOM_FIELD ( customField          , int, 2             ) {
-            return parse<senf::Parse_UInt16>(customField_offset);
+            return parse<senf::UInt16Parser>(customField_offset);
         }
         
         SENF_PARSER_BITFIELD     ( signedBitfield       , 4, signed          );
@@ -59,13 +59,13 @@ namespace {
         SENF_PARSER_LABEL( end );
         SENF_PARSER_GOTO( roField );
 
-        SENF_PARSER_FIELD        ( overlayOfRoField     , senf::Parse_Int16  );
+        SENF_PARSER_FIELD        ( overlayOfRoField     , senf::Int16Parser  );
         SENF_PARSER_SKIP( 2 );
-        SENF_PARSER_FIELD        ( overlayOfBitfield    , senf::Parse_UInt8  );
+        SENF_PARSER_FIELD        ( overlayOfBitfield    , senf::UInt8Parser  );
 
         SENF_PARSER_GOTO_OFFSET( 1 );
 
-        SENF_PARSER_PRIVATE_FIELD ( privLowbyteOfNormalField , senf::Parse_UInt8  );
+        SENF_PARSER_PRIVATE_FIELD ( privLowbyteOfNormalField , senf::UInt8Parser  );
 
         unsigned lowbyteOfNormalField() { 
             return privLowbyteOfNormalField();
@@ -82,12 +82,12 @@ namespace {
 
         SENF_PARSER_INHERIT( FixedBaseParser );
         
-        SENF_PARSER_FIELD        ( derivedField         , senf::Parse_UInt16 );
+        SENF_PARSER_FIELD        ( derivedField         , senf::UInt16Parser );
 
         SENF_PARSER_LABEL( end );
         SENF_PARSER_GOTO( signedBitfield );
 
-        SENF_PARSER_FIELD        ( anotherOverlay       , senf::Parse_UInt16 );
+        SENF_PARSER_FIELD        ( anotherOverlay       , senf::UInt16Parser );
         
         SENF_PARSER_GOTO( end );
 
@@ -151,11 +151,11 @@ namespace {
     {
 #       include SENF_PARSER()
 
-        SENF_PARSER_FIELD        ( normalField              , senf::Parse_UInt16 );
-        SENF_PARSER_FIELD_RO     ( roField                  , senf::Parse_UInt16 );
+        SENF_PARSER_FIELD        ( normalField              , senf::UInt16Parser );
+        SENF_PARSER_FIELD_RO     ( roField                  , senf::UInt16Parser );
 
         SENF_PARSER_CUSTOM_FIELD ( customField              , int, 2, 2          ) {
-            return parse<senf::Parse_UInt16>(customField_offset());
+            return parse<senf::UInt16Parser>(customField_offset());
         }
         
         SENF_PARSER_BITFIELD      ( signedBitfield           , 4, signed          );
@@ -169,13 +169,13 @@ namespace {
         SENF_PARSER_LABEL( end );
         SENF_PARSER_GOTO( roField );
 
-        SENF_PARSER_FIELD         ( overlayOfRoField         , senf::Parse_Int16  );
+        SENF_PARSER_FIELD         ( overlayOfRoField         , senf::Int16Parser  );
         SENF_PARSER_SKIP( 2, 2 );
-        SENF_PARSER_FIELD         ( overlayOfBitfield        , senf::Parse_UInt8  );
+        SENF_PARSER_FIELD         ( overlayOfBitfield        , senf::UInt8Parser  );
 
         SENF_PARSER_GOTO_OFFSET( 1, 1 );
 
-        SENF_PARSER_PRIVATE_FIELD ( privLowbyteOfNormalField , senf::Parse_UInt8  );
+        SENF_PARSER_PRIVATE_FIELD ( privLowbyteOfNormalField , senf::UInt8Parser  );
 
         unsigned lowbyteOfNormalField() { 
             return privLowbyteOfNormalField();
@@ -192,12 +192,12 @@ namespace {
 
         SENF_PARSER_INHERIT( VariableBaseParser );
         
-        SENF_PARSER_FIELD        ( derivedField         , senf::Parse_UInt16 );
+        SENF_PARSER_FIELD        ( derivedField         , senf::UInt16Parser );
 
         SENF_PARSER_LABEL( end );
         SENF_PARSER_GOTO( signedBitfield );
 
-        SENF_PARSER_FIELD        ( anotherOverlay       , senf::Parse_UInt16 );
+        SENF_PARSER_FIELD        ( anotherOverlay       , senf::UInt16Parser );
         
         SENF_PARSER_GOTO( end );