X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FAuxParser.test.cc;h=241472eeca75b4264978f878c90010abbbdcb907;hb=a0b6f53e5c464c6b84fed30a67fcce32da81012d;hp=4aa28d5a5d1afcf489461481cb1ac2b631a129e2;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Packets/AuxParser.test.cc b/senf/Packets/AuxParser.test.cc index 4aa28d5..241472e 100644 --- a/senf/Packets/AuxParser.test.cc +++ b/senf/Packets/AuxParser.test.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -37,7 +37,7 @@ // The other aux policies are tested with the corresponding container classes -BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy) +SENF_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy) { unsigned char data[] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25 }; @@ -74,7 +74,7 @@ BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy) } } -BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy_transformed) +SENF_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy_transformed) { unsigned char data[] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25 }; @@ -89,7 +89,7 @@ BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy_transformed) { UInt16VectorParser v (p.data().begin(), &p.data()); - + BOOST_REQUIRE_EQUAL( v.size(), p.data().size()/2 ); BOOST_CHECK_EQUAL( v[0], 0x1011u ); BOOST_CHECK_EQUAL( v[1], 0x1213u ); @@ -111,15 +111,15 @@ BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy_transformed) w.erase(w.begin()+3, w.begin()+5); BOOST_CHECK_EQUAL( w.size(), p.data().size()/2 ); - senf::UInt16Parser::value_type data2[] = + senf::UInt16Parser::value_type data2[] = { 0x1011u, 0x0000u, 0x1213u, 0x2223u, 0x2425u }; - BOOST_CHECK_EQUAL_COLLECTIONS( w.begin(), w.end(), + BOOST_CHECK_EQUAL_COLLECTIONS( w.begin(), w.end(), data2, data2+sizeof(data2)/sizeof(data2[0]) ); } } -BOOST_AUTO_UNIT_TEST(listPacketSizeAuxPolicy) +SENF_AUTO_UNIT_TEST(listPacketSizeAuxPolicy) { unsigned char data[] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25 }; @@ -154,10 +154,10 @@ BOOST_AUTO_UNIT_TEST(listPacketSizeAuxPolicy) w.erase(boost::next(w.begin(),3), boost::next(w.begin(),5)); BOOST_CHECK_EQUAL( w.size(), p.data().size()/2 ); - senf::UInt16Parser::value_type data2[] = + senf::UInt16Parser::value_type data2[] = { 0x1011u, 0x0000u, 0x1213u, 0x2223u, 0x2425u }; - BOOST_CHECK_EQUAL_COLLECTIONS( w.begin(), w.end(), + BOOST_CHECK_EQUAL_COLLECTIONS( w.begin(), w.end(), data2, data2+sizeof(data2)/sizeof(data2[0]) ); } }