X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FListNParser.test.cc;h=7ba6ca3186d2fac9511d6c5ae797db9d3ad0c538;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=1a592c1255019af5d32c4783a9efe64318c92423;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Packets/ListNParser.test.cc b/senf/Packets/ListNParser.test.cc index 1a592c1..7ba6ca3 100644 --- a/senf/Packets/ListNParser.test.cc +++ b/senf/Packets/ListNParser.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 ListNParser unit tests */ @@ -33,7 +38,7 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { struct VoidPacket_Type : public senf::PacketTypeBase @@ -46,8 +51,23 @@ namespace { SENF_PARSER_PRIVATE_FIELD( size, senf::UInt8Parser ); SENF_PARSER_VECTOR( vec, size, senf::UInt16Parser ); - + SENF_PARSER_FINALIZE(MyVec); + + 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(); } + MyVec const & operator= (value_type const & other) { value(other); return *this; } }; typedef senf::ListParser< @@ -57,7 +77,7 @@ namespace { senf::UInt16Parser> > > MyListNParser; } -BOOST_AUTO_UNIT_TEST(ListNParser_container) +SENF_AUTO_UNIT_TEST(ListNParser_container) { VoidPacket vp (VoidPacket::create(MyListNParser::init_bytes)); MyListNParser(vp.data().begin(),&vp.data()).init(); @@ -86,7 +106,7 @@ BOOST_AUTO_UNIT_TEST(ListNParser_container) } } -BOOST_AUTO_UNIT_TEST(ListNParser) +SENF_AUTO_UNIT_TEST(ListNParser) { VoidPacket vp (VoidPacket::create(MyListNParser::init_bytes)); @@ -124,7 +144,7 @@ BOOST_AUTO_UNIT_TEST(ListNParser) BOOST_CHECK_EQUAL( p.size(), 2u ); BOOST_CHECK_EQUAL( p.bytes(), 8u ); BOOST_CHECK_EQUAL( p.back().vec().size(), 0u ); - + p.back().vec().push_front(0x0123u); BOOST_CHECK_EQUAL( p.front().vec().size(), 2u ); BOOST_CHECK_EQUAL( p.back().vec().size(), 1u ); @@ -132,7 +152,7 @@ BOOST_AUTO_UNIT_TEST(ListNParser) p.push_front_space(2u); BOOST_CHECK_EQUAL( p.size(), 4u ); BOOST_CHECK_EQUAL( p.front().vec().size(), 0u); - + p.resize(3u); BOOST_CHECK_EQUAL( p.size(), 3u ); BOOST_CHECK_EQUAL( p.back().vec()[0], 0x1234u ); @@ -143,7 +163,7 @@ BOOST_AUTO_UNIT_TEST(ListNParser) } namespace { - + struct TestTransform { typedef unsigned value_type; @@ -151,23 +171,47 @@ namespace { static unsigned set(unsigned v) { return 2*v; } }; - struct TestListParser + struct TestListParserBase : public senf::PacketParserBase { # include SENF_PARSER() - SENF_PARSER_PRIVATE_FIELD ( size1 , senf::UInt8Parser ); - SENF_PARSER_PRIVATE_FIELD ( size2 , senf::UInt8Parser ); - SENF_PARSER_FIELD ( dummy , senf::UInt32Parser ); - SENF_PARSER_LIST ( list1 , transform(TestTransform, size1) , MyVec ); - SENF_PARSER_LIST ( list2 , size2 , MyVec ); + SENF_PARSER_FIELD_RO ( size1 , senf::UInt8Parser ); + SENF_PARSER_FIELD_RO ( size2 , senf::UInt8Parser ); + + SENF_PARSER_FINALIZE(TestListParserBase); + }; + + struct TestListParser + : public TestListParserBase + { +# include SENF_PARSER() + SENF_PARSER_INHERIT ( TestListParserBase ); + + SENF_PARSER_FIELD ( dummy , senf::UInt32Parser ); + SENF_PARSER_LIST ( list1 , transform(TestTransform, size1) , MyVec ); + SENF_PARSER_LIST ( list2 , size2 , MyVec ); 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(listMacro) +SENF_AUTO_UNIT_TEST(listMacro) { unsigned char data[] = { 0x04, // size1 0x03, // size2 @@ -183,10 +227,10 @@ BOOST_AUTO_UNIT_TEST(listMacro) 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 ); @@ -205,7 +249,7 @@ BOOST_AUTO_UNIT_TEST(listMacro) 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() ); } @@ -221,18 +265,28 @@ BOOST_AUTO_UNIT_TEST(listMacro) 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() ); } +} + +SENF_AUTO_UNIT_TEST(listMacro_stress) +{ + TestListPacket testListPacket (TestListPacket::create()); + for (unsigned i=0; i<42; ++i) { + MyVec::value_type vec( 4, 42); + testListPacket->list2().push_back( vec); + } + BOOST_CHECK_EQUAL( testListPacket->list2().size(), 42u ); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_