X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FStringParser.test.cc;h=edc29314c57673ad1ed0cf9fc820524320a50ddf;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=68452993dfab699e328d14632257b8e60932cb18;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/StringParser.test.cc b/senf/Packets/StringParser.test.cc
index 6845299..edc2931 100644
--- a/senf/Packets/StringParser.test.cc
+++ b/senf/Packets/StringParser.test.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -29,33 +29,35 @@
 // Custom includes
 #include "Packets.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     struct VoidPacket : public senf::PacketTypeBase
     {};
+
+    typedef senf::StringParser<senf::UInt16Parser> MyStringParser;
 }
 
-BOOST_AUTO_UNIT_TEST(stringParser)
+SENF_AUTO_UNIT_TEST(stringParser)
 {
     senf::PacketInterpreterBase::byte data[] = { 0x00, 0x04, 'T', 'E', 'S', 'T' };
     senf::PacketInterpreterBase::ptr p (senf::PacketInterpreter<VoidPacket>::create(data));
 
     BOOST_CHECK_EQUAL( p->data().size(), 6u );
-    BOOST_CHECK_EQUAL( senf::StringParser(p->data().begin(), &p->data()).value(), "TEST" );
+    BOOST_CHECK_EQUAL( MyStringParser(p->data().begin(), &p->data()).value(), "TEST" );
 
-    senf::StringParser(p->data().begin(), &p->data()).value("Another Test");
+    MyStringParser(p->data().begin(), &p->data()).value("Another Test");
     BOOST_CHECK_EQUAL( p->data().size(), 14u );
     BOOST_CHECK_EQUAL( p->data()[0], 0u );
     BOOST_CHECK_EQUAL( p->data()[1], 12u );
-    BOOST_CHECK_EQUAL( senf::StringParser(p->data().begin(), &p->data()).value(), "Another Test" );
+    BOOST_CHECK_EQUAL( MyStringParser(p->data().begin(), &p->data()).value(), "Another Test" );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_