X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketRegistry.test.cc;h=a30c8fbc0c36b4e578eb1076cae00e75d7c04657;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=aebe11a2440d615b5d4cd3916764991793914614;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git

diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index aebe11a..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 "DataPacket.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_
@@ -49,115 +49,55 @@ namespace {
         typedef std::string key_t;
     };
 
-    class BasePacket
-        : public Packet, public PacketRegistryMixin<BaseTag,BasePacket>
-    {
-        using PacketRegistryMixin<BaseTag,BasePacket>::registerInterpreter;
-    public:
-        typedef ptr_t<BasePacket>::ptr ptr;
-        typedef iterator byte_iterator;
-
-        typedef Parse_UInt16<iterator> Parse_Type;
-
-        Parse_Type type() const { return Parse_Type(begin()); }
-        static bool check(iterator b, iterator e) { return true; }
-
-    private:
-        template <class Arg>
-        BasePacket(Arg const & arg) : Packet(arg) {}
-
-        virtual void v_nextInterpreter() const
-            { registerInterpreter(type(), begin()+2, end()); }
-        virtual void v_finalize() {}
-        virtual void v_dump(std::ostream & os) const {}
-
-        friend class Packet;
-    };
-
-    class FooPacket : public Packet
-    {
-    public:
-        typedef ptr_t<FooPacket>::ptr ptr;
-        typedef iterator byte_iterator;
-
-        static bool check(iterator b, iterator e) { return true; }
-
-    private:
-        template <class Arg>
-        FooPacket(Arg const & arg) : Packet(arg) {}
-
-        virtual void v_nextInterpreter() const {}
-        virtual void v_finalize() {}
-        virtual void v_dump(std::ostream & os) const {}
-
-        friend class Packet;
-    };
-
-    class BarPacket : public Packet
-    {
-    public:
-        typedef ptr_t<BarPacket>::ptr ptr;
-        typedef iterator byte_iterator;
-
-        static bool check(iterator b, iterator e) { return true; }
-
-    private:
-        template <class Arg>
-        BarPacket(Arg const & arg) : Packet(arg) {}
-
-        virtual void v_nextInterpreter() const {}
-        virtual void v_finalize() {}
-        virtual void v_dump(std::ostream & os) const {}
-
-        friend class Packet;
-    };
-
-    namespace reg {
-        PacketRegistry<StringTag>::RegistrationProxy<FooPacket> registerFoo ("foo");
-        PacketRegistry<StringTag>::RegistrationProxy<BarPacket> registerBar ("bar");
-    }
+    struct FooPacketType : public PacketTypeBase {};
+    typedef senf::ConcretePacket<FooPacketType> FooPacket;
+    struct BarPacketType : public PacketTypeBase {};
+    typedef senf::ConcretePacket<BarPacketType> BarPacket;
+    struct OtherPacketType : public PacketTypeBase {};
+    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)
 {
-    unsigned char data[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                             0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F };
-
-    {
-        BasePacket::ptr p (Packet::create<BasePacket>(data, data+sizeof(data)));
-        BOOST_CHECK( p->next()->is<DataPacket>() );
-    }
-
     PacketRegistry<BaseTag>::registerPacket<FooPacket>(1u);
     PacketRegistry<BaseTag>::registerPacket<BarPacket>(2u);
 
     BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<FooPacket>(), 1u );
     BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<BarPacket>(), 2u );
-    BOOST_CHECK_THROW( PacketRegistry<BaseTag>::key<DataPacket>(), PacketTypeNotRegistered );
-
-    {
-        BasePacket::ptr p (Packet::create<BasePacket>(data, data+sizeof(data)));
-        BOOST_CHECK( p->next()->is<FooPacket>() );
-    }
-
-    data[1] = 0x02;
-
-    {
-        BasePacket::ptr p (Packet::create<BasePacket>(data, data+sizeof(data)));
-        BOOST_CHECK( p->next()->is<BarPacket>() );
-    }
-
-    data[0] = 0x01;
-
-    {
-        BasePacket::ptr p (Packet::create<BasePacket>(data, data+sizeof(data)));
-        BOOST_CHECK( p->next()->is<DataPacket>() );
-    }
+    BOOST_CHECK_THROW( PacketRegistry<BaseTag>::key<OtherPacket>(), 
+                       PacketTypeNotRegisteredException );
 
     BOOST_CHECK_EQUAL( PacketRegistry<StringTag>::key<FooPacket>(), "foo" );
-    BOOST_CHECK( PacketRegistry<StringTag>::create("foo",data,data+sizeof(data))
-                 ->is<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]) );
+
+    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" );
 
 }