X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FQueueing.test.cc;h=8344d524d168911af0d906282c63e6067b60ac5d;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=3c10045f9c7210b64fce664ef2e6b470b52df29e;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git diff --git a/senf/PPI/Queueing.test.cc b/senf/PPI/Queueing.test.cc index 3c10045..8344d52 100644 --- a/senf/PPI/Queueing.test.cc +++ b/senf/PPI/Queueing.test.cc @@ -38,7 +38,7 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace ppi = senf::ppi; namespace connector = ppi::connector; @@ -69,7 +69,7 @@ namespace { }; } -SENF_AUTO_UNIT_TEST(thresholdQueueing) +SENF_AUTO_UNIT_TEST(PPI_Queueing) { debug::ActiveSource source; QueueTester tester; @@ -80,21 +80,39 @@ SENF_AUTO_UNIT_TEST(thresholdQueueing) ppi::init(); senf::Packet p (senf::DataPacket::create()); - BOOST_CHECK( source ); - source.submit(p); - BOOST_CHECK( source ); - source.submit(p); - BOOST_CHECK( ! source ); - BOOST_CHECK_EQUAL( tester.input.queueSize(), 2u ); - tester.forward(); - BOOST_CHECK_EQUAL( tester.input.queueSize(), 1u ); - BOOST_CHECK( source ); - tester.forward(); - BOOST_CHECK_EQUAL( tester.input.queueSize(), 0u ); - BOOST_CHECK( source ); + { + BOOST_CHECK( source ); + source.submit(p); + BOOST_CHECK( source ); + source.submit(p); + BOOST_CHECK( ! source ); + BOOST_CHECK_EQUAL( tester.input.queueSize(), 2u ); + tester.forward(); + BOOST_CHECK_EQUAL( tester.input.queueSize(), 1u ); + BOOST_CHECK( source ); + tester.forward(); + BOOST_CHECK_EQUAL( tester.input.queueSize(), 0u ); + BOOST_CHECK( source ); + BOOST_CHECK_EQUAL( sink.size(), 2u); + sink.clear(); + } + { + tester.input.qdisc(ppi::QueueingDiscipline::NONE); + BOOST_CHECK( source ); + source.submit(p); + BOOST_CHECK( source ); + source.submit(p); + BOOST_CHECK( source ); + BOOST_CHECK_EQUAL( tester.input.queueSize(), 2u ); + tester.forward(); + tester.forward(); + BOOST_CHECK( source ); + BOOST_CHECK_EQUAL( tester.input.queueSize(), 0u ); + BOOST_CHECK_EQUAL( sink.size(), 2u); + } } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_