X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketRegistry.test.cc;h=a30c8fbc0c36b4e578eb1076cae00e75d7c04657;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=70618f28ef508a1d3deb38d1d6af786a779de730;hpb=47368f306a577d1e46df69a7f729bd3893cbe5e7;p=senf.git

diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index 70618f2..a30c8fb 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -20,18 +20,18 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief PacketRegistry unit tests */
 
 //#include "PacketRegistry.test.hh"
 //#include "PacketRegistry.test.ih"
 
 // Custom includes
 #include <string>
-#include "PacketRegistry.hh"
-#include "PacketType.hh"
-#include "ParseInt.hh"
+#include <sstream>
+#include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -50,30 +50,55 @@ namespace {
     };
 
     struct FooPacketType : public PacketTypeBase {};
+    typedef senf::ConcretePacket<FooPacketType> FooPacket;
     struct BarPacketType : public PacketTypeBase {};
+    typedef senf::ConcretePacket<BarPacketType> BarPacket;
     struct OtherPacketType : public PacketTypeBase {};
-
-    namespace reg {
-        PacketRegistry<StringTag>::RegistrationProxy<FooPacketType> registerFoo ("foo");
-        PacketRegistry<StringTag>::RegistrationProxy<BarPacketType> registerBar ("bar");
-    }
+    typedef senf::ConcretePacket<OtherPacketType> OtherPacket;
 
 }
 
+SENF_PACKET_REGISTRY_REGISTER(StringTag, "foo", FooPacket);
+SENF_PACKET_REGISTRY_REGISTER(StringTag, "bar", BarPacket);
+
 BOOST_AUTO_UNIT_TEST(packetRegistry_test)
 {
-    PacketRegistry<BaseTag>::registerPacket<FooPacketType>(1u);
-    PacketRegistry<BaseTag>::registerPacket<BarPacketType>(2u);
+    PacketRegistry<BaseTag>::registerPacket<FooPacket>(1u);
+    PacketRegistry<BaseTag>::registerPacket<BarPacket>(2u);
 
-    BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<FooPacketType>(), 1u );
-    BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<BarPacketType>(), 2u );
-    BOOST_CHECK_THROW( PacketRegistry<BaseTag>::key<OtherPacketType>(), 
+    BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<FooPacket>(), 1u );
+    BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<BarPacket>(), 2u );
+    BOOST_CHECK_THROW( PacketRegistry<BaseTag>::key<OtherPacket>(), 
                        PacketTypeNotRegisteredException );
 
-    BOOST_CHECK_EQUAL( PacketRegistry<StringTag>::key<FooPacketType>(), "foo" );
+    BOOST_CHECK_EQUAL( PacketRegistry<StringTag>::key<FooPacket>(), "foo" );
     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]) );
+
+    std::stringstream s;
+    senf::dumpPacketRegistries(s);
+    BOOST_CHECK_EQUAL( s.str(),
+                       "(anonymous namespace)::BaseTag:\n"
+                       "1 senf::ConcretePacket<(anonymous namespace)::FooPacketType>\n"
+                       "2 senf::ConcretePacket<(anonymous namespace)::BarPacketType>\n"
+                       "\n"
+                       "(anonymous namespace)::RegTag:\n"
+                       "1 senf::ConcretePacket<(anonymous namespace)::FooPacketType>\n"
+                       "2 senf::ConcretePacket<(anonymous namespace)::BarPacketType>\n"
+                       "\n"
+                       "(anonymous namespace)::StringTag:\n"
+                       "bar senf::ConcretePacket<(anonymous namespace)::BarPacketType>\n"
+                       "foo senf::ConcretePacket<(anonymous namespace)::FooPacketType>\n"
+                       "\n" );
+
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////