switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/VectorParser.test.cc b/senf/Packets/VectorParser.test.cc
index 7ab112a..604df81 100644 (file)
--- a/senf/Packets/VectorParser.test.cc
+++ b/senf/Packets/VectorParser.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // 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 VectorParser unit tests */
@@ -32,6 +37,7 @@
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 #include <boost/assign.hpp>
+#include <boost/foreach.hpp>
 
 #define prefix_
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
@@ -259,6 +265,7 @@ SENF_AUTO_UNIT_TEST(vectorMacro_parse)
     BOOST_CHECK_EQUAL( parser.vec1()[2], 0x090Au );
     BOOST_CHECK_EQUAL( parser.vec2()[0], 0x0B0Cu );
     BOOST_CHECK_EQUAL( parser.vec2()[1], 0x0D0Eu );
+
 }
 
 SENF_AUTO_UNIT_TEST(vectorMacro_create)
@@ -307,7 +314,7 @@ namespace {
 
         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 );
@@ -317,26 +324,27 @@ namespace {
 
 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 {