X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FListOptionTypeParser.test.cc;h=bc5b22194676b0908047db0aa839d9668f1fc53d;hb=394ced7000128fef7e753caea1deda8d55dec8e2;hp=d1ab97a0a9e64e7f580e478985bfcb774b97c48c;hpb=943a0081e419e87e958889eb630f09180a9c196c;p=senf.git

diff --git a/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc b/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc
index d1ab97a..bc5b221 100644
--- a/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc
+++ b/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc
@@ -1,4 +1,4 @@
-// $Id: ListOptionTypeParser.test.cc 1345 2009-08-26 15:40:55Z pug $
+// $Id$
 //
 // Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
@@ -22,14 +22,14 @@
 
 // Custom includes
 #include <senf/Packets/Packets.hh>
-#include "IPv6ExtOptionType.hh"
+#include "IPv6ExtOptions.hh"
 #include "ListOptionTypeParser.hh"
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     struct VoidPacket : public senf::PacketTypeBase
@@ -41,7 +41,8 @@ namespace {
 
         SENF_PARSER_FIELD( size, senf::UInt8Parser );
         typedef senf::detail::FixedAuxParserPolicy<senf::UInt8Parser, 1u> ListOptionTypeAuxPolicy;
-        typedef senf::detail::ListOptionTypeParser_Policy<senf::GenericOptTypeTLVParser, ListOptionTypeAuxPolicy> ListOptionTypePolicy;
+        typedef senf::detail::ListOptionTypeParser_Policy<
+            senf::IPv6GenericOptionParser, ListOptionTypeAuxPolicy> ListOptionTypePolicy;
         typedef senf::ListParser<ListOptionTypePolicy> ListOptionTypeParser;
         SENF_PARSER_FIELD ( list, ListOptionTypeParser);
 
@@ -49,7 +50,7 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(ListOptionTypeParser)
+SENF_AUTO_UNIT_TEST(ListOptionTypeParser)
 {
     senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter<VoidPacket>::create(
             OptionParser::init_bytes));
@@ -74,7 +75,7 @@ BOOST_AUTO_UNIT_TEST(ListOptionTypeParser)
     BOOST_CHECK_EQUAL( p.list().empty(), false );
 }
 
-BOOST_AUTO_UNIT_TEST(ListOptionTypeParser_container)
+SENF_AUTO_UNIT_TEST(ListOptionTypeParser_container)
 {
     senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter<VoidPacket>::create(
             OptionParser::init_bytes));
@@ -88,19 +89,19 @@ BOOST_AUTO_UNIT_TEST(ListOptionTypeParser_container)
         BOOST_CHECK_EQUAL( c.bytes(), 0u ); // padding bytes wont be in here, added/removed automatically in destructor
         BOOST_CHECK( c.begin() == c.end() );
 
-        unsigned char d[]  = {0x65, 0x02, 0x40, 0x34};
-        unsigned char d1[] = {0x03, 0x01, 0x77};
-        unsigned char d2[] = {0x07, 0x01, 0x13};
+        std::vector<unsigned char> d (2, 0xab);
+        std::vector<unsigned char> d1 (1, 0x77);
+        std::vector<unsigned char> d2 (1, 0x13);
 
-        SENF_CHECK_NO_THROW( c.push_back( d ) );
+        SENF_CHECK_NO_THROW( c.push_back( std::make_pair(0x65, d) ));
         BOOST_CHECK_EQUAL( c.bytes(), 4u );
         BOOST_CHECK_EQUAL( c.size(), 1u );
 
-        SENF_CHECK_NO_THROW( c.push_back( d1 ) );
+        SENF_CHECK_NO_THROW( c.push_back( std::make_pair(0x03, d1) ));
         BOOST_CHECK_EQUAL( c.bytes(), 7u );
         BOOST_CHECK_EQUAL( c.size(), 2u );
 
-        SENF_CHECK_NO_THROW( c.push_back( d2 ) );
+        SENF_CHECK_NO_THROW( c.push_back( std::make_pair(0x07, d2) ));
         BOOST_CHECK_EQUAL( c.bytes(), 10u );
         BOOST_CHECK_EQUAL( c.size(), 3u );
 
@@ -108,16 +109,16 @@ BOOST_AUTO_UNIT_TEST(ListOptionTypeParser_container)
         BOOST_CHECK_EQUAL( cIter->altAction(), 1u);
         BOOST_CHECK_EQUAL( cIter->changeFlag(), 1u);
         BOOST_CHECK_EQUAL( cIter->optionType(), 5u);
-        BOOST_CHECK_EQUAL( cIter->optionLength(), 2u);
-        BOOST_CHECK_EQUAL( *(boost::begin(cIter->value()) ), 0x40);
-        BOOST_CHECK_EQUAL( *(boost::next(boost::begin(cIter->value()) )), 0x34);
+        BOOST_CHECK_EQUAL( cIter->length(), 2u);
+        BOOST_CHECK_EQUAL( *(boost::begin(cIter->value()) ), 0xab);
+        BOOST_CHECK_EQUAL( *(boost::next(boost::begin(cIter->value()) )), 0xab);
         cIter++;
         BOOST_CHECK_EQUAL( cIter->optionType(), 3u);
-        BOOST_CHECK_EQUAL( cIter->optionLength(), 1u);
+        BOOST_CHECK_EQUAL( cIter->length(), 1u);
         BOOST_CHECK_EQUAL( *(boost::begin(cIter->value() )), 0x77);
         cIter++;
         BOOST_CHECK_EQUAL( cIter->optionType(), 7u);
-        BOOST_CHECK_EQUAL( cIter->optionLength(), 1u);
+        BOOST_CHECK_EQUAL( cIter->length(), 1u);
         BOOST_CHECK_EQUAL( *(boost::begin(cIter->value())), 0x13);
 
         //deletes first element
@@ -137,7 +138,9 @@ BOOST_AUTO_UNIT_TEST(ListOptionTypeParser_container)
         BOOST_CHECK_EQUAL( c.empty(), true);
     }
 }
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
+
 // Local Variables:
 // mode: c++
 // fill-column: 100