Skip to content
Snippets Groups Projects
Commit 436cd747 authored by tho's avatar tho
Browse files

Packets: fixed some tests to run under 64bit (size_type <-> range confusion)

parent 47a8059c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Packets/PacketInterpreter.test.cc
+ 34
− 31
View file @ 436cd747
...@@ -48,11 +48,11 @@ BOOST_AUTO_UNIT_TEST(packetInterpreterBase) ...@@ -48,11 +48,11 @@ BOOST_AUTO_UNIT_TEST(packetInterpreterBase)
{ {
senf::PacketInterpreter<VoidPacket>::ptr pi2 (senf::PacketInterpreter<VoidPacket>::create()); senf::PacketInterpreter<VoidPacket>::ptr pi2 (senf::PacketInterpreter<VoidPacket>::create());
senf::PacketInterpreter<VoidPacket>::ptr pi1 (senf::PacketInterpreter<VoidPacket>::createBefore(pi2)); senf::PacketInterpreter<VoidPacket>::ptr pi1 (senf::PacketInterpreter<VoidPacket>::createBefore(pi2));
pi2->data().insert(pi2->data().begin(),0x02); pi2->data().insert(pi2->data().begin(),0x02);
BOOST_CHECK_EQUAL( pi1->data().size(), 1u ); BOOST_CHECK_EQUAL( pi1->data().size(), 1u );
BOOST_CHECK_EQUAL( pi2->data().size(), 1u ); BOOST_CHECK_EQUAL( pi2->data().size(), 1u );
senf::PacketInterpreter<VoidPacket>::ptr pi3 (pi2->parseNextAs<VoidPacket>()); senf::PacketInterpreter<VoidPacket>::ptr pi3 (pi2->parseNextAs<VoidPacket>());
BOOST_REQUIRE( pi3 ); BOOST_REQUIRE( pi3 );
BOOST_CHECK( pi2 == pi1->next() ); BOOST_CHECK( pi2 == pi1->next() );
...@@ -65,7 +65,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreterBase) ...@@ -65,7 +65,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreterBase)
BOOST_CHECK( pi2->as<VoidPacket>() == pi2 ); BOOST_CHECK( pi2->as<VoidPacket>() == pi2 );
BOOST_CHECK( pi2->parseNextAs(senf::PacketInterpreter<VoidPacket>::factory()) ); BOOST_CHECK( pi2->parseNextAs(senf::PacketInterpreter<VoidPacket>::factory()) );
BOOST_CHECK( pi2->typeId() == pi1->typeId() ); BOOST_CHECK( pi2->typeId() == pi1->typeId() );
pi1->data().insert(pi1->data().begin(),2,0x01u); pi1->data().insert(pi1->data().begin(),2,0x01u);
BOOST_CHECK_EQUAL( pi1->data().size(), 3u ); BOOST_CHECK_EQUAL( pi1->data().size(), 3u );
BOOST_CHECK_EQUAL( pi2->data().size(), 1u ); BOOST_CHECK_EQUAL( pi2->data().size(), 1u );
...@@ -91,7 +91,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreterBase) ...@@ -91,7 +91,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreterBase)
} }
namespace { namespace {
struct OtherPacket struct OtherPacket
: public senf::PacketTypeBase, : public senf::PacketTypeBase,
public senf::PacketTypeMixin<OtherPacket> public senf::PacketTypeMixin<OtherPacket>
{ {
...@@ -105,16 +105,17 @@ namespace { ...@@ -105,16 +105,17 @@ namespace {
BOOST_AUTO_UNIT_TEST(packetInterpreter) BOOST_AUTO_UNIT_TEST(packetInterpreter)
{ {
typedef senf::PacketInterpreterBase::size_type size_type;
{ {
BOOST_CHECK_THROW( senf::PacketInterpreter<OtherPacket>::create(4u), BOOST_CHECK_THROW( senf::PacketInterpreter<OtherPacket>::create(size_type(4u)),
senf::TruncatedPacketException ); senf::TruncatedPacketException );
senf::PacketInterpreter<OtherPacket>::ptr p senf::PacketInterpreter<OtherPacket>::ptr p
(senf::PacketInterpreter<OtherPacket>::create(12u)); (senf::PacketInterpreter<OtherPacket>::create(size_type(12u)));
BOOST_CHECK_EQUAL( p->data().size(), 12u ); BOOST_CHECK_EQUAL( p->data().size(), 12u );
BOOST_CHECK_EQUAL( std::distance(p->data().begin(),p->data().end()), 12 ); BOOST_CHECK_EQUAL( std::distance(p->data().begin(),p->data().end()), 12 );
BOOST_CHECK_EQUAL( p->data()[0], 0x01u ); BOOST_CHECK_EQUAL( p->data()[0], 0x01u );
senf::PacketInterpreter<VoidPacket>::ptr p2 senf::PacketInterpreter<VoidPacket>::ptr p2
(p->parseNextAs<VoidPacket>()); (p->parseNextAs<VoidPacket>());
BOOST_CHECK_EQUAL( p2->data().size(), 4u ); BOOST_CHECK_EQUAL( p2->data().size(), 4u );
...@@ -128,7 +129,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter) ...@@ -128,7 +129,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
} }
{ {
BOOST_CHECK_NO_THROW( BOOST_CHECK_NO_THROW(
senf::PacketInterpreter<OtherPacket>::create(4u,senf::noinit)); senf::PacketInterpreter<OtherPacket>::create(4u,senf::noinit));
senf::PacketInterpreter<OtherPacket>::ptr p senf::PacketInterpreter<OtherPacket>::ptr p
(senf::PacketInterpreter<OtherPacket>::create(senf::noinit)); (senf::PacketInterpreter<OtherPacket>::create(senf::noinit));
...@@ -147,7 +148,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter) ...@@ -147,7 +148,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
{ {
senf::PacketInterpreter<OtherPacket>::ptr p senf::PacketInterpreter<OtherPacket>::ptr p
(senf::PacketInterpreter<OtherPacket>::create(12u)); (senf::PacketInterpreter<OtherPacket>::create(size_type(12u)));
senf::PacketInterpreter<VoidPacket>::ptr p2 senf::PacketInterpreter<VoidPacket>::ptr p2
(senf::PacketInterpreter<VoidPacket>::createAfter(p)); (senf::PacketInterpreter<VoidPacket>::createAfter(p));
BOOST_CHECK_EQUAL( p2->data().size(), 0u ); BOOST_CHECK_EQUAL( p2->data().size(), 0u );
...@@ -159,23 +160,23 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter) ...@@ -159,23 +160,23 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
{ {
senf::PacketInterpreter<OtherPacket>::ptr p senf::PacketInterpreter<OtherPacket>::ptr p
(senf::PacketInterpreter<OtherPacket>::create(12u)); (senf::PacketInterpreter<OtherPacket>::create(size_type(12u)));
senf::PacketInterpreter<OtherPacket>::ptr p2 senf::PacketInterpreter<OtherPacket>::ptr p2
(senf::PacketInterpreter<OtherPacket>::createAfter( (senf::PacketInterpreter<OtherPacket>::createAfter(
p,senf::noinit)); p,senf::noinit));
BOOST_CHECK_EQUAL( p2->data().size(), 0u ); BOOST_CHECK_EQUAL( p2->data().size(), 0u );
BOOST_CHECK_EQUAL( p->data().size(), 8u ); BOOST_CHECK_EQUAL( p->data().size(), 8u );
} }
{ {
senf::PacketInterpreter<OtherPacket>::ptr p senf::PacketInterpreter<OtherPacket>::ptr p
(senf::PacketInterpreter<OtherPacket>::create(12u)); (senf::PacketInterpreter<OtherPacket>::create(size_type(12u)));
senf::PacketInterpreter<OtherPacket>::ptr p2 senf::PacketInterpreter<OtherPacket>::ptr p2
(senf::PacketInterpreter<OtherPacket>::createAfter(p,10u)); (senf::PacketInterpreter<OtherPacket>::createAfter(p, size_type(10u)));
BOOST_CHECK_EQUAL( p2->data().size(), 10u ); BOOST_CHECK_EQUAL( p2->data().size(), 10u );
BOOST_CHECK_EQUAL( p->data().size(), 18u ); BOOST_CHECK_EQUAL( p->data().size(), 18u );
BOOST_CHECK_EQUAL( p2->data()[0], 0x01u ); BOOST_CHECK_EQUAL( p2->data()[0], 0x01u );
BOOST_CHECK_THROW( senf::PacketInterpreter<OtherPacket>::createAfter(p,4u), BOOST_CHECK_THROW( senf::PacketInterpreter<OtherPacket>::createAfter(p, size_type(4u)),
senf::TruncatedPacketException ); senf::TruncatedPacketException );
BOOST_CHECK_NO_THROW( senf::PacketInterpreter<OtherPacket>::createAfter( BOOST_CHECK_NO_THROW( senf::PacketInterpreter<OtherPacket>::createAfter(
p,4u,senf::noinit) ); p,4u,senf::noinit) );
...@@ -183,7 +184,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter) ...@@ -183,7 +184,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
{ {
senf::PacketInterpreter<OtherPacket>::ptr p senf::PacketInterpreter<OtherPacket>::ptr p
(senf::PacketInterpreter<OtherPacket>::create(10u)); (senf::PacketInterpreter<OtherPacket>::create(size_type(10u)));
senf::PacketInterpreter<VoidPacket>::byte data[] = { 0x01, 0x02, 0x03, 0x04 }; senf::PacketInterpreter<VoidPacket>::byte data[] = { 0x01, 0x02, 0x03, 0x04 };
senf::PacketInterpreter<OtherPacket>::ptr p2 senf::PacketInterpreter<OtherPacket>::ptr p2
(senf::PacketInterpreter<OtherPacket>::createAfter(p,data)); (senf::PacketInterpreter<OtherPacket>::createAfter(p,data));
...@@ -195,7 +196,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter) ...@@ -195,7 +196,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
{ {
senf::PacketInterpreter<OtherPacket>::ptr p senf::PacketInterpreter<OtherPacket>::ptr p
(senf::PacketInterpreter<OtherPacket>::create(10u)); (senf::PacketInterpreter<OtherPacket>::create(size_type(10u)));
senf::PacketInterpreter<OtherPacket>::ptr p2 senf::PacketInterpreter<OtherPacket>::ptr p2
(senf::PacketInterpreter<OtherPacket>::createBefore(p)); (senf::PacketInterpreter<OtherPacket>::createBefore(p));
...@@ -205,17 +206,19 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter) ...@@ -205,17 +206,19 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter)
senf::PacketInterpreter<OtherPacket>::ptr p3 senf::PacketInterpreter<OtherPacket>::ptr p3
(senf::PacketInterpreter<OtherPacket>::createBefore( (senf::PacketInterpreter<OtherPacket>::createBefore(
p,senf::noinit)); p,senf::noinit));
BOOST_CHECK_EQUAL( p3->data().size(), 10u ); BOOST_CHECK_EQUAL( p3->data().size(), 10u );
} }
} }
// fields() ist tested in DefaultBundle/EthernetPacket.test.cc // fields() is tested in DefaultBundle/EthernetPacket.test.cc
// initSize() and initHeadSize() are already tested indirectly above // initSize() and initHeadSize() are already tested indirectly above
BOOST_AUTO_UNIT_TEST(packetInterpreter_factory) BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
{ {
typedef senf::PacketInterpreterBase::size_type size_type;
senf::PacketInterpreterBase::byte data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 }; senf::PacketInterpreterBase::byte data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
senf::PacketInterpreterBase::factory_t factory ( senf::PacketInterpreterBase::factory_t factory (
senf::PacketInterpreter<OtherPacket>::factory()); senf::PacketInterpreter<OtherPacket>::factory());
...@@ -226,8 +229,8 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory) ...@@ -226,8 +229,8 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
BOOST_CHECK( factory->create()->is<OtherPacket>() ); BOOST_CHECK( factory->create()->is<OtherPacket>() );
BOOST_CHECK_EQUAL( factory->create()->data().size(), 8u ); BOOST_CHECK_EQUAL( factory->create()->data().size(), 8u );
BOOST_CHECK_EQUAL( factory->create(senf::noinit)->data().size(), 0u ); BOOST_CHECK_EQUAL( factory->create(senf::noinit)->data().size(), 0u );
BOOST_CHECK_EQUAL( factory->create(12u)->data().size(), 12u ); BOOST_CHECK_EQUAL( factory->create(size_type(12u))->data().size(), 12u );
BOOST_CHECK_EQUAL( BOOST_CHECK_EQUAL(
factory->create(4u, senf::noinit)->data().size(), 4u ); factory->create(4u, senf::noinit)->data().size(), 4u );
BOOST_CHECK_EQUAL( factory->create(data)->data().size(), 6u ); BOOST_CHECK_EQUAL( factory->create(data)->data().size(), 6u );
...@@ -244,16 +247,16 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory) ...@@ -244,16 +247,16 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
BOOST_CHECK_EQUAL( p->data().size(), 8u ); BOOST_CHECK_EQUAL( p->data().size(), 8u );
BOOST_CHECK( ! p->next()->next() ); BOOST_CHECK( ! p->next()->next() );
BOOST_CHECK_EQUAL( BOOST_CHECK_EQUAL(
factory->createAfter(p, senf::noinit)->data().size(), 0u ); factory->createAfter(p, senf::noinit)->data().size(), 0u );
BOOST_CHECK_EQUAL( p->data().size(), 0u ); BOOST_CHECK_EQUAL( p->data().size(), 0u );
BOOST_CHECK( ! p->next()->next() ); BOOST_CHECK( ! p->next()->next() );
BOOST_CHECK_EQUAL( factory->createAfter(p,12u)->data().size(), 12u ); BOOST_CHECK_EQUAL( factory->createAfter(p, size_type(12u))->data().size(), 12u );
BOOST_CHECK_EQUAL( p->data().size(), 12u ); BOOST_CHECK_EQUAL( p->data().size(), 12u );
BOOST_CHECK( ! p->next()->next() ); BOOST_CHECK( ! p->next()->next() );
BOOST_CHECK_EQUAL( BOOST_CHECK_EQUAL(
factory->createAfter(p,4u, senf::noinit)->data().size(), 4u ); factory->createAfter(p,4u, senf::noinit)->data().size(), 4u );
BOOST_CHECK_EQUAL( p->data().size(), 4u ); BOOST_CHECK_EQUAL( p->data().size(), 4u );
BOOST_CHECK( ! p->next()->next() ); BOOST_CHECK( ! p->next()->next() );
...@@ -265,14 +268,14 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory) ...@@ -265,14 +268,14 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
{ {
senf::PacketInterpreter<VoidPacket>::ptr p senf::PacketInterpreter<VoidPacket>::ptr p
(senf::PacketInterpreter<VoidPacket>::create(4u)); (senf::PacketInterpreter<VoidPacket>::create(size_type(4u)));
BOOST_CHECK_EQUAL( factory->createBefore(p)->data().size(), 12u ); BOOST_CHECK_EQUAL( factory->createBefore(p)->data().size(), 12u );
BOOST_REQUIRE( p->prev() ); BOOST_REQUIRE( p->prev() );
BOOST_CHECK( ! p->prev()->prev() ); BOOST_CHECK( ! p->prev()->prev() );
BOOST_CHECK_EQUAL( p->prev()->data().size(), 12u ); BOOST_CHECK_EQUAL( p->prev()->data().size(), 12u );
BOOST_CHECK_EQUAL( BOOST_CHECK_EQUAL(
factory->createBefore(p,senf::noinit)->data().size(), 4u ); factory->createBefore(p,senf::noinit)->data().size(), 4u );
BOOST_REQUIRE( p->prev() ); BOOST_REQUIRE( p->prev() );
BOOST_CHECK( ! p->prev()->prev() ); BOOST_CHECK( ! p->prev()->prev() );
...@@ -281,7 +284,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory) ...@@ -281,7 +284,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
{ {
senf::PacketInterpreter<VoidPacket>::ptr p senf::PacketInterpreter<VoidPacket>::ptr p
(senf::PacketInterpreter<VoidPacket>::create(12u)); (senf::PacketInterpreter<VoidPacket>::create(size_type(12u)));
senf::PacketInterpreterBase::ptr p2 (p->parseNextAs(factory)); senf::PacketInterpreterBase::ptr p2 (p->parseNextAs(factory));
BOOST_CHECK( p2->is<OtherPacket>() ); BOOST_CHECK( p2->is<OtherPacket>() );
...@@ -294,7 +297,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory) ...@@ -294,7 +297,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
///////////////////////////////cc.e//////////////////////////////////////// ///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_ #undef prefix_
// Local Variables: // Local Variables:
// mode: c++ // mode: c++
// fill-column: 100 // fill-column: 100
......
Packets/PacketParser.test.cc
+ 4
− 3
View file @ 436cd747
...@@ -42,7 +42,7 @@ namespace { ...@@ -42,7 +42,7 @@ namespace {
{ {
# include SENF_FIXED_PARSER() # include SENF_FIXED_PARSER()
SENF_PARSER_FINALIZE(SimpleParser); SENF_PARSER_FINALIZE(SimpleParser);
using senf::PacketParserBase::check; using senf::PacketParserBase::check;
using senf::PacketParserBase::validate; using senf::PacketParserBase::validate;
}; };
...@@ -70,7 +70,8 @@ namespace { ...@@ -70,7 +70,8 @@ namespace {
BOOST_AUTO_UNIT_TEST(packetParserBase) BOOST_AUTO_UNIT_TEST(packetParserBase)
{ {
senf::PacketInterpreter<VoidPacket>::ptr pi (senf::PacketInterpreter<VoidPacket>::create(6u)); senf::PacketInterpreter<VoidPacket>::ptr pi (senf::PacketInterpreter<VoidPacket>::create(
senf::PacketInterpreterBase::size_type(6u)));
SimpleParser p (pi->data().begin(),&pi->data()); SimpleParser p (pi->data().begin(),&pi->data());
BOOST_CHECK( pi->data().begin() == p.i() ); BOOST_CHECK( pi->data().begin() == p.i() );
...@@ -94,7 +95,7 @@ BOOST_AUTO_UNIT_TEST(packetParserBase) ...@@ -94,7 +95,7 @@ BOOST_AUTO_UNIT_TEST(packetParserBase)
///////////////////////////////cc.e//////////////////////////////////////// ///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_ #undef prefix_
// Local Variables: // Local Variables:
// mode: c++ // mode: c++
// fill-column: 100 // fill-column: 100
......
Packets/SafeIterator.test.cc
+ 6
− 5
View file @ 436cd747
// $Id$ // $Id$
// //
// Copyright (C) 2008 // Copyright (C) 2008
// Fraunhofer Institute for Open Communication Systems (FOKUS) // Fraunhofer Institute for Open Communication Systems (FOKUS)
// Competence Center NETwork research (NET), St. Augustin, GERMANY // Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de> // Stefan Bund <g0dil@berlios.de>
...@@ -41,16 +41,17 @@ namespace { ...@@ -41,16 +41,17 @@ namespace {
BOOST_AUTO_UNIT_TEST(safePacketParser) BOOST_AUTO_UNIT_TEST(safePacketParser)
{ {
senf::PacketInterpreter<VoidPacket>::ptr pi (senf::PacketInterpreter<VoidPacket>::create(6u)); senf::PacketInterpreter<VoidPacket>::ptr pi (senf::PacketInterpreter<VoidPacket>::create(
senf::PacketInterpreterBase::size_type(6u)));
senf::SafePacketParserWrapper<senf::UInt16Parser> p; senf::SafePacketParserWrapper<senf::UInt16Parser> p;
BOOST_CHECK( !p ); BOOST_CHECK( !p );
p = senf::UInt16Parser(pi->data().begin(),&pi->data()); p = senf::UInt16Parser(pi->data().begin(),&pi->data());
BOOST_CHECK( p ); BOOST_CHECK( p );
(*p) = 0x1234u; (*p) = 0x1234u;
BOOST_CHECK_EQUAL( (*p), 0x1234u ); BOOST_CHECK_EQUAL( (*p), 0x1234u );
BOOST_CHECK_EQUAL( p->data()[0], 0x12u ); BOOST_CHECK_EQUAL( p->data()[0], 0x12u );
...@@ -63,7 +64,7 @@ BOOST_AUTO_UNIT_TEST(safePacketParser) ...@@ -63,7 +64,7 @@ BOOST_AUTO_UNIT_TEST(safePacketParser)
///////////////////////////////cc.e//////////////////////////////////////// ///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_ #undef prefix_
// Local Variables: // Local Variables:
// mode: c++ // mode: c++
// fill-column: 100 // fill-column: 100
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Datenschutz und Impressum