X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FJack.test.cc;h=0625db3676b7b45caab0fd40a7cf6d07b4fff53f;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=bc6b0c14906b184bfee163d1e2ffd167d31e7f15;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/PPI/Jack.test.cc b/senf/PPI/Jack.test.cc index bc6b0c1..0625db3 100644 --- a/senf/PPI/Jack.test.cc +++ b/senf/PPI/Jack.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 @@ -27,9 +27,10 @@ //#include "Jack.test.ih" // Custom includes -#include "PPI.hh" +#include "Jack.hh" +#include "DebugModules.hh" -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ @@ -37,7 +38,7 @@ namespace { - class ActiveDummyForward + class ActiveDummyForward : public senf::ppi::module::Module { SENF_PPI_MODULE(ActiveDummyForward); @@ -55,7 +56,7 @@ namespace { { ++n; output(input()); } }; - class PassiveDummyForward + class PassiveDummyForward : public senf::ppi::module::Module { SENF_PPI_MODULE(PassiveDummyForward); @@ -98,7 +99,7 @@ namespace { PassiveGroup() : input (forward1.input), output (forward1.output) {} - + void flip() { input.reset(forward2.input); @@ -111,7 +112,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(jacks) +SENF_AUTO_UNIT_TEST(jacks) { { ActiveGroup group; @@ -120,9 +121,9 @@ BOOST_AUTO_UNIT_TEST(jacks) senf::ppi::connect(source, group); senf::ppi::connect(group, sink); - + senf::ppi::init(); - + { senf::Packet p (senf::DataPacket::create()); source.submit(p); @@ -132,7 +133,7 @@ BOOST_AUTO_UNIT_TEST(jacks) group.flip(); senf::ppi::init(); - + { senf::Packet p (senf::DataPacket::create()); source.submit(p); @@ -143,7 +144,7 @@ BOOST_AUTO_UNIT_TEST(jacks) BOOST_CHECK_EQUAL( group.forward1.n, 1u ); BOOST_CHECK_EQUAL( group.forward2.n, 1u ); } - + { PassiveGroup group; senf::ppi::module::debug::ActiveSource source;