projects / senf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Packets: Extend finalize() API
[senf.git] / Packets / MPEGDVBBundle / TLVPacket.test.cc
diff --git a/Packets/MPEGDVBBundle/TLVPacket.test.cc b/Packets/MPEGDVBBundle/TLVPacket.test.cc
index d6aadc6..5fd157f 100644 (file)
--- a/Packets/MPEGDVBBundle/TLVPacket.test.cc
+++ b/Packets/MPEGDVBBundle/TLVPacket.test.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Thorsten Horstmann <tho@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -56,39 +56,45 @@ BOOST_AUTO_UNIT_TEST(TLVPacket_static)
 {
     // check static values:
     // number of bytes to allocate for a new TLVPacket should be 5
-    BOOST_CHECK_EQUAL( TLVPacket::type::initSize(), 5u );
+    // BOOST_CHECK_EQUAL( TLVPacket::type::initSize(), 5u );
 }
 
+
 BOOST_AUTO_UNIT_TEST(TLVPacket_parse_packet_with_simple_length)
 {
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, DynamicTLVLengthParser> > TestTLVPacket;
     unsigned char data[] = { 
         0x01, 0x23, 0x45, 0x67, // type
         0x0A, // first bit not set, length=10
         0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 // value (payload)
     };
-    senf::TLVPacket tlvPacket (senf::TLVPacket::create(data));
+    TestTLVPacket tlvPacket (TestTLVPacket::create(data));
     check_TLVPacket( tlvPacket, 0x01234567u, 0x0Au );
 }
 
+
 BOOST_AUTO_UNIT_TEST(TLVPacket_parse_packet_with_extended_length)
 {
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, DynamicTLVLengthParser> > TestTLVPacket;
     unsigned char data[] = { 
         0x01, 0x23, 0x45, 0x67, // type
         0x81, // first and last bit set => one byte length following
         0x0A, // length (10 bytes value)
         0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 // value (payload)
     };        
-    senf::TLVPacket tlvPacket (senf::TLVPacket::create(data));
+    TestTLVPacket tlvPacket (TestTLVPacket::create(data));
     check_TLVPacket( tlvPacket, 0x01234567u, 0x0Au );
 }
 
+
 BOOST_AUTO_UNIT_TEST(TLVPacket_create_packet_with_simple_length)
 {
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, DynamicTLVLengthParser> > TestTLVPacket;
     std::string payload ("Hello, world!");
-    TLVPacket tlvPacket (TLVPacket::create());
+    TestTLVPacket tlvPacket (TestTLVPacket::create());
     tlvPacket->type() = 42u;
     DataPacket::createAfter( tlvPacket, payload );
-    tlvPacket.finalize();
+    tlvPacket.finalizeAll();
 
     BOOST_CHECK_EQUAL( tlvPacket->type(), 42u);
     BOOST_CHECK_EQUAL( tlvPacket->length(), 13u);
@@ -100,13 +106,14 @@ BOOST_AUTO_UNIT_TEST(TLVPacket_create_packet_with_simple_length)
 
 BOOST_AUTO_UNIT_TEST(TLVPacket_create_packet_with_extended_length)
 {
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, DynamicTLVLengthParser> > TestTLVPacket;
     std::string payload (
             "This is a very long string with more than 127 characters to check if the TLV-Packet "
             "works correctly with an extended length. That's all." );
-    TLVPacket tlvPacket (TLVPacket::create());
+    TestTLVPacket tlvPacket (TestTLVPacket::create());
     tlvPacket->type() = 42u;
     DataPacket::createAfter( tlvPacket, payload );
-    tlvPacket.finalize();
+    tlvPacket.finalizeAll();
         
     BOOST_CHECK_EQUAL( tlvPacket->type(), 42u );
     BOOST_CHECK_EQUAL( tlvPacket->length(), payload.size() );
@@ -116,28 +123,30 @@ BOOST_AUTO_UNIT_TEST(TLVPacket_create_packet_with_extended_length)
 
     payload = std::string("This is a short string with less than 127 characters. That's all.");
     DataPacket::createAfter( tlvPacket, payload );
-    tlvPacket.finalize();
+    tlvPacket.finalizeAll();
 
     BOOST_CHECK_EQUAL( tlvPacket->type(), 42u );
     BOOST_CHECK_EQUAL( tlvPacket->length(), payload.size() );
-           
+
     PacketData & tlvPacket_value2 (tlvPacket.next().data());
-    BOOST_CHECK( equal( tlvPacket_value2.begin(), tlvPacket_value2.end(), payload.begin() ));     
+    BOOST_CHECK( equal( tlvPacket_value2.begin(), tlvPacket_value2.end(), payload.begin() ));
 }
 
+
 BOOST_AUTO_UNIT_TEST(TLVPacket_create_invalid_packet)
 {
     
 }
 
+
 BOOST_AUTO_UNIT_TEST(TLVFixPacket_static)
 {
     // check static values:
-    // number of bytes to allocate for a new TLVFixPacket should be 4+bytes_of_length
-    BOOST_CHECK_EQUAL( TLVFix8Packet::type::initSize(),  4+1u );
-    BOOST_CHECK_EQUAL( TLVFix16Packet::type::initSize(), 4+2u );
-    BOOST_CHECK_EQUAL( TLVFix24Packet::type::initSize(), 4+3u );
-    BOOST_CHECK_EQUAL( TLVFix32Packet::type::initSize(), 4+4u );
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt8Parser> > TestTLVPacket8;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt24Parser> > TestTLVPacket24;
+    
+    BOOST_CHECK_EQUAL( TestTLVPacket8::type::initSize(),  4+1u );
+    BOOST_CHECK_EQUAL( TestTLVPacket24::type::initSize(), 4+3u );
 }
 
 
@@ -158,10 +167,15 @@ void test_TLVFixPacket_parsing(unsigned lengthParser_size)
 
 BOOST_AUTO_UNIT_TEST(TLVFixPacket_parse_packet)
 {
-    test_TLVFixPacket_parsing<TLVFix8Packet>( UInt8Parser::fixed_bytes);
-    test_TLVFixPacket_parsing<TLVFix16Packet>( UInt16Parser::fixed_bytes);
-    test_TLVFixPacket_parsing<TLVFix24Packet>( UInt24Parser::fixed_bytes);
-    test_TLVFixPacket_parsing<TLVFix32Packet>( UInt32Parser::fixed_bytes);
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt8Parser> > TestTLVPacket8;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt16Parser> > TestTLVPacket16;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt24Parser> > TestTLVPacket24;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt32Parser> > TestTLVPacket32;
+    
+    test_TLVFixPacket_parsing<TestTLVPacket8>( UInt8Parser::fixed_bytes);
+    test_TLVFixPacket_parsing<TestTLVPacket16>( UInt16Parser::fixed_bytes);
+    test_TLVFixPacket_parsing<TestTLVPacket24>( UInt24Parser::fixed_bytes);
+    test_TLVFixPacket_parsing<TestTLVPacket32>( UInt32Parser::fixed_bytes);
 }
 
 
@@ -172,7 +186,7 @@ void test_TLVFixPacket_creating()
     TLVFixPacketType tlvPacket (TLVFixPacketType::create());
     tlvPacket->type() = 42u;
     DataPacket::createAfter( tlvPacket, payload );
-    tlvPacket.finalize();
+    tlvPacket.finalizeAll();
 
     BOOST_CHECK_EQUAL( tlvPacket->type(), 42u);
     BOOST_CHECK_EQUAL( tlvPacket->length(), 13u);
@@ -183,10 +197,15 @@ void test_TLVFixPacket_creating()
 
 BOOST_AUTO_UNIT_TEST(TLVFixPacket_create_packet)
 {
-    test_TLVFixPacket_creating<TLVFix8Packet>();
-    test_TLVFixPacket_creating<TLVFix16Packet>();
-    test_TLVFixPacket_creating<TLVFix24Packet>();
-    test_TLVFixPacket_creating<TLVFix32Packet>();
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt8Parser> > TestTLVPacket8;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt16Parser> > TestTLVPacket16;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt24Parser> > TestTLVPacket24;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt32Parser> > TestTLVPacket32;
+    
+    test_TLVFixPacket_creating<TestTLVPacket8>();
+    test_TLVFixPacket_creating<TestTLVPacket16>();
+    test_TLVFixPacket_creating<TestTLVPacket24>();
+    test_TLVFixPacket_creating<TestTLVPacket32>();
 }
 
 
@@ -197,15 +216,18 @@ void test_invalid_TLVFixPacket_creating(boost::uint32_t max_value)
     tlvPacket->type() = 42u;
     DataPacket payload (DataPacket::createAfter( tlvPacket, max_value+1));
     //DataPacket::createAfter( payload, 1); // this is one byte to much.
-    BOOST_CHECK_THROW( tlvPacket.finalize(), UnsuportedTLVPacketException);
+    BOOST_CHECK_THROW( tlvPacket.finalizeAll(), UnsuportedTLVPacketException);
 }
 
 BOOST_AUTO_UNIT_TEST(TLVFixPacket_create_invalid_packet)
 {
-    test_invalid_TLVFixPacket_creating<TLVFix8Packet> ( UInt8Parser::max_value);
-    test_invalid_TLVFixPacket_creating<TLVFix16Packet>( UInt16Parser::max_value);
-    test_invalid_TLVFixPacket_creating<TLVFix24Packet>( UInt24Parser::max_value);
-    //test_invalid_TLVFixPacket_creating<TLVFix32Packet>( UInt32Parser::max_value);
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt8Parser> > TestTLVPacket8;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt16Parser> > TestTLVPacket16;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, UInt24Parser> > TestTLVPacket24;
+    
+    test_invalid_TLVFixPacket_creating<TestTLVPacket8> ( UInt8Parser::max_value);
+    test_invalid_TLVFixPacket_creating<TestTLVPacket16>( UInt16Parser::max_value);
+    test_invalid_TLVFixPacket_creating<TestTLVPacket24>( UInt24Parser::max_value);
 }
 
 
SENF git-svn repository