X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2Fpsi2tsModule%2Fpsi2ts.test.cc;h=69daf0ae156e71c8a0452ad8b86b530e7ed738fc;hb=5d7f7add811bc8fa87b91653811583f9593aeea2;hp=e34aa91befc6e499a21636467472a10b5dee22d9;hpb=7dffbd59c43b82572bad98d4c838b1ed368b9a14;p=senf.git

diff --git a/Examples/psi2tsModule/psi2ts.test.cc b/Examples/psi2tsModule/psi2ts.test.cc
index e34aa91..69daf0a 100644
--- a/Examples/psi2tsModule/psi2ts.test.cc
+++ b/Examples/psi2tsModule/psi2ts.test.cc
@@ -24,13 +24,13 @@
     \brief psi2ts unit tests */
 
 // Custom includes
-#include "senf/PPI/DebugModules.hh"
-#include "senf/PPI/Setup.hh"
+#include <senf/PPI/DebugModules.hh>
+#include <senf/PPI/Setup.hh>
 #include <senf/Packets/MPEGDVBBundle/MPESection.hh>
 #include <senf/Packets/MPEGDVBBundle/TransportPacket.hh>
 #include "psi2ts.hh"
 
-#include "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 #include <boost/lambda/lambda.hpp>
 
@@ -46,39 +46,115 @@ void check_transportpacket_header(senf::TransportPacket tsPacket, bool pusi, uns
     BOOST_CHECK_EQUAL( tsPacket->transport_scrmbl_ctrl(),     0x0u                                   );
     BOOST_CHECK_EQUAL( tsPacket->adaptation_field_ctrl(),     0x1u                                   );
     BOOST_CHECK_EQUAL( tsPacket->continuity_counter(),        counter                                );
-        
+    if (pusi)
+        BOOST_CHECK_EQUAL( tsPacket->pointer_field(),         0x0u                                   );
+
+}
+
+template<class InputIterator, class T>
+bool equal_elements(InputIterator first, InputIterator last, const T& value)
+{
+    return std::find_if( first, last, boost::lambda::_1 != value) == last;
 }
 
-BOOST_AUTO_UNIT_TEST(one_section_to_one_transportpacket)
+
+SENF_AUTO_UNIT_TEST(one_section_to_one_transportpacket)
 {
     senf::ppi::module::debug::ActiveSource source;
     senf::ppi::module::debug::PassiveSink sink;
-    Psi2TsModule psi2ts;
-    
-    senf::ppi::connect(source, psi2ts);
-    senf::ppi::connect(psi2ts, sink);
+    unsigned PID = 42;
+    Psi2TsModule psi2ts (PID);
+
+    senf::ppi::connect( source, psi2ts);
+    senf::ppi::connect( psi2ts, sink);
     senf::ppi::init();
-    
-    std::string payload_data ( "psi2ts_test: one_section_to_one_transportpacket");
-    senf::Packet payload (senf::DataPacket::create(payload_data));
-    payload.finalize();
-    
-    source.submit(payload);
+
+    std::string sec_data ( "psi2ts_test: one_section_to_one_transportpacket");
+    senf::Packet sec_packet (senf::DataPacket::create(sec_data));
+    sec_packet.finalize();
+
+    source.submit(sec_packet);
     BOOST_CHECK_EQUAL( sink.size(), 1u);
 
-    senf::TransportPacket tsPacket = sink.pop_front().as<senf::TransportPacket>();
-    check_transportpacket_header( tsPacket, true, 0, 1);
-    senf::PacketData & ts_data = tsPacket.next().data();
-    BOOST_CHECK_EQUAL_COLLECTIONS( 
-            ts_data.begin(), 
-            boost::next( ts_data.begin(), payload_data.size()),
-            payload_data.begin(),
-            payload_data.end());
-//    BOOST_CHECK( std::find_if( 
-//            boost::next( ts_data.begin(), payload_data.size()), 
-//            ts_data.end(),
-//            boost::lambda::_1 != 0xffu) == ts_data.end() );
+    senf::TransportPacket ts_packet = sink.pop_front().as<senf::TransportPacket>();
+    check_transportpacket_header( ts_packet, true, PID, 1);
+    senf::PacketData & ts_payload_data = ts_packet.next().data();
+    BOOST_CHECK_EQUAL_COLLECTIONS(
+            ts_payload_data.begin(),
+            boost::next( ts_payload_data.begin(), sec_data.size()),
+            sec_data.begin(),
+            sec_data.end());
+    BOOST_CHECK( equal_elements(
+            boost::next( ts_payload_data.begin(), ts_payload_data.size()),
+            ts_payload_data.end(),
+            0xffu));
+}
+
+SENF_AUTO_UNIT_TEST(one_section_to_two_transportpackets)
+{
+    senf::ppi::module::debug::ActiveSource source;
+    senf::ppi::module::debug::PassiveSink sink;
+    unsigned PID = 42;
+    Psi2TsModule psi2ts (PID);
+
+    senf::ppi::connect( source, psi2ts);
+    senf::ppi::connect( psi2ts, sink);
+    senf::ppi::init();
+
+    std::string sec_data ( 183, 0x42);
+    std::string sec_data2 ( "psi2ts_test: one_section_to_two_transportpackets");
+    sec_data.append( sec_data2);
+    senf::Packet sec_packet (senf::DataPacket::create(sec_data));
+    sec_packet.finalize();
+
+    source.submit( sec_packet);
+    BOOST_CHECK_EQUAL( sink.size(), 2u);
+
+    senf::TransportPacket ts_packet = sink.pop_front().as<senf::TransportPacket>();
+    check_transportpacket_header( ts_packet, true, PID, 1);
+    senf::PacketData & ts_payload_data1 = ts_packet.next().data();
+
+    BOOST_CHECK( equal_elements( ts_payload_data1.begin(), ts_payload_data1.end(), 0x42));
+
+    ts_packet = sink.pop_front().as<senf::TransportPacket>();
+    check_transportpacket_header( ts_packet, false, PID, 2);
+    senf::PacketData & ts_payload_data2 = ts_packet.next().data();
+    BOOST_CHECK_EQUAL_COLLECTIONS(
+            ts_payload_data2.begin(),
+            boost::next( ts_payload_data2.begin(), sec_data2.size()),
+            sec_data2.begin(),
+            sec_data2.end());
+    BOOST_CHECK( equal_elements(
+            boost::next( ts_payload_data2.begin(), sec_data2.size()),
+            ts_payload_data2.end(),
+            0xffu));
+}
+
+SENF_AUTO_UNIT_TEST(many_sections_to_many_transportpackets)
+{
+    senf::ppi::module::debug::ActiveSource source;
+    senf::ppi::module::debug::PassiveSink sink;
+    unsigned PID = 42;
+    Psi2TsModule psi2ts (PID);
+
+    senf::ppi::connect( source, psi2ts);
+    senf::ppi::connect( psi2ts, sink);
+    senf::ppi::init();
+
+    std::string sec_data ( "many_sections_to_many_transportpackets");
+    senf::Packet sec_packet (senf::DataPacket::create(sec_data));
+    sec_packet.finalize();
+
+    unsigned NUMBER_OF_SECTIONS = 42u;
+    for (unsigned i=1; i<=NUMBER_OF_SECTIONS; i++) {
+        source.submit( sec_packet);
+    }
+    BOOST_CHECK_EQUAL( sink.size(), NUMBER_OF_SECTIONS);
 
+    for (unsigned i=1; i<=NUMBER_OF_SECTIONS; i++) {
+        senf::TransportPacket ts_packet = sink.pop_front().as<senf::TransportPacket>();
+        check_transportpacket_header( ts_packet, true, PID, i%16);
+    }
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////