X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketRegistry.test.cc;h=70618f28ef508a1d3deb38d1d6af786a779de730;hb=83df9651fac5af034774ff9314ee18eeb8a5ec2a;hp=ed584fc66038987788e99409e21fd4e8eb816bf6;hpb=31d85cd6b8e03c5ecc924ca8892906be1bab702f;p=senf.git

diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index ed584fc..70618f2 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include <string>
 #include "PacketRegistry.hh"
-#include "DataPacket.hh"
+#include "PacketType.hh"
 #include "ParseInt.hh"
 
 #include <boost/test/auto_unit_test.hpp>
@@ -49,115 +49,30 @@ 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;
-    };
+    struct FooPacketType : public PacketTypeBase {};
+    struct BarPacketType : public PacketTypeBase {};
+    struct OtherPacketType : public PacketTypeBase {};
 
     namespace reg {
-        PacketRegistry<StringTag>::RegistrationProxy<FooPacket> registerFoo ("foo");
-        PacketRegistry<StringTag>::RegistrationProxy<BarPacket> registerBar ("bar");
+        PacketRegistry<StringTag>::RegistrationProxy<FooPacketType> registerFoo ("foo");
+        PacketRegistry<StringTag>::RegistrationProxy<BarPacketType> registerBar ("bar");
     }
 
 }
 
 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 );
+    PacketRegistry<BaseTag>::registerPacket<FooPacketType>(1u);
+    PacketRegistry<BaseTag>::registerPacket<BarPacketType>(2u);
 
-    {
-        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_EQUAL( PacketRegistry<BaseTag>::key<FooPacketType>(), 1u );
+    BOOST_CHECK_EQUAL( PacketRegistry<BaseTag>::key<BarPacketType>(), 2u );
+    BOOST_CHECK_THROW( PacketRegistry<BaseTag>::key<OtherPacketType>(), 
+                       PacketTypeNotRegisteredException );
 
-    BOOST_CHECK_EQUAL( PacketRegistry<StringTag>::key<FooPacket>(), "foo" );
-    BOOST_CHECK( PacketRegistry<StringTag>::create("foo",data,data+sizeof(data))
-                 ->is<FooPacket>() );
+    BOOST_CHECK_EQUAL( PacketRegistry<StringTag>::key<FooPacketType>(), "foo" );
+    BOOST_CHECK( ! PacketRegistry<StringTag>::lookup("blub", senf::nothrow) );
+    BOOST_CHECK( PacketRegistry<BaseTag>::lookup(1u, senf::nothrow) );
 
 }
 
@@ -172,4 +87,5 @@ BOOST_AUTO_UNIT_TEST(packetRegistry_test)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: