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

diff --git a/senf/Packets/PacketRegistry.test.cc b/senf/Packets/PacketRegistry.test.cc
index ddb1088..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,18 +80,33 @@ 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) );
 
         unsigned elts1[] = { 1u, 2u };
-        BOOST_CHECK_EQUAL_COLLECTIONS( PacketRegistry<BaseTag>::begin(),
-                                       PacketRegistry<BaseTag>::end(),
-                                       elts1+0, elts1+sizeof(elts1)/sizeof(elts1[0]) );
-
-        std::string elts2[] = { "bar", "foo" };
-        BOOST_CHECK_EQUAL_COLLECTIONS( PacketRegistry<StringTag>::begin(),
-                                       PacketRegistry<StringTag>::end(),
-                                       elts2+0, elts2+sizeof(elts2)/sizeof(elts2[0]) );
+        BOOST_CHECK_EQUAL_COLLECTIONS(
+            boost::make_transform_iterator(
+                PacketRegistry<BaseTag>::begin(),
+                boost::multi_index::member<senf::PacketRegistry<BaseTag>::Entry, unsigned,
+                                           &senf::PacketRegistry<BaseTag>::Entry::key>()),
+            boost::make_transform_iterator(
+                PacketRegistry<BaseTag>::end(),
+                boost::multi_index::member<senf::PacketRegistry<BaseTag>::Entry, unsigned,
+                                           &senf::PacketRegistry<BaseTag>::Entry::key>()),
+            elts1+0, elts1+sizeof(elts1)/sizeof(elts1[0]) );
+
+        std::string elts2[] = { "bar", "foo", "foo" };
+        BOOST_CHECK_EQUAL_COLLECTIONS(
+            boost::make_transform_iterator(
+                PacketRegistry<StringTag>::begin(),
+                boost::multi_index::member<senf::PacketRegistry<StringTag>::Entry, std::string,
+                                           &senf::PacketRegistry<StringTag>::Entry::key>()),
+            boost::make_transform_iterator(
+                PacketRegistry<StringTag>::end(),
+                boost::multi_index::member<senf::PacketRegistry<StringTag>::Entry, std::string,
+                                           &senf::PacketRegistry<StringTag>::Entry::key>()),
+            elts2+0, elts2+sizeof(elts2)/sizeof(elts2[0]) );
 
         std::stringstream s;
         senf::dumpPacketRegistries(s);
@@ -98,15 +114,16 @@ SENF_AUTO_UNIT_TEST(packetRegistry_test)
             contains,
             (s.str())
             ("(anonymous namespace)::BaseTag:\n"
-             "  0x00000001 (         1) (....) (anonymous namespace)::FooPacketType\n"
-             "  0x00000002 (         2) (....) (anonymous namespace)::BarPacketType\n"
+             "  0x00000001 (         1) (....)      0 (anonymous namespace)::FooPacketType\n"
+             "  0x00000002 (         2) (....)      0 (anonymous namespace)::BarPacketType\n"
              "\n"));
         BOOST_CHECK_PREDICATE(
             contains,
             (s.str())
             ("(anonymous namespace)::StringTag:\n"
-             "  bar              (anonymous namespace)::BarPacketType\n"
-             "  foo              (anonymous namespace)::FooPacketType\n"
+             "  bar                   0 (anonymous namespace)::BarPacketType\n"
+             "  foo                   1 (anonymous namespace)::FooPacketType\n"
+             "  foo                   0 (anonymous namespace)::OtherPacketType\n"
              "\n" ));
     }
 
@@ -117,14 +134,15 @@ SENF_AUTO_UNIT_TEST(packetRegistry_test)
             contains,
             (s.str())
             ("(anonymous namespace)::BaseTag:\n"
-             "  0x00000001 (         1) (....) (anonymous namespace)::FooPacketType\n"
+             "  0x00000001 (         1) (....)      0 (anonymous namespace)::FooPacketType\n"
              "\n"));
         BOOST_CHECK_PREDICATE(
             contains,
             (s.str())
             ("(anonymous namespace)::StringTag:\n"
-             "  bar              (anonymous namespace)::BarPacketType\n"
-             "  foo              (anonymous namespace)::FooPacketType\n"
+             "  bar                   0 (anonymous namespace)::BarPacketType\n"
+             "  foo                   1 (anonymous namespace)::FooPacketType\n"
+             "  foo                   0 (anonymous namespace)::OtherPacketType\n"
              "\n" ));
 
         SENF_CHECK_NO_THROW( PacketRegistry<BaseTag>::unregisterPacket(1u) );
@@ -140,7 +158,8 @@ SENF_AUTO_UNIT_TEST(packetRegistry_test)
             contains,
             (s.str())
             ("(anonymous namespace)::StringTag:\n"
-             "  foo              (anonymous namespace)::FooPacketType\n"
+             "  foo                   1 (anonymous namespace)::FooPacketType\n"
+             "  foo                   0 (anonymous namespace)::OtherPacketType\n"
              "\n" ));
     }
 }