X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.test.cc;h=b403c33456a95d549ec3a3ed2b017a860807771b;hb=6019c18e7b74d3e91293f35df660a80346ef7a1e;hp=b80d3fef67f06eb9fe13c55013640a7c5c4a0c39;hpb=575b110bed5e4f051b197bed884fb8999822d14e;p=senf.git

diff --git a/senf/Packets/GenericTLV.test.cc b/senf/Packets/GenericTLV.test.cc
index b80d3fe..b403c33 100644
--- a/senf/Packets/GenericTLV.test.cc
+++ b/senf/Packets/GenericTLV.test.cc
@@ -122,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) ;
@@ -155,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() );
@@ -174,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 ( 
@@ -184,19 +185,24 @@ 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" );
 }
 
-BOOST_AUTO_UNIT_TEST(GenericTLV_predicate)
+SENF_AUTO_UNIT_TEST(GenericTLV_predicate)
 {
     MyTestPacket p ( MyTestPacket::create() );
     MyTestPacket::Parser::tlv_list_t::container tlvContainer (p->tlv_list() );