// $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
// Custom includes
#include <string>
+#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_
struct OtherPacketType : public PacketTypeBase {};
typedef senf::ConcretePacket<OtherPacketType> OtherPacket;
- namespace reg {
- PacketRegistry<StringTag>::RegistrationProxy<FooPacket> registerFoo ("foo");
- PacketRegistry<StringTag>::RegistrationProxy<BarPacket> registerBar ("bar");
- }
-
}
+SENF_PACKET_REGISTRY_REGISTER(StringTag, "foo", FooPacket);
+SENF_PACKET_REGISTRY_REGISTER(StringTag, "bar", BarPacket);
+
BOOST_AUTO_UNIT_TEST(packetRegistry_test)
{
PacketRegistry<BaseTag>::registerPacket<FooPacket>(1u);
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////////////////////////////////////////