X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FVectorParser.test.cc;h=7ab112aac7c79c19a49074320f93c66dfcc59704;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=edb9578c1009869d005f733a7ea17544b6a98114;hpb=bea7cfcf3d02688ece159d76890acfe2d0051d71;p=senf.git

diff --git a/senf/Packets/VectorParser.test.cc b/senf/Packets/VectorParser.test.cc
index edb9578..7ab112a 100644
--- a/senf/Packets/VectorParser.test.cc
+++ b/senf/Packets/VectorParser.test.cc
@@ -34,14 +34,14 @@
 #include <boost/assign.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     struct VoidPacket : public senf::PacketTypeBase
     {};
 }
 
-BOOST_AUTO_UNIT_TEST(VectorParser)
+SENF_AUTO_UNIT_TEST(VectorParser)
 {
     unsigned char data[] = { 0x03,                                   // size
                              0x10, 0x11,  0x12, 0x13,  0x14, 0x15,   // data
@@ -54,7 +54,7 @@ BOOST_AUTO_UNIT_TEST(VectorParser)
 
     {
         UInt16VectorParser v (boost::next(p->data().begin(), 1), &p->data());
-        
+
         BOOST_CHECK_EQUAL( v[0], 0x1011 );
         BOOST_CHECK_EQUAL( v[2], 0x1415 );
         BOOST_CHECK_EQUAL( v.size(), 3u );
@@ -63,7 +63,7 @@ BOOST_AUTO_UNIT_TEST(VectorParser)
         p->data()[0] = 0x06;
         BOOST_CHECK_EQUAL( v.size(), 6u );
         BOOST_CHECK_EQUAL( v.bytes(), 12u );
-        
+
         UInt16VectorParser::iterator b (v.begin());
         UInt16VectorParser::iterator e (v.end());
         BOOST_CHECK_EQUAL(std::distance(b,e), UInt16VectorParser::difference_type(v.size()));
@@ -85,7 +85,7 @@ BOOST_AUTO_UNIT_TEST(VectorParser)
         v.push_back_space() = 37u;
         BOOST_CHECK_EQUAL( v.size(), 9u );
         BOOST_CHECK_EQUAL( v[8], 37u );
-        
+
         v.push_front(0xf3f4u);
         BOOST_CHECK_EQUAL( v.size(), 10u );
         BOOST_CHECK_EQUAL( v[0], 0xf3f4u );
@@ -116,7 +116,7 @@ BOOST_AUTO_UNIT_TEST(VectorParser)
     }
 }
 
-BOOST_AUTO_UNIT_TEST(VectorParser_wrapper)
+SENF_AUTO_UNIT_TEST(VectorParser_wrapper)
 {
     unsigned char data[] = { 0x03,                                   // size
                              0x10, 0x11,  0x12, 0x13,  0x14, 0x15,   // data
@@ -134,7 +134,7 @@ BOOST_AUTO_UNIT_TEST(VectorParser_wrapper)
     BOOST_CHECK_EQUAL( w.size(), 3u );
     p->data()[0] = 0x06;
     BOOST_CHECK_EQUAL( w.size(), 6u );
-    BOOST_CHECK_EQUAL( std::distance(w.begin(),w.end()), 
+    BOOST_CHECK_EQUAL( std::distance(w.begin(),w.end()),
                        UInt16VectorParser::difference_type(w.size()) );
 
     w.shift(w.begin()+1);
@@ -173,7 +173,7 @@ BOOST_AUTO_UNIT_TEST(VectorParser_wrapper)
     BOOST_CHECK_EQUAL( w.parser().size(), 0u );
 }
 
-BOOST_AUTO_UNIT_TEST(dynamicPolicyVector)
+SENF_AUTO_UNIT_TEST(dynamicPolicyVector)
 {
     unsigned char data[] = { 0x03,                                   // size
                              0x10, 0x11,  0x12, 0x13,  0x14, 0x15,   // data
@@ -188,7 +188,7 @@ BOOST_AUTO_UNIT_TEST(dynamicPolicyVector)
     UInt16VectorParser v (senf::UInt8Parser(p->data().begin(), &p->data()),
                           boost::next(p->data().begin(),1), &p->data());
     UInt16VectorParser::container w (v);
-    
+
     BOOST_CHECK_EQUAL( v.size(), 3u );
     BOOST_CHECK_EQUAL( w.size(), 3u );
 
@@ -208,7 +208,7 @@ namespace {
         static unsigned set(unsigned v) { return v+2; }
     };
 
-    struct TestVectorParser 
+    struct TestVectorParser
         : public senf::PacketParserBase
     {
 #       include SENF_PARSER()
@@ -221,7 +221,7 @@ namespace {
 
         SENF_PARSER_FINALIZE( TestVectorParser );
     };
-        
+
     struct TestVectorPacketType
         : public senf::PacketTypeBase,
           public senf::PacketTypeMixin<TestVectorPacketType>
@@ -231,13 +231,13 @@ namespace {
 
         using mixin::nextPacketRange;
         using mixin::init;
-        using mixin::initSize;        
+        using mixin::initSize;
     };
     typedef senf::ConcretePacket<TestVectorPacketType> TestVectorPacket;
 
 }
 
-BOOST_AUTO_UNIT_TEST(vectorMacro_parse)
+SENF_AUTO_UNIT_TEST(vectorMacro_parse)
 {
     unsigned char data[] = { 0x05,                   // size1
                              0x04,                   // size2
@@ -250,7 +250,7 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_parse)
 
     senf::DataPacket p (senf::DataPacket::create(data));
     TestVectorParser parser (p.data().begin(), &p.data());
-    
+
     BOOST_CHECK_EQUAL( parser.vec1().size(), 3u );
     BOOST_CHECK_EQUAL( parser.vec2().size(), 2u );
     BOOST_CHECK_EQUAL( parser.dummy(), 0x01020304u );
@@ -261,7 +261,7 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_parse)
     BOOST_CHECK_EQUAL( parser.vec2()[1], 0x0D0Eu );
 }
 
-BOOST_AUTO_UNIT_TEST(vectorMacro_create)
+SENF_AUTO_UNIT_TEST(vectorMacro_create)
 {
     TestVectorPacket p (TestVectorPacket::create());
     p->dummy() = 0x01020304u;
@@ -271,8 +271,8 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_create)
     p->vec2().push_back( 0x0B0Cu);
     p->vec2().push_back( 0x0D0Eu);
     p.finalizeAll();
-    
-    unsigned char data[] = { 
+
+    unsigned char data[] = {
             0x05,                   // size1
             0x04,                   // size2
             0x01, 0x02, 0x03, 0x04, // dummy
@@ -282,13 +282,13 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_create)
             0x0B, 0x0C,             // vec2[0]
             0x0D, 0x0E              // vec2[1]
     };
-    SENF_CHECK_EQUAL_COLLECTIONS( 
+    SENF_CHECK_EQUAL_COLLECTIONS(
             data, data+sizeof(data), p.data().begin(), p.data().end() );
 }
 
 namespace {
-    
-    struct TestVectorBaseParser 
+
+    struct TestVectorBaseParser
         : public senf::PacketParserBase
     {
 #       include SENF_PARSER()
@@ -315,7 +315,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(vectorMacro_inherit)
+SENF_AUTO_UNIT_TEST(vectorMacro_inherit)
 {
     unsigned char data[] = { 0x05,                   // size1
                              0x04,                   // size2
@@ -328,7 +328,7 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_inherit)
 
     senf::DataPacket p (senf::DataPacket::create(data));
     TestVectorDerivedParser parser (p.data().begin(), &p.data());
-    
+
     BOOST_CHECK_EQUAL( parser.vec1().size(), 3u );
     BOOST_CHECK_EQUAL( parser.vec2().size(), 2u );
     BOOST_CHECK_EQUAL( parser.dummy(), 0x01020304u );
@@ -347,13 +347,13 @@ namespace {
 #       include SENF_PARSER()
 
         SENF_PARSER_VECTOR        ( vec   , packetSize() , senf::UInt16Parser );
-        
+
         SENF_PARSER_FINALIZE( TestPacketSizeVectorParser );
     };
 
 }
 
-BOOST_AUTO_UNIT_TEST(vectorMacro_packetSize)
+SENF_AUTO_UNIT_TEST(vectorMacro_packetSize)
 {
     unsigned char data[] = { 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
                              0x21, 0x22, 0x23, 0x24, 0x25, 0x26 };
@@ -371,7 +371,7 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_packetSize)
     // The real functionality is already tested in AuxPolixy.test.cc ...
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_