X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FListBParser.test.cc;h=0d30cb56215bd51d8ab2fa97826342864b5f79a3;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=23a14ff24a99d07fbd95ce43d5d81bb39896c258;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Packets/ListBParser.test.cc b/senf/Packets/ListBParser.test.cc
index 23a14ff..0d30cb5 100644
--- a/senf/Packets/ListBParser.test.cc
+++ b/senf/Packets/ListBParser.test.cc
@@ -55,11 +55,11 @@ namespace {
             senf::detail::PrefixAuxParserPolicy<senf::UInt16Parser> > > MyListBParser;
 }
 
-BOOST_AUTO_UNIT_TEST(ListBParser)
+SENF_AUTO_UNIT_TEST(ListBParser)
 {
     senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter<VoidPacket>::create(
             MyListBParser::init_bytes));
-    
+
     MyListBParser p (pi->data().begin(),&pi->data());
     p.init();
     BOOST_CHECK_EQUAL( p.size(), 0u );
@@ -76,18 +76,18 @@ BOOST_AUTO_UNIT_TEST(ListBParser)
     BOOST_CHECK( ! p.empty() );
 }
 
-BOOST_AUTO_UNIT_TEST(ListBParser_container)
+SENF_AUTO_UNIT_TEST(ListBParser_container)
 {
     senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter<VoidPacket>::create(
             MyListBParser::init_bytes));
-    
+
     {
         MyListBParser::container c (MyListBParser(pi->data().begin(),&pi->data()));
-     
+
         BOOST_CHECK_EQUAL( c.size(), 0u );
         BOOST_CHECK_EQUAL( c.bytes(), 2u );
         BOOST_CHECK( c.begin() == c.end() );
-        
+
         c.shift(c.begin());
         BOOST_CHECK_EQUAL( c.size(), 1u );
         BOOST_CHECK_EQUAL( c.bytes(), 3u );
@@ -100,16 +100,15 @@ BOOST_AUTO_UNIT_TEST(ListBParser_container)
             senf::PacketInterpreterBase::ptr pi2 (senf::PacketInterpreter<VoidPacket>::create(
                     MyListBParser::init_bytes));
             MyListBParser::container c2 (MyListBParser(pi2->data().begin(),&pi2->data()));
-            c2.push_back_space();
             {
-                VectorParser::vec_t::container c2v (c2.front().vec());
+                VectorParser::vec_t::container c2v (c2.push_back_space().vec());
                 c2v.push_back(0x2345u);
                 c2v.push_back(0x3456u);
             }
 
             BOOST_CHECK_EQUAL(c2.size(), 1u);
             BOOST_CHECK_EQUAL(c2.bytes(), 7u);
-            
+
             c.insert(c.end(),c2.back());
             BOOST_CHECK_EQUAL( c.size(), 2u );
             BOOST_CHECK_EQUAL( c.bytes(), 10u );
@@ -120,7 +119,7 @@ BOOST_AUTO_UNIT_TEST(ListBParser_container)
             c.insert(boost::next(c.begin()), 2u, c2.back());
             BOOST_CHECK_EQUAL( c.size(), 4u );
             BOOST_CHECK_EQUAL( c.bytes(), 20u );
-            BOOST_CHECK_EQUAL( (*boost::next(c.begin())).vec()[0], 0x1357u ); 
+            BOOST_CHECK_EQUAL( (*boost::next(c.begin())).vec()[0], 0x1357u );
             BOOST_CHECK_EQUAL( (*boost::next(c.begin(),2)).vec()[0], 0x1357u );
 
             c2.back().vec()[0] << 0x2468u;
@@ -134,7 +133,7 @@ BOOST_AUTO_UNIT_TEST(ListBParser_container)
             BOOST_CHECK_EQUAL( c.bytes(), 17u );
             BOOST_CHECK_EQUAL( c.front().vec()[0],0x1357u );
             BOOST_CHECK_EQUAL( c.back().vec()[0], 0x2345u );
-            
+
             c.erase((boost::next(c.begin(),2)),c.end());
             BOOST_CHECK_EQUAL( c.size(), 2u );
             BOOST_CHECK_EQUAL( c.bytes(), 12u );
@@ -149,7 +148,7 @@ BOOST_AUTO_UNIT_TEST(ListBParser_container)
 }
 
 namespace {
-    
+
     struct TestTransform
     {
         typedef unsigned value_type;
@@ -166,7 +165,7 @@ namespace {
         SENF_PARSER_PRIVATE_FIELD ( size2 , senf::UInt8Parser );
         SENF_PARSER_FIELD         ( dummy , senf::UInt32Parser );
         SENF_PARSER_LIST          ( list1  , bytes(size1) , VectorParser );
-        SENF_PARSER_LIST          ( list2  , transform(TestTransform, bytes(size2)) , 
+        SENF_PARSER_LIST          ( list2  , transform(TestTransform, bytes(size2)) ,
                                              VectorParser );
 
         SENF_PARSER_FINALIZE(TestListParser);
@@ -174,7 +173,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(listBytesMacro)
+SENF_AUTO_UNIT_TEST(listBytesMacro)
 {
     unsigned char data[] = {    8,                   // size1
                                18,                   // size2
@@ -190,10 +189,10 @@ BOOST_AUTO_UNIT_TEST(listBytesMacro)
                              0x0D, 0x0E,             // list2()[1].vec()[1]
                              0x01,                   // list2()[2].size()
                              0x0F, 0x10 };           // list2()[2].vec()[0]
-    
+
     senf::DataPacket p (senf::DataPacket::create(data));
     TestListParser parser (p.data().begin(), &p.data());
-    
+
     BOOST_CHECK_EQUAL( parser.list1().size(), 2u );
     BOOST_CHECK_EQUAL( parser.list2().size(), 3u );
     BOOST_CHECK_EQUAL( parser.dummy(), 0x01020304u );
@@ -212,7 +211,7 @@ BOOST_AUTO_UNIT_TEST(listBytesMacro)
         BOOST_CHECK_EQUAL( i->vec().size(), 2u );
         BOOST_CHECK_EQUAL( i->vec()[0], 0x0708u );
         BOOST_CHECK_EQUAL( i->vec()[1], 0x090Au );
-        
+
         ++i;
         BOOST_CHECK( i == list.end() );
     }
@@ -228,11 +227,11 @@ BOOST_AUTO_UNIT_TEST(listBytesMacro)
         BOOST_CHECK_EQUAL( i->vec().size(), 2u );
         BOOST_CHECK_EQUAL( i->vec()[0], 0x0B0Cu );
         BOOST_CHECK_EQUAL( i->vec()[1], 0x0D0Eu );
-        
+
         ++i;
         BOOST_CHECK_EQUAL( i->vec().size(), 1u );
         BOOST_CHECK_EQUAL( i->vec()[0], 0x0F10u );
-        
+
         ++i;
         BOOST_CHECK( i == list.end() );
     }
@@ -254,7 +253,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(listBytesParser_packetSize)
+SENF_AUTO_UNIT_TEST(listBytesParser_packetSize)
 {
     unsigned char data[] = { 0x01,                   // list()[0].vec().size()
                              0x05, 0x06,             // list()[0].vec()[0]
@@ -267,7 +266,7 @@ BOOST_AUTO_UNIT_TEST(listBytesParser_packetSize)
                              0x0D, 0x0E,             // list()[3].vec()[1]
                              0x01,                   // list()[4].vec().size()
                              0x0F, 0x10 };           // list()[4].vec()[0]
-    
+
     senf::DataPacket p (senf::DataPacket::create(data));
 
     {