X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FListBParser.test.cc;h=09ee7aed154c6c0df01f4d64266fd4ab2dfa1af9;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=d38073880f0b012d16b7e554a41ae1af051b91a2;hpb=af5fee58087b479a8a346dc5f94047ec0c5f79cf;p=senf.git diff --git a/senf/Packets/ListBParser.test.cc b/senf/Packets/ListBParser.test.cc index d380738..09ee7ae 100644 --- a/senf/Packets/ListBParser.test.cc +++ b/senf/Packets/ListBParser.test.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief ListBParser unit tests */ @@ -33,7 +38,7 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { struct VoidPacket : public senf::PacketTypeBase @@ -47,6 +52,21 @@ namespace { SENF_PARSER_VECTOR( vec, size, senf::UInt16Parser ); SENF_PARSER_FINALIZE(VectorParser); + + typedef std::vector value_type; + + value_type value() const { + value_type v (vec().begin(), vec().end()); + return v; + } + void value(value_type const & v) { + vec_t::container container (vec()); + container.clear(); + for (value_type::const_iterator i=v.begin(); i!=v.end(); ++i) + container.push_back( *i); + } + operator value_type() const { return value(); } + VectorParser const & operator= (value_type const & other) { value(other); return *this; } }; typedef senf::ListParser< @@ -55,11 +75,11 @@ namespace { senf::detail::PrefixAuxParserPolicy > > MyListBParser; } -BOOST_AUTO_UNIT_TEST(ListBParser) +SENF_AUTO_UNIT_TEST(ListBParser) { senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter::create( MyListBParser::init_bytes)); - + MyListBParser p (pi->data().begin(),&pi->data()); p.init(); BOOST_CHECK_EQUAL( p.size(), 0u ); @@ -76,18 +96,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::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 ); @@ -108,7 +128,7 @@ BOOST_AUTO_UNIT_TEST(ListBParser_container) 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 ); @@ -119,7 +139,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; @@ -133,7 +153,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 ); @@ -148,7 +168,7 @@ BOOST_AUTO_UNIT_TEST(ListBParser_container) } namespace { - + struct TestTransform { typedef unsigned value_type; @@ -165,15 +185,29 @@ 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); }; + struct TestListPacketType + : public senf::PacketTypeBase, + public senf::PacketTypeMixin + { + typedef senf::PacketTypeMixin mixin; + typedef senf::ConcretePacket packet; + typedef TestListParser parser; + + using mixin::nextPacketRange; + using mixin::initSize; + using mixin::init; + }; + typedef senf::ConcretePacket TestListPacket; + } -BOOST_AUTO_UNIT_TEST(listBytesMacro) +SENF_AUTO_UNIT_TEST(listBytesMacro) { unsigned char data[] = { 8, // size1 18, // size2 @@ -189,10 +223,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 ); @@ -211,7 +245,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() ); } @@ -227,11 +261,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() ); } @@ -249,11 +283,9 @@ namespace { SENF_PARSER_FINALIZE(TestPacketSizeList); }; - - } -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] @@ -266,7 +298,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)); { @@ -341,7 +373,18 @@ BOOST_AUTO_UNIT_TEST(listBytesParser_packetSize) } } -///////////////////////////////cc.e//////////////////////////////////////// +SENF_AUTO_UNIT_TEST(listBytesMacro_stress) +{ + TestListPacket testListPacket (TestListPacket::create()); + for (unsigned i=0; i<12; ++i) { + VectorParser::value_type vec( 4, 42); + testListPacket->list2().push_back( vec); + } + BOOST_CHECK_EQUAL( testListPacket->list2().size(), 12u ); + +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_