X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FJoins.test.cc;h=89ce8a87ebdcae81013c215462faf40662068d73;hb=f13780e9e4da7df981d6f6542fbdc714beb34765;hp=44e975933247f7ebf87da8ce17cd35ca7dd5e2a8;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/PPI/Joins.test.cc b/senf/PPI/Joins.test.cc index 44e9759..89ce8a8 100644 --- a/senf/PPI/Joins.test.cc +++ b/senf/PPI/Joins.test.cc @@ -30,9 +30,9 @@ #include "Joins.hh" #include "DebugModules.hh" #include "Setup.hh" -#include "../Packets/Packets.hh" +#include -#include "../Utils/auto_unit_test.hh" +#include #include #define prefix_ @@ -43,11 +43,20 @@ namespace connector = ppi::connector; namespace module = ppi::module; namespace debug = module::debug; -BOOST_AUTO_UNIT_TEST(passiveJoin) +namespace { + + struct PassiveJoin : public module::PassiveJoin + { + using module::PassiveJoin::connectors; + }; + +} + +SENF_AUTO_UNIT_TEST(passiveJoin) { debug::ActiveSource source1; debug::ActiveSource source2; - module::PassiveJoin join; + PassiveJoin join; debug::PassiveSink sink; ppi::connect(source1, join); @@ -71,9 +80,16 @@ BOOST_AUTO_UNIT_TEST(passiveJoin) BOOST_CHECK_EQUAL( sink.size(), 2u ); sink.input.unthrottle(); BOOST_CHECK_EQUAL( sink.size(), 4u ); + + BOOST_CHECK_EQUAL( join.connectors().size(), 2u); + source1.output.disconnect(); + BOOST_CHECK_EQUAL( join.connectors().size(), 1u); + ppi::connect(source1, join); + ppi::init(); + BOOST_CHECK_EQUAL( join.connectors().size(), 2u); } -BOOST_AUTO_UNIT_TEST(priorityJoin) +SENF_AUTO_UNIT_TEST(priorityJoin) { debug::PassiveSource source1; debug::PassiveSource source2;