X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FParseArray.test.cc;h=2d21600153a2c2e8002df786d52871212f8bb63c;hb=d6abda313f70c8a849c5e3f3bbfc12ce301789f1;hp=8dc19ae1d557c07a7279a9c07a30dc320b1669df;hpb=f13c1275e48e97dceb7de7925793a4c69a5aeb61;p=senf.git

diff --git a/Packets/ParseArray.test.cc b/Packets/ParseArray.test.cc
index 8dc19ae..2d21600 100644
--- a/Packets/ParseArray.test.cc
+++ b/Packets/ParseArray.test.cc
@@ -26,12 +26,9 @@
 //#include "ParseArray.test.ih"
 
 // Custom includes
-#include "PacketInterpreter.hh"
-#include "ParseArray.hh"
-#include "ParseInt.hh"
-#include "PacketType.hh"
+#include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -43,23 +40,25 @@ namespace {
 
     struct SomePacketParser : public senf::PacketParserBase
     {
-        SENF_PACKET_PARSER_INIT(SomePacketParser);
+#       include SENF_FIXED_PARSER()
 
         typedef senf::Parse_Array<2,senf::Parse_UInt24> Parse_Array2;
         
-        SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
-            ((Field)( array, Parse_Array2 ))
-            ((Field)( index, senf::Parse_UInt16 )) );
+        SENF_PARSER_FIELD( array, Parse_Array2 );
+        SENF_PARSER_FIELD( index, senf::Parse_UInt16 );
+
+        SENF_PARSER_FINALIZE(SomePacketParser);
     };
 
     struct SomeOtherParser : public senf::PacketParserBase
     {
-        SENF_PACKET_PARSER_INIT(SomeOtherParser);
+#       include SENF_FIXED_PARSER()
         
         typedef senf::Parse_Array<1,SomePacketParser> Parse_Array1;
 
-        SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
-            ((Field)( fields, Parse_Array1 )) );
+        SENF_PARSER_FIELD( fields, Parse_Array1 );
+
+        SENF_PARSER_FINALIZE(SomeOtherParser);
     };
 }