X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FMultiConnectorMixin.test.cc;h=eac542cdf9c9afc05688e967573364d4ca80ef7e;hb=d80f142699130075658d6448c90adf71338f2c5a;hp=6e05ebea0aeefd05809ef497ff85af1c2f558564;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/MultiConnectorMixin.test.cc b/senf/PPI/MultiConnectorMixin.test.cc
index 6e05ebe..eac542c 100644
--- a/senf/PPI/MultiConnectorMixin.test.cc
+++ b/senf/PPI/MultiConnectorMixin.test.cc
@@ -29,69 +29,157 @@
 // Custom includes
 #include "PPI.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
+namespace ppi = senf::ppi;
+namespace connector = ppi::connector;
+namespace module = ppi::module;
+namespace debug = module::debug;
 
 namespace {
-    // We only test the user-collection case, all other cases are already handled by
-    // existing modules
+
+    // Primitive join
+    class SequenceContainerModule
+        : public module::Module,
+          public module::MultiConnectorMixin<SequenceContainerModule, connector::PassiveInput<> >
+    {
+        SENF_PPI_MODULE(SequenceContainerModule);
+        typedef module::MultiConnectorMixin<SequenceContainerModule, connector::PassiveInput<> > base;
+
+    public:
+        connector::ActiveOutput<> output;
+
+        using base::connectors;
+
+        SequenceContainerModule() : count (0u)
+        {
+            noroute(output);
+        }
+
+        unsigned count;
+
+    private:
+        void connectorSetup(connector::PassiveInput<> & c)
+        {
+            route(c, output);
+            c.onRequest(boost::bind(&SequenceContainerModule::request, this, boost::ref(c)));
+            ++ count;
+        }
+
+        void connectorDestroy(connector::PassiveInput<> const & c)
+        {
+            -- count;
+        }
+
+        void request(connector::PassiveInput<> & c)
+        {
+            output(c());
+        }
+
+        friend class module::MultiConnectorMixin<SequenceContainerModule, connector::PassiveInput<> >;
+    };
 
     // Primitive duplicator
-    class MyModule
-        : public senf::ppi::module::Module,
-          public senf::ppi::module::MultiConnectorMixin<MyModule,
-                                                        senf::ppi::connector::ActiveOutput<>,
-                                                        void, void>
+    class UserContainerModule
+        : public module::Module,
+          public module::MultiConnectorMixin<UserContainerModule, connector::ActiveOutput<>, void, void>
     {
-        SENF_PPI_MODULE(MyModule);
+        SENF_PPI_MODULE(UserContainerModule);
+        typedef std::vector< boost::shared_ptr<UserContainerModule::ConnectorType> > Connectors;
     public:
-        senf::ppi::connector::PassiveInput<> input;
+        connector::PassiveInput<> input;
 
-        MyModule()
-            {
-                noroute(input); 
-                input.onRequest(&MyModule::request);
-            }
+        UserContainerModule()
+        {
+            noroute(input); 
+            input.onRequest(&UserContainerModule::request);
+        }
+
+        Connectors const & connectors() const
+        { return connectors_; }
 
     private:
         void connectorSetup(std::auto_ptr<ConnectorType> c)
-            {
-                route(input, *c);
-                connectors_.push_back(boost::shared_ptr<ConnectorType>(c));
-            }
+        {
+            route(input, *c);
+            connectors_.push_back(boost::shared_ptr<ConnectorType>(c));
+        }
+
+        void connectorDestroy(ConnectorType const * c)
+        {
+            Connectors::iterator i (
+                std::find_if(connectors_.begin(), connectors_.end(), 
+                             boost::bind(&Connectors::value_type::get,_1) == c));
+            if (i != connectors_.end())
+                connectors_.erase(i);
+        }
 
         void request()
-            {
-                senf::Packet p (input());
-                for (Connectors::iterator i (connectors_.begin()), i_end (connectors_.end());
-                     i != i_end; ++i)
-                    (**i)(p);
-            }
-
-        typedef std::vector< boost::shared_ptr<MyModule::ConnectorType> > Connectors;
+        {
+            senf::Packet p (input());
+            for (Connectors::iterator i (connectors_.begin()), i_end (connectors_.end());
+                    i != i_end; ++i)
+                (**i)(p);
+        }
+
         Connectors connectors_;
                 
-        friend class senf::ppi::module::MultiConnectorMixin<MyModule,
-                                                            senf::ppi::connector::ActiveOutput<>,
-                                                            void, void>;
-
+        friend class module::MultiConnectorMixin<UserContainerModule, connector::ActiveOutput<>, void, void>;
+    };
+        
+    struct IntAnnotation {
+        int value;
+        bool operator<(IntAnnotation const & other) const { return value < other.value; }
+        IntAnnotation() {}
+        IntAnnotation(int v) : value(v) {}
     };
+
+    std::ostream & operator<<(std::ostream & os, IntAnnotation const & value)
+    { os << value.value; return os; }
 }
 
-BOOST_AUTO_UNIT_TEST(multiConnectorMixin_userContainer)
+SENF_AUTO_UNIT_TEST(multiConnectorMixin_sequenceContainer)
 {
-    senf::ppi::module::debug::ActiveSource source;
-    MyModule module;
-    senf::ppi::module::debug::PassiveSink sink1;
-    senf::ppi::module::debug::PassiveSink sink2;
+    debug::ActiveSource source1;
+    debug::ActiveSource source2;
+    SequenceContainerModule module;
+    debug::PassiveSink sink;
 
-    senf::ppi::connect(source, module);
-    senf::ppi::connect(module, sink1);
-    senf::ppi::connect(module, sink2);
-    senf::ppi::init();
+    ppi::connect(source1, module);
+    ppi::connect(source2, module);
+    ppi::connect(module, sink);
+    ppi::init();
+
+    senf::Packet p (senf::DataPacket::create());
+
+    source1.submit(p);
+    BOOST_CHECK_EQUAL( sink.size(), 1u );
+    BOOST_CHECK( sink.pop_front() == p );
+    source2.submit(p);
+    BOOST_CHECK_EQUAL( sink.size(), 1u );
+    BOOST_CHECK( sink.pop_front() == p );
+
+    BOOST_CHECK_EQUAL( module.connectors().size(), 2u );
+    BOOST_CHECK_EQUAL( module.count, 2u );
+    source1.output.disconnect();
+    BOOST_CHECK_EQUAL( module.connectors().size(), 1u );
+    BOOST_CHECK_EQUAL( module.count, 1u );
+}
+
+SENF_AUTO_UNIT_TEST(multiConnectorMixin_userContainer)
+{
+    debug::ActiveSource source;
+    UserContainerModule module;
+    debug::PassiveSink sink1;
+    debug::PassiveSink sink2;
+
+    ppi::connect(source, module);
+    ppi::connect(module, sink1);
+    ppi::connect(module, sink2);
+    ppi::init();
 
     senf::Packet p (senf::DataPacket::create());
 
@@ -100,7 +188,33 @@ BOOST_AUTO_UNIT_TEST(multiConnectorMixin_userContainer)
     BOOST_CHECK_EQUAL( sink2.size(), 1u );
     BOOST_CHECK( sink1.pop_front() == p );
     BOOST_CHECK( sink2.pop_front() == p );
+
+    BOOST_CHECK_EQUAL( module.connectors().size(), 2u );
+    sink1.input.disconnect();
+    BOOST_CHECK_EQUAL( module.connectors().size(), 1u );
+}
+
+SENF_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules)
+{
+    debug::ActiveSource source;
+    debug::PassiveSink sink;
+    module::PassiveJoin join1;
+    module::PassiveJoin join2;
+    module::AnnotationRouter<IntAnnotation> router;
+    UserContainerModule module;
+    
+    ppi::connect(source, join1);
+    ppi::connect(join1, router);
+    ppi::connect(router, 1, join2);
+    ppi::connect(join2, module);
+    ppi::connect(module, sink);
     
+    senf::Packet p (senf::DataPacket::create());
+    p.annotation<IntAnnotation>().value = 1;
+
+    source.submit(p);
+    BOOST_CHECK_EQUAL( sink.size(), 1u );
+    BOOST_CHECK( sink.pop_front() == p );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////