// 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>
+#include <boost/foreach.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
{
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 );
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()));
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 );
BOOST_CHECK_EQUAL( v[0], 0xf3f4u );
}
}
-BOOST_AUTO_UNIT_TEST(VectorParser_wrapper)
+SENF_AUTO_UNIT_TEST(VectorParser_wrapper)
{
unsigned char data[] = { 0x03, // size
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, // data
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);
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
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 );
static unsigned set(unsigned v) { return v+2; }
};
- struct TestVectorParser
+ struct TestVectorParser
: public senf::PacketParserBase
{
# include SENF_PARSER()
SENF_PARSER_FINALIZE( TestVectorParser );
};
-
+
struct TestVectorPacketType
: public senf::PacketTypeBase,
public senf::PacketTypeMixin<TestVectorPacketType>
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
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 );
BOOST_CHECK_EQUAL( parser.vec1()[2], 0x090Au );
BOOST_CHECK_EQUAL( parser.vec2()[0], 0x0B0Cu );
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;
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
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 {
-
- struct TestVectorBaseParser
+
+ struct TestVectorBaseParser
: public senf::PacketParserBase
{
# include SENF_PARSER()
SENF_PARSER_INHERIT(TestVectorBaseParser);
- SENF_PARSER_VECTOR ( vec1 , transform(TestTransform, size1) , senf::UInt16Parser );
+ SENF_PARSER_VECTOR ( vec1 , transform(TestTransform, size1) , senf::UInt8Parser );
SENF_PARSER_VECTOR ( vec2 , bytes(size2) , senf::UInt16Parser );
SENF_PARSER_FINALIZE( TestVectorDerivedParser );
}
-BOOST_AUTO_UNIT_TEST(vectorMacro_inherit)
+SENF_AUTO_UNIT_TEST(vectorMacro_inherit)
{
- unsigned char data[] = { 0x05, // size1
+ unsigned char data[] = { 0x08, // size1
0x04, // size2
0x01, 0x02, 0x03, 0x04, // dummy
- 0x05, 0x06, // vec1[0]
- 0x07, 0x08, // vec1[1]
- 0x09, 0x0A, // vec1[2]
+ 0x05, 0x06, // vec1[0], vec1[1]
+ 0x07, 0x08, // vec1[2], vec1[3]
+ 0x09, 0x0A, // vec1[4], vec1[5]
0x0B, 0x0C, // vec2[0]
0x0D, 0x0E }; // vec2[1]
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.vec1().size(), 6u );
BOOST_CHECK_EQUAL( parser.vec2().size(), 2u );
BOOST_CHECK_EQUAL( parser.dummy(), 0x01020304u );
- BOOST_CHECK_EQUAL( parser.vec1()[0], 0x0506u );
- BOOST_CHECK_EQUAL( parser.vec1()[1], 0x0708u );
- BOOST_CHECK_EQUAL( parser.vec1()[2], 0x090Au );
BOOST_CHECK_EQUAL( parser.vec2()[0], 0x0B0Cu );
BOOST_CHECK_EQUAL( parser.vec2()[1], 0x0D0Eu );
+ boost::uint8_t c = 0x05;
+ BOOST_FOREACH( boost::uint8_t v, parser.vec1() ) {
+ BOOST_CHECK_EQUAL( v, c++ );
+ }
}
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 };
// The real functionality is already tested in AuxPolixy.test.cc ...
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f
projects / senf.git / blobdiff