Whitespce cleanup: Remove whitespace at end-on-line, remove tabs, wrap

[senf.git] / senf / Packets / PacketRegistry.test.cc

diff --git a/senf/Packets/PacketRegistry.test.cc b/senf/Packets/PacketRegistry.test.cc
index a30c8fb..9c596e9 100644 (file)
--- a/senf/Packets/PacketRegistry.test.cc
+++ b/senf/Packets/PacketRegistry.test.cc
@@ -31,7 +31,7 @@
 #include <sstream>
 #include "Packets.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -61,14 +61,14 @@ namespace {
 SENF_PACKET_REGISTRY_REGISTER(StringTag, "foo", FooPacket);
 SENF_PACKET_REGISTRY_REGISTER(StringTag, "bar", BarPacket);
 
-BOOST_AUTO_UNIT_TEST(packetRegistry_test)
+SENF_AUTO_UNIT_TEST(packetRegistry_test)
 {
     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<OtherPacket>(), 
+    BOOST_CHECK_THROW( PacketRegistry<BaseTag>::key<OtherPacket>(),
                        PacketTypeNotRegisteredException );
 
     BOOST_CHECK_EQUAL( PacketRegistry<StringTag>::key<FooPacket>(), "foo" );
@@ -87,18 +87,17 @@ BOOST_AUTO_UNIT_TEST(packetRegistry_test)
     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"
+                       "  0x00000001 (         1) (....) (anonymous namespace)::FooPacketType\n"
+                       "  0x00000002 (         2) (....) (anonymous namespace)::BarPacketType\n"
                        "\n"
                        "(anonymous namespace)::RegTag:\n"
-                       "1 senf::ConcretePacket<(anonymous namespace)::FooPacketType>\n"
-                       "2 senf::ConcretePacket<(anonymous namespace)::BarPacketType>\n"
+                       "  0x00000001 (         1) (....) (anonymous namespace)::FooPacketType\n"
+                       "  0x00000002 (         2) (....) (anonymous namespace)::BarPacketType\n"
                        "\n"
                        "(anonymous namespace)::StringTag:\n"
-                       "bar senf::ConcretePacket<(anonymous namespace)::BarPacketType>\n"
-                       "foo senf::ConcretePacket<(anonymous namespace)::FooPacketType>\n"
+                       "  bar              (anonymous namespace)::BarPacketType\n"
+                       "  foo              (anonymous namespace)::FooPacketType\n"
                        "\n" );
-
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////