X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FVectorParser.test.cc;h=9c7185b19cf046e00c59b0bb777c35420114b43f;hb=9bf675b08d624cfac113a1a90dcfbd9503872b1d;hp=aa554b2e5328627f0d9599deade08deefb705d80;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/VectorParser.test.cc b/senf/Packets/VectorParser.test.cc
index aa554b2..9c7185b 100644
--- a/senf/Packets/VectorParser.test.cc
+++ b/senf/Packets/VectorParser.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>
 #include <boost/assign.hpp>
 
@@ -41,7 +41,7 @@ namespace {
     {};
 }
 
-BOOST_AUTO_UNIT_TEST(VectorParser)
+SENF_AUTO_UNIT_TEST(VectorParser)
 {
     unsigned char data[] = { 0x03,                                   // size
                              0x10, 0x11,  0x12, 0x13,  0x14, 0x15,   // data
@@ -82,9 +82,9 @@ BOOST_AUTO_UNIT_TEST(VectorParser)
         BOOST_CHECK_EQUAL( v.size(), 8u );
         BOOST_CHECK_EQUAL( v[7], 0xf0f1u );
 
-        v.push_back_space();
+        v.push_back_space() = 37u;
         BOOST_CHECK_EQUAL( v.size(), 9u );
-        BOOST_CHECK_EQUAL( v[8], 0u );
+        BOOST_CHECK_EQUAL( v[8], 37u );
         
         v.push_front(0xf3f4u);
         BOOST_CHECK_EQUAL( v.size(), 10u );
@@ -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
@@ -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
@@ -237,7 +237,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(vectorMacro_parse)
+SENF_AUTO_UNIT_TEST(vectorMacro_parse)
 {
     unsigned char data[] = { 0x05,                   // size1
                              0x04,                   // size2
@@ -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;
@@ -280,9 +280,10 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_create)
             0x07, 0x08,             // vec1[1]
             0x09, 0x0A,             // vec1[2]
             0x0B, 0x0C,             // vec2[0]
-            0x0D, 0x0E };           // vec2[1]
-    
-    BOOST_CHECK( equal( p.data().begin(), p.data().end(), data ));
+            0x0D, 0x0E              // vec2[1]
+    };
+    SENF_CHECK_EQUAL_COLLECTIONS( 
+            data, data+sizeof(data), p.data().begin(), p.data().end() );
 }
 
 namespace {
@@ -314,7 +315,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(vectorMacro_inherit)
+SENF_AUTO_UNIT_TEST(vectorMacro_inherit)
 {
     unsigned char data[] = { 0x05,                   // size1
                              0x04,                   // size2
@@ -352,7 +353,7 @@ namespace {
 
 }
 
-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 };