minor fixes for clang++

[senf.git] / senf / Packets / ListNParser.test.cc

diff --git a/senf/Packets/ListNParser.test.cc b/senf/Packets/ListNParser.test.cc
index a28f765..7ba6ca3 100644 (file)
--- 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 <g0dil@berlios.de>
 //
-// 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 <g0dil@berlios.de>
 
 /** \file
     \brief ListNParser unit tests */
@@ -33,7 +38,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     struct VoidPacket_Type : public senf::PacketTypeBase
@@ -48,6 +53,21 @@ namespace {
         SENF_PARSER_VECTOR( vec, size, senf::UInt16Parser );
 
         SENF_PARSER_FINALIZE(MyVec);
+
+        typedef std::vector<boost::uint16_t> 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<
@@ -151,20 +171,44 @@ 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<TestListPacketType>
+    {
+        typedef senf::PacketTypeMixin<TestListPacketType> mixin;
+        typedef senf::ConcretePacket<TestListPacketType> packet;
+        typedef TestListParser parser;
+
+        using mixin::nextPacketRange;
+        using mixin::initSize;
+        using mixin::init;
+    };
+    typedef senf::ConcretePacket<TestListPacketType> TestListPacket;
+
 }
 
 SENF_AUTO_UNIT_TEST(listMacro)
@@ -229,10 +273,20 @@ SENF_AUTO_UNIT_TEST(listMacro)
         ++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_
 
 \f