X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FJoins.test.cc;h=671844862402581e145f6765a0d74475671ff2ea;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=89ce8a87ebdcae81013c215462faf40662068d73;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git diff --git a/senf/PPI/Joins.test.cc b/senf/PPI/Joins.test.cc index 89ce8a8..6718448 100644 --- a/senf/PPI/Joins.test.cc +++ b/senf/PPI/Joins.test.cc @@ -36,7 +36,7 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace ppi = senf::ppi; namespace connector = ppi::connector; @@ -74,7 +74,7 @@ SENF_AUTO_UNIT_TEST(passiveJoin) sink.input.throttle(); BOOST_CHECK( ! source1 ); BOOST_CHECK( ! source2 ); - + source1.submit(p); source2.submit(p); BOOST_CHECK_EQUAL( sink.size(), 2u ); @@ -105,7 +105,7 @@ SENF_AUTO_UNIT_TEST(priorityJoin) senf::Packet p1 (senf::DataPacket::create()); senf::Packet p2 (senf::DataPacket::create()); - + source1.submit(p1); BOOST_CHECK( sink ); source2.submit(p2); @@ -128,10 +128,10 @@ SENF_AUTO_UNIT_TEST(priorityJoin) ppi::connect(source3, join, 0); ppi::connect(source4, join, -2); // Ordering now: source3, source1, source4, source2 - + senf::Packet p3 (senf::DataPacket::create()); senf::Packet p4 (senf::DataPacket::create()); - + source4.submit(p4); source3.submit(p3); source2.submit(p2); @@ -143,7 +143,46 @@ SENF_AUTO_UNIT_TEST(priorityJoin) BOOST_CHECK( ! sink ); } -///////////////////////////////cc.e//////////////////////////////////////// +namespace { + struct ActiveJackSource + { + senf::ppi::connector::ActiveOutputJack<> output; + + debug::ActiveSource source1; + debug::ActiveSource source2; + + ActiveJackSource() + : output (source1.output) {} + + void flip() { + output.reset( source2.output); + } + }; +} + +//SENF_AUTO_UNIT_TEST(jack_passiveJoin) +//{ +// ActiveJackSource jackSource; +// PassiveJoin join; +// debug::PassiveSink sink; +// +// ppi::connect(jackSource, join); +// ppi::connect(join, sink); +// ppi::init(); +// +// senf::Packet p1 (senf::DataPacket::create()); +// senf::Packet p2 (senf::DataPacket::create()); +// +// jackSource.source1.submit( p1); +// BOOST_CHECK_EQUAL( sink.pop_front(), p1); +// +// jackSource.flip(); +// +// jackSource.source2.submit( p2); +// BOOST_CHECK_EQUAL( sink.pop_front(), p2); +//} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_