X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.test.cc;h=b403c33456a95d549ec3a3ed2b017a860807771b;hb=0f235de98cae838afb42244ebd307ce8cd1db409;hp=5a1d3d6556d4d7cd3f96947dd6c3b9ecdb85b32a;hpb=9ffdaae4804503c4f36a53747c852a87ee626b9e;p=senf.git

diff --git a/senf/Packets/GenericTLV.test.cc b/senf/Packets/GenericTLV.test.cc
index 5a1d3d6..b403c33 100644
--- a/senf/Packets/GenericTLV.test.cc
+++ b/senf/Packets/GenericTLV.test.cc
@@ -25,6 +25,7 @@
 
 // Custom includes
 #include "GenericTLV.hh"
+#include <senf/Packets/DefaultBundle/IPv6Extensions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
@@ -40,6 +41,8 @@ namespace {
         SENF_PARSER_FIELD    ( type,   senf::UInt8Parser );
         SENF_PARSER_FIELD_RO ( length, senf::UInt8Parser );
         SENF_PARSER_FINALIZE ( MyTLVParserBase           );
+        
+        typedef senf::GenericTLVParserRegistry<MyTLVParserBase> Registry;
     };
     
     struct MyGenericTLVParser
@@ -71,6 +74,29 @@ namespace {
               << "    value:  " << senf::format::dumpint(myValue()) << "\n";
        }
    };
+   
+   struct MyConcrete2TLVParser
+       : public MyTLVParserBase
+   {
+   #   include SENF_PARSER()
+       SENF_PARSER_INHERIT  ( MyTLVParserBase             );
+       SENF_PARSER_FIELD    ( myValue, senf::UInt32Parser );
+       SENF_PARSER_FINALIZE ( MyConcrete2TLVParser         );
+    
+       SENF_PARSER_INIT() {
+           type() = typeId;
+           length_() = 4;
+       }
+       static type_t::value_type const typeId = 0x47;
+       
+       void dump(std::ostream & os) const {
+           boost::io::ios_all_saver ias(os);
+           os << "  MyConcreteTLVParser\n"
+              << "    type:   " << senf::format::dumpint(type()) << "\n"
+              << "    length: " << senf::format::dumpint(length()) << "\n"
+              << "    value:  " << senf::format::dumpint(myValue()) << "\n";
+       }
+   };
         
     class MyTestPacketParser
         : public senf::PacketParserBase
@@ -96,7 +122,7 @@ namespace {
 }
 
 
-BOOST_AUTO_UNIT_TEST(GenericTLV_parser)
+SENF_AUTO_UNIT_TEST(GenericTLV_parser)
 {
     BOOST_CHECK_EQUAL( senf::init_bytes<MyGenericTLVParser>::value, 
             senf::init_bytes<MyTLVParserBase>::value) ;
@@ -129,7 +155,7 @@ BOOST_AUTO_UNIT_TEST(GenericTLV_parser)
     BOOST_CHECK_EQUAL( concreteTLVParser.myValue(), 0xabababab );
 }
 
-BOOST_AUTO_UNIT_TEST(GenericTLV_packet)
+SENF_AUTO_UNIT_TEST(GenericTLV_packet)
 {
     MyTestPacket p ( MyTestPacket::create());
     MyTestPacket::Parser::tlv_list_t::container tlvContainer (p->tlv_list() );
@@ -148,8 +174,9 @@ BOOST_AUTO_UNIT_TEST(GenericTLV_packet)
 }
 
 
-BOOST_AUTO_UNIT_TEST(GenericTLV_registry)
+SENF_AUTO_UNIT_TEST(GenericTLV_registry)
 {
+    typedef senf::GenericTLVParserRegistry<MyTLVParserBase> MyTLVParserRegistry;
     MyTestPacket p ( MyTestPacket::create());
     MyTestPacket::Parser::tlv_list_t::container tlvContainer (p->tlv_list() );
     MyConcreteTLVParser conreteTLVParser ( 
@@ -158,18 +185,44 @@ BOOST_AUTO_UNIT_TEST(GenericTLV_registry)
     p.finalizeThis();
         
     std::stringstream ss;
-    (*tlvContainer.begin()).dump( ss);
+    tlvContainer.begin()->dump( ss);
     BOOST_CHECK_EQUAL( ss.str().substr(0,58), 
             "  GenericTLVParser<(anonymous namespace)::MyTLVParserBase>" );
+    BOOST_CHECK( ! MyTLVParserRegistry::instance().isRegistered( tlvContainer.begin()->type()));
+    
+    MyTLVParserRegistry::instance().registerParser<MyConcreteTLVParser>();
+    BOOST_CHECK( MyTLVParserRegistry::instance().isRegistered( tlvContainer.begin()->type()));
+    BOOST_CHECK_EQUAL( 
+            MyTLVParserRegistry::instance().bytes( *tlvContainer.begin()),
+            senf::bytes( *tlvContainer.begin()) );
     
-    senf::GenericTLVParserRegistry<MyTLVParserBase>::instance()
-            .registerParser<MyConcreteTLVParser>();
     ss.str(""); ss.clear();
     
-    (*tlvContainer.begin()).dump( ss);
+    tlvContainer.begin()->dump( ss);
     BOOST_CHECK_EQUAL( ss.str().substr(0,21), "  MyConcreteTLVParser" );
 }
 
+SENF_AUTO_UNIT_TEST(GenericTLV_predicate)
+{
+    MyTestPacket p ( MyTestPacket::create() );
+    MyTestPacket::Parser::tlv_list_t::container tlvContainer (p->tlv_list() );
+    MyConcreteTLVParser conreteTLVParser ( 
+            tlvContainer.push_back_space().init<MyConcreteTLVParser>());
+    conreteTLVParser.myValue() << 0xffff;
+    MyConcrete2TLVParser conreteTLVParser2 ( 
+            tlvContainer.push_back_space().init<MyConcrete2TLVParser>());
+    conreteTLVParser2.myValue() << 0xdddd;
+    p.finalizeThis();
+    
+//     typedef senf::IPv6HopByHopOptionsPacket::Parser::options_t::container optContainer_t; 
+//     optContainer_t optC (p->tlv_list() );
+    
+    MyTestPacket::Parser::tlv_list_t::container testTlvContainer (p->tlv_list() );
+    MyTestPacket::Parser::tlv_list_t::container::iterator it = std::find_if (
+      testTlvContainer.begin(), testTlvContainer.end(), 
+      senf::detail::Predicate< senf::GenericTLVParserBase<MyTLVParserBase>, MyConcreteTLVParser>() );
+    BOOST_CHECK( it->is<MyConcreteTLVParser>()) ;
+}
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_