X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FParseHelpers.test.cc;h=e840603d767018080077841973f420be54b48efb;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=b5a5f222c0118f45c652c0d468dc561908cdc9d9;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/ParseHelpers.test.cc b/senf/Packets/ParseHelpers.test.cc
index b5a5f22..e840603 100644
--- a/senf/Packets/ParseHelpers.test.cc
+++ b/senf/Packets/ParseHelpers.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -47,7 +47,7 @@ namespace {
         SENF_PARSER_CUSTOM_FIELD ( customField          , int, 2             ) {
             return parse<senf::UInt16Parser>(customField_offset);
         }
-        
+
         SENF_PARSER_BITFIELD     ( signedBitfield       , 4, signed          );
         SENF_PARSER_BITFIELD     ( unsignedBitfield     , 3, unsigned        );
         SENF_PARSER_BITFIELD     ( boolBitfield         , 1, bool            );
@@ -67,7 +67,7 @@ namespace {
 
         SENF_PARSER_PRIVATE_FIELD ( privLowbyteOfNormalField , senf::UInt8Parser  );
 
-        unsigned lowbyteOfNormalField() { 
+        unsigned lowbyteOfNormalField() {
             return privLowbyteOfNormalField();
         }
 
@@ -81,21 +81,21 @@ namespace {
 #       include SENF_FIXED_PARSER()
 
         SENF_PARSER_INHERIT( FixedBaseParser );
-        
+
         SENF_PARSER_FIELD        ( derivedField         , senf::UInt16Parser );
 
         SENF_PARSER_LABEL( end );
         SENF_PARSER_GOTO( signedBitfield );
 
         SENF_PARSER_FIELD        ( anotherOverlay       , senf::UInt16Parser );
-        
+
         SENF_PARSER_GOTO( end );
 
         SENF_PARSER_FINALIZE( FixedDerivedParser )
     };
 }
 
-BOOST_AUTO_UNIT_TEST(fixedParser)
+SENF_AUTO_UNIT_TEST(fixedParser)
 {
     unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x83, 0x84, 0x07, 0x08 };
 
@@ -140,7 +140,7 @@ BOOST_AUTO_UNIT_TEST(fixedParser)
     BOOST_CHECK_EQUAL (   derivedParser.overlayOfRoField()     , 0x0304  );
     BOOST_CHECK_EQUAL (   derivedParser.overlayOfBitfield()    , 0x83u   );
     BOOST_CHECK_EQUAL (   derivedParser.lowbyteOfNormalField() , 0x02u   );
-    
+
     BOOST_CHECK_EQUAL (   derivedParser.derivedField()         , 0x0708u );
     BOOST_CHECK_EQUAL (   derivedParser.anotherOverlay()       , 0x8384u );
 }
@@ -157,7 +157,7 @@ namespace {
         SENF_PARSER_CUSTOM_FIELD ( customField              , int, 2, 2          ) {
             return parse<senf::UInt16Parser>(customField_offset());
         }
-        
+
         SENF_PARSER_BITFIELD      ( signedBitfield           , 4, signed          );
         SENF_PARSER_BITFIELD      ( unsignedBitfield         , 3, unsigned        );
         SENF_PARSER_BITFIELD      ( boolBitfield             , 1, bool            );
@@ -177,7 +177,7 @@ namespace {
 
         SENF_PARSER_PRIVATE_FIELD ( privLowbyteOfNormalField , senf::UInt8Parser  );
 
-        unsigned lowbyteOfNormalField() { 
+        unsigned lowbyteOfNormalField() {
             return privLowbyteOfNormalField();
         }
 
@@ -191,28 +191,28 @@ namespace {
 #       include SENF_PARSER()
 
         SENF_PARSER_INHERIT( VariableBaseParser );
-        
+
         SENF_PARSER_FIELD        ( derivedField         , senf::UInt16Parser );
 
         SENF_PARSER_LABEL( end );
         SENF_PARSER_GOTO( signedBitfield );
 
         SENF_PARSER_FIELD        ( anotherOverlay       , senf::UInt16Parser );
-        
+
         SENF_PARSER_GOTO( end );
 
         SENF_PARSER_FINALIZE( VariableDerivedParser );
     };
 }
 
-BOOST_AUTO_UNIT_TEST(variableParser)
+SENF_AUTO_UNIT_TEST(variableParser)
 {
     unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x83, 0x84, 0x07, 0x08 };
 
     senf::DataPacket p (senf::DataPacket::create(data));
 
     VariableBaseParser baseParser (p.data().begin(), &p.data());
-    
+
     BOOST_CHECK_EQUAL ( senf::bytes(baseParser), 8u );
 
     BOOST_CHECK_EQUAL (   baseParser.normalField()          , 0x0102u );
@@ -250,7 +250,7 @@ BOOST_AUTO_UNIT_TEST(variableParser)
     BOOST_CHECK_EQUAL (   derivedParser.overlayOfRoField()     , 0x0304  );
     BOOST_CHECK_EQUAL (   derivedParser.overlayOfBitfield()    , 0x83u   );
     BOOST_CHECK_EQUAL (   derivedParser.lowbyteOfNormalField() , 0x02u   );
-    
+
     BOOST_CHECK_EQUAL (   derivedParser.derivedField()         , 0x0708u );
     BOOST_CHECK_EQUAL (   derivedParser.anotherOverlay()       , 0x8384u );
 }