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

diff --git a/senf/Packets/PacketInterpreter.test.cc b/senf/Packets/PacketInterpreter.test.cc
index 094194c..0e47ea1 100644
--- a/senf/Packets/PacketInterpreter.test.cc
+++ b/senf/Packets/PacketInterpreter.test.cc
@@ -66,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);
@@ -238,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 );
@@ -251,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() );
 
@@ -302,9 +299,7 @@ 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 );
     }