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

diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index 70618f2..37b6750 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -27,11 +27,9 @@
 
 // Custom includes
 #include <string>
-#include "PacketRegistry.hh"
-#include "PacketType.hh"
-#include "ParseInt.hh"
+#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 +48,32 @@ namespace {
     };
 
     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<FooPacketType> registerFoo ("foo");
-        PacketRegistry<StringTag>::RegistrationProxy<BarPacketType> registerBar ("bar");
+        PacketRegistry<StringTag>::RegistrationProxy<FooPacket> registerFoo ("foo");
+        PacketRegistry<StringTag>::RegistrationProxy<BarPacket> registerBar ("bar");
     }
 
 }
 
 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) );
-
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////