X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FDebugModules.test.cc;h=12a060ee1b060854dd7782ac1501a47b88c01816;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=edd29b8179b17d0baf17f270dea79e93dad905a6;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/PPI/DebugModules.test.cc b/senf/PPI/DebugModules.test.cc index edd29b8..12a060e 100644 --- a/senf/PPI/DebugModules.test.cc +++ b/senf/PPI/DebugModules.test.cc @@ -32,11 +32,11 @@ #define SENF_LOG_CONF (( (senf)(log)(Debug), (_), VERBOSE )) -#include "../Packets/Packets.hh" +#include #include "DebugModules.hh" #include "Setup.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ @@ -45,7 +45,7 @@ namespace debug = senf::ppi::module::debug; namespace ppi = senf::ppi; -BOOST_AUTO_UNIT_TEST(debugModules) +SENF_AUTO_UNIT_TEST(debugModules) { { debug::ActiveSource source; @@ -53,7 +53,7 @@ BOOST_AUTO_UNIT_TEST(debugModules) ppi::connect(source, sink); ppi::init(); - + senf::PacketData::byte data[] = { 0x13u, 0x24u, 0x35u }; senf::Packet p (senf::DataPacket::create(data)); @@ -64,7 +64,7 @@ BOOST_AUTO_UNIT_TEST(debugModules) BOOST_CHECK( ! sink.input.throttled() ); BOOST_CHECK_EQUAL( sink.size(), 1u ); BOOST_CHECK( ! sink.empty() ); - BOOST_CHECK_EQUAL( + BOOST_CHECK_EQUAL( debug::PassiveSink::size_type(std::distance(sink.begin(),sink.end())), sink.size() ); BOOST_CHECK( *sink.begin() == p ); @@ -87,7 +87,7 @@ BOOST_AUTO_UNIT_TEST(debugModules) senf::Packet p (senf::DataPacket::create(data)); source.submit(p); - + BOOST_CHECK_EQUAL( source.size(), 1u ); BOOST_CHECK_EQUAL( sink.request(), p ); BOOST_CHECK_EQUAL( source.size(), 0u ); @@ -95,7 +95,7 @@ BOOST_AUTO_UNIT_TEST(debugModules) } } -BOOST_AUTO_UNIT_TEST(activeFeederSource) +SENF_AUTO_UNIT_TEST(activeFeederSource) { debug::ActiveFeederSource source; debug::PassiveSink sink; @@ -109,7 +109,7 @@ BOOST_AUTO_UNIT_TEST(activeFeederSource) BOOST_CHECK_EQUAL( sink.size(), 1u ); } -BOOST_AUTO_UNIT_TEST(activeFeederSink) +SENF_AUTO_UNIT_TEST(activeFeederSink) { debug::PassiveSource source; debug::ActiveFeederSink sink; @@ -128,7 +128,7 @@ BOOST_AUTO_UNIT_TEST(activeFeederSink) BOOST_CHECK( source.empty() ); } -BOOST_AUTO_UNIT_TEST(logSink) +SENF_AUTO_UNIT_TEST(logSink) { senf::log::StringTarget logTarget; logTarget.route(); @@ -140,7 +140,7 @@ BOOST_AUTO_UNIT_TEST(logSink) senf::PacketData::byte data[] = { 0x13u, 0x24u, 0x35u }; source.submit( senf::DataPacket::create(data) ); senf::ppi::run(); - + BOOST_CHECK( ! logTarget.str().empty() ); }