X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketRegistry.test.cc;h=8dd410d5243c0c489276491afd8a3c9e17002df0;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=321e19a793c4822fa9e6ee66cb878c064a439121;hpb=4d90b955bf3590e215488395d1c9cec827476e07;p=senf.git

diff --git a/senf/Packets/PacketRegistry.test.cc b/senf/Packets/PacketRegistry.test.cc
index 321e19a..8dd410d 100644
--- a/senf/Packets/PacketRegistry.test.cc
+++ b/senf/Packets/PacketRegistry.test.cc
@@ -64,14 +64,15 @@ namespace {
 
 }
 
-SENF_PACKET_REGISTRY_REGISTER(StringTag, "foo", FooPacket);
+SENF_PACKET_REGISTRY_REGISTER(StringTag, "foo", OtherPacket);
+SENF_PACKET_REGISTRY_REGISTER_PRIORITY(StringTag, "foo", 1, FooPacket);
 
 SENF_AUTO_UNIT_TEST(packetRegistry_test)
 {
     {
         PacketRegistry<StringTag>::registerPacket<BarPacket>("bar");
         PacketRegistry<BaseTag>::registerPacket<FooPacket>(1u);
-        senf::PacketRegistry<BaseTag>::RegistrationProxy<BarPacket> registerBarInBase (2u);
+        senf::PacketRegistry<BaseTag>::ScopedRegistrationProxy<BarPacket> registerBarInBase (2u);
 
         BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<FooPacket>(), 1u );
         BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<BarPacket>(), 2u );
@@ -79,6 +80,7 @@ SENF_AUTO_UNIT_TEST(packetRegistry_test)
                            PacketTypeNotRegisteredException );
 
         BOOST_CHECK_EQUAL( PacketRegistry<StringTag>::key<FooPacket>(), "foo" );
+        BOOST_CHECK( PacketRegistry<StringTag>::lookup("foo").type() == typeid(FooPacket) );
         BOOST_CHECK( ! PacketRegistry<StringTag>::lookup("blub", senf::nothrow) );
         BOOST_CHECK( PacketRegistry<BaseTag>::lookup(1u, senf::nothrow) );
 
@@ -94,7 +96,7 @@ SENF_AUTO_UNIT_TEST(packetRegistry_test)
                                            &senf::PacketRegistry<BaseTag>::Entry::key>()),
             elts1+0, elts1+sizeof(elts1)/sizeof(elts1[0]) );
 
-        std::string elts2[] = { "bar", "foo" };
+        std::string elts2[] = { "bar", "foo", "foo" };
         BOOST_CHECK_EQUAL_COLLECTIONS(
             boost::make_transform_iterator(
                 PacketRegistry<StringTag>::begin(),
@@ -120,7 +122,8 @@ SENF_AUTO_UNIT_TEST(packetRegistry_test)
             (s.str())
             ("(anonymous namespace)::StringTag:\n"
              "  bar                   0 (anonymous namespace)::BarPacketType\n"
-             "  foo                   0 (anonymous namespace)::FooPacketType\n"
+             "  foo                   1 (anonymous namespace)::FooPacketType\n"
+             "  foo                   0 (anonymous namespace)::OtherPacketType\n"
              "\n" ));
     }
 
@@ -138,7 +141,8 @@ SENF_AUTO_UNIT_TEST(packetRegistry_test)
             (s.str())
             ("(anonymous namespace)::StringTag:\n"
              "  bar                   0 (anonymous namespace)::BarPacketType\n"
-             "  foo                   0 (anonymous namespace)::FooPacketType\n"
+             "  foo                   1 (anonymous namespace)::FooPacketType\n"
+             "  foo                   0 (anonymous namespace)::OtherPacketType\n"
              "\n" ));
 
         SENF_CHECK_NO_THROW( PacketRegistry<BaseTag>::unregisterPacket(1u) );
@@ -154,7 +158,8 @@ SENF_AUTO_UNIT_TEST(packetRegistry_test)
             contains,
             (s.str())
             ("(anonymous namespace)::StringTag:\n"
-             "  foo                   0 (anonymous namespace)::FooPacketType\n"
+             "  foo                   1 (anonymous namespace)::FooPacketType\n"
+             "  foo                   0 (anonymous namespace)::OtherPacketType\n"
              "\n" ));
     }
 }