X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FParserBase.test.cc;h=f0e410a7977abfb560f2d26bcec9c859e2b825e3;hb=331547d2a137f796eb5fcb390502aece3e01bb16;hp=dca6b77b200ac58c0e983089fd6cdb902905819f;hpb=c52cd7d87dbb525c1267aad27391b8b7365dbb57;p=senf.git

diff --git a/Packets/ParserBase.test.cc b/Packets/ParserBase.test.cc
index dca6b77..f0e410a 100644
--- a/Packets/ParserBase.test.cc
+++ b/Packets/ParserBase.test.cc
@@ -28,6 +28,7 @@
 // Custom includes
 #include "ParserBase.hh"
 #include "Packet.hh"
+#include <boost/static_assert.hpp>
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
@@ -35,8 +36,6 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-namespace pkf = satcom::pkf;
-
 // The non-inherited Version is extensively tested in PaseInt.test.hh
 
 BOOST_AUTO_UNIT_TEST(parserBase_inherited)
@@ -46,15 +45,15 @@ BOOST_AUTO_UNIT_TEST(parserBase_inherited)
 
 namespace {
 
-    template <class Iterator=pkf::nil, class IPacket=pkf::nil>
-    struct Parse_Test : public pkf::ParserBase<Iterator,IPacket>
+    template <class Iterator=senf::nil, class IPacket=senf::nil>
+    struct Parse_Test : public senf::ParserBase<Iterator,IPacket>
     {
-        template <class I=pkf::nil, class P=pkf::nil>
+        template <class I=senf::nil, class P=senf::nil>
         struct rebind { typedef Parse_Test<I,P> parser; };
         typedef Iterator byte_iterator;
         
         Parse_Test() {}
-        Parse_Test(Iterator const & i) : pkf::ParserBase<Iterator,IPacket>(i) {}
+        Parse_Test(Iterator const & i) : senf::ParserBase<Iterator,IPacket>(i) {}
         
         static unsigned bytes() { return 14; }
 
@@ -62,15 +61,15 @@ namespace {
 
     };
 
-    template <class Iterator=pkf::nil, class IPacket=pkf::nil>
-    struct Parse_Test2 : public pkf::ParserBase<Iterator,IPacket>
+    template <class Iterator=senf::nil, class IPacket=senf::nil>
+    struct Parse_Test2 : public senf::ParserBase<Iterator,IPacket>
     {
-        template <class I=pkf::nil, class P=pkf::nil>
+        template <class I=senf::nil, class P=senf::nil>
         struct rebind { typedef Parse_Test<I,P> parser; };
         typedef Iterator byte_iterator;
         
         Parse_Test2() {}
-        Parse_Test2(Iterator const & i) : pkf::ParserBase<Iterator,IPacket>(i) {}
+        Parse_Test2(Iterator const & i) : senf::ParserBase<Iterator,IPacket>(i) {}
         
         unsigned bytes() const { return 14; }
         static unsigned check(Iterator a, Iterator b)
@@ -85,13 +84,16 @@ namespace {
 
 BOOST_AUTO_UNIT_TEST(parserBase_construction)
 {
-    BOOST_CHECK_EQUAL( pkf::min_bytes< Parse_Test<int> >(), 14u );
-    BOOST_CHECK( pkf::check< Parse_Test<int> >(0,14) );
-    BOOST_CHECK( ! pkf::check< Parse_Test<int> >(2,15) );
+    BOOST_STATIC_ASSERT( senf::Parser_traits< Parse_Test<> >::fixed_size );
+    BOOST_STATIC_ASSERT( ! senf::Parser_traits< Parse_Test2<> >::fixed_size );
+
+    BOOST_CHECK_EQUAL( senf::min_bytes< Parse_Test<int> >(), 14u );
+    BOOST_CHECK( senf::check< Parse_Test<int> >(0,14) );
+    BOOST_CHECK( ! senf::check< Parse_Test<int> >(2,15) );
 
-    BOOST_CHECK_EQUAL( pkf::min_bytes< Parse_Test2<int> >(), 10u );
-    BOOST_CHECK( pkf::check< Parse_Test2<int> >(2,13) );
-    BOOST_CHECK( pkf::check< Parse_Test2<int> >(2,12) );
+    BOOST_CHECK_EQUAL( senf::min_bytes< Parse_Test2<int> >(), 10u );
+    BOOST_CHECK( senf::check< Parse_Test2<int> >(2,13) );
+    BOOST_CHECK( senf::check< Parse_Test2<int> >(2,12) );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////
@@ -100,5 +102,5 @@ BOOST_AUTO_UNIT_TEST(parserBase_construction)
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
 // End: