X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FMonitorModule.test.cc;h=d0e55ad16f66c76aa22b2da85cc934fdc8a00918;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=c86cd8447d51cc814be8169f83c7e00e4d40e9ad;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/PPI/MonitorModule.test.cc b/senf/PPI/MonitorModule.test.cc index c86cd84..d0e55ad 100644 --- a/senf/PPI/MonitorModule.test.cc +++ b/senf/PPI/MonitorModule.test.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -30,14 +30,14 @@ #include "MonitorModule.hh" #include "DebugModules.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// namespace { - + class PacketCounter : public senf::ppi::module::MonitorModule<> { SENF_PPI_MODULE(PacketCounter); @@ -49,17 +49,17 @@ namespace { } -BOOST_AUTO_UNIT_TEST(monitorModulePassthrough) +SENF_AUTO_UNIT_TEST(monitorModulePassthrough) { senf::ppi::module::debug::ActiveSource source; senf::ppi::module::debug::PassiveSink sink; PacketCounter counter; - + senf::ppi::connect(source, counter); senf::ppi::connect(counter, sink); senf::ppi::init(); - + senf::Packet p (senf::DataPacket::create()); BOOST_CHECK_EQUAL( counter.count, 0u ); @@ -73,7 +73,7 @@ BOOST_AUTO_UNIT_TEST(monitorModulePassthrough) BOOST_CHECK( source ); } -BOOST_AUTO_UNIT_TEST(monitorModuleNoPassthrough) +SENF_AUTO_UNIT_TEST(monitorModuleNoPassthrough) { senf::ppi::module::debug::ActiveSource source; PacketCounter counter; @@ -83,14 +83,14 @@ BOOST_AUTO_UNIT_TEST(monitorModuleNoPassthrough) senf::ppi::init(); senf::Packet p (senf::DataPacket::create()); - + BOOST_CHECK_EQUAL( counter.count, 0u ); source.submit(p); BOOST_CHECK_EQUAL( counter.count, 1u ); BOOST_CHECK( source ); } -BOOST_AUTO_UNIT_TEST(monitorModuleDynamicConnect) +SENF_AUTO_UNIT_TEST(monitorModuleDynamicConnect) { senf::ppi::module::debug::ActiveSource source; PacketCounter counter; @@ -100,7 +100,7 @@ BOOST_AUTO_UNIT_TEST(monitorModuleDynamicConnect) senf::ppi::init(); senf::Packet p (senf::DataPacket::create()); - + BOOST_CHECK_EQUAL( counter.count, 0u ); source.submit(p); BOOST_CHECK_EQUAL( counter.count, 1u ); @@ -125,7 +125,7 @@ BOOST_AUTO_UNIT_TEST(monitorModuleDynamicConnect) BOOST_CHECK( source ); source.submit(p); BOOST_CHECK_EQUAL( counter.count, 3u ); - + } ///////////////////////////////cc.e////////////////////////////////////////