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

diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index aebe11a..07523d9 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -27,9 +27,7 @@
 
 // Custom includes
 #include <string>
-#include "PacketRegistry.hh"
-#include "DataPacket.hh"
-#include "ParseInt.hh"
+#include "Packets.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
@@ -49,68 +47,12 @@ 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 {};
+    typedef senf::ConcretePacket<FooPacketType> FooPacket;
+    struct BarPacketType : public PacketTypeBase {};
+    typedef senf::ConcretePacket<BarPacketType> BarPacket;
+    struct OtherPacketType : public PacketTypeBase {};
+    typedef senf::ConcretePacket<OtherPacketType> OtherPacket;
 
     namespace reg {
         PacketRegistry<StringTag>::RegistrationProxy<FooPacket> registerFoo ("foo");
@@ -121,44 +63,17 @@ namespace {
 
 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) );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////