X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketInterpreter.test.cc;h=0e47ea10673f6c0f045fa8f7e11845473ac6fbdc;hb=16c01d1d27fd418ed90da642c69391199f6e5dc7;hp=7d796c9234a82931b5be7abfb09e3001f594f160;hpb=3a3350157a52c268d5082a4aac4aba643417071f;p=senf.git

diff --git a/senf/Packets/PacketInterpreter.test.cc b/senf/Packets/PacketInterpreter.test.cc
index 7d796c9..0e47ea1 100644
--- a/senf/Packets/PacketInterpreter.test.cc
+++ b/senf/Packets/PacketInterpreter.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief PacketInterpreter unit tests */
@@ -33,7 +38,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     struct VoidPacket : public senf::PacketTypeBase {
@@ -61,9 +66,8 @@ SENF_AUTO_UNIT_TEST(packetInterpreterBase)
         BOOST_CHECK( pi2 == pi3->prev() );
         BOOST_CHECK( pi1 == pi2->prev() );
         BOOST_CHECK( ! pi1->prev() );
-        BOOST_CHECK( pi2->is<VoidPacket>() );
         BOOST_CHECK( pi2->as<VoidPacket>() == pi2 );
-        BOOST_CHECK( pi2->parseNextAs(senf::PacketInterpreter<VoidPacket>::factory()) );
+        BOOST_CHECK( pi2->parseNextAs(senf::PacketInterpreter<VoidPacket>::factory(), pi2->nextPacketRange()) );
         BOOST_CHECK( pi2->typeId() == pi1->typeId() );
 
         pi1->data().insert(pi1->data().begin(),2,0x01u);
@@ -233,7 +237,6 @@ SENF_AUTO_UNIT_TEST(packetInterpreter_factory)
     BOOST_CHECK( ! senf::PacketInterpreterBase::no_factory() );
     BOOST_REQUIRE( factory );
 
-    BOOST_CHECK( factory->create()->is<OtherPacket>() );
     BOOST_CHECK_EQUAL( factory->create()->data().size(), 8u );
     BOOST_CHECK_EQUAL( factory->create(senf::noinit)->data().size(), 0u );
     BOOST_CHECK_EQUAL( factory->create(size_type(12u))->data().size(), 12u );
@@ -246,7 +249,6 @@ SENF_AUTO_UNIT_TEST(packetInterpreter_factory)
             (senf::PacketInterpreter<VoidPacket>::create());
 
         BOOST_CHECK_EQUAL( p->data().size(), 0u);
-        BOOST_CHECK( factory->createAfter(p)->is<OtherPacket>() );
         BOOST_REQUIRE( p->next() );
         BOOST_CHECK( ! p->next()->next() );
 
@@ -297,15 +299,13 @@ SENF_AUTO_UNIT_TEST(packetInterpreter_factory)
         senf::PacketInterpreter<VoidPacket>::ptr p
             (senf::PacketInterpreter<VoidPacket>::create(size_type(12u)));
 
-        senf::PacketInterpreterBase::ptr p2 (p->parseNextAs(factory));
-        BOOST_CHECK( p2->is<OtherPacket>() );
-        BOOST_CHECK( ! p2->is<VoidPacket>() );
+        senf::PacketInterpreterBase::ptr p2 (p->parseNextAs(factory, p->nextPacketRange()));
         BOOST_CHECK_EQUAL( unsigned(boost::size(*p2->nextPacketRange())), 4u );
     }
 
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_