X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.test.cc;h=e5698945dddaf168be49750f3af1245bc4de1c4c;hb=83df9651fac5af034774ff9314ee18eeb8a5ec2a;hp=403471ac1a8416726db59b126a5cb29249abc124;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git

diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index 403471a..e569894 100644
--- a/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/Packets/DefaultBundle/EthernetPacket.test.cc
@@ -27,6 +27,7 @@
 
 // Custom includes
 #include "EthernetPacket.hh"
+#include "Packets/DataPacket.hh"
 
 #include <boost/test/auto_unit_test.hpp>
 #include <boost/test/test_tools.hpp>
@@ -34,34 +35,17 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-using namespace senf;
-
-BOOST_AUTO_UNIT_TEST(ethernetPacket_parser)
-{
-    unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
-                             0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,  // source MAC
-                             0x10, 0x11 };                        // EtherType
-    typedef unsigned char * iterator;
-    Parse_Ethernet<iterator> p(data);
-
-    BOOST_CHECK_EQUAL( p.destination()[2], 0x03 );
-    BOOST_CHECK_EQUAL( p.source()[3], 0x0A );
-    BOOST_CHECK_EQUAL( p.type(), 0x1011 );
-}
-
 BOOST_AUTO_UNIT_TEST(ethernetPacket_packet)
 {
-    unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
-                             0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,  // source MAC
-                             0x10, 0x11 };                        // EtherType
-    EthernetPacket::ptr p (Packet::create<EthernetPacket>(data, data+sizeof(data)));
+    senf::PacketData::byte data[] = 
+        { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
+          0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,  // source MAC
+          0x10, 0x11 };                        // EtherType
+    senf::EthernetPacket p (senf::EthernetPacket::create(data));
 
     BOOST_CHECK_EQUAL( p->destination()[3], 0x04 );
     BOOST_CHECK_EQUAL( p->source()[0], 0x07 );
     BOOST_CHECK_EQUAL( p->type(), 0x1011 );
-
-    BOOST_CHECK_THROW( Packet::create<EthernetPacket>(data, data+sizeof(data)-1),
-                       TruncatedPacketException );
 }
 
 BOOST_AUTO_UNIT_TEST(ethernetPacket_chain)
@@ -73,16 +57,16 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_chain)
                              0xab, 0xcd,                          // EtherType
                              0xf0, 0xf1, 0xf2, 0xf3, 0xf4 };      // Payload
 
-    EthernetPacket::ptr p (Packet::create<EthernetPacket>(data, data+sizeof(data)));
+    senf::EthernetPacket p (senf::EthernetPacket::create(data));
 
-    BOOST_CHECK( p->next()->is<EthVLanPacket>() );
-    EthVLanPacket::ptr v (p->next()->as<EthVLanPacket>());
+    BOOST_REQUIRE( p.next().is<senf::EthVLanPacket>() );
+    senf::EthVLanPacket v (p.next().as<senf::EthVLanPacket>());
     BOOST_CHECK_EQUAL( v->priority(), 4u );
     BOOST_CHECK( v->cfi() );
     BOOST_CHECK_EQUAL( v->vlanId(), 0x234u );
     BOOST_CHECK_EQUAL( v->type(), 0xabcd );
-    BOOST_CHECK( v->next()->is<DataPacket>() );
-    BOOST_CHECK_EQUAL( *v->next()->begin(), 0xf0 );
+    BOOST_CHECK( v.next().is<senf::DataPacket>() );
+    BOOST_CHECK_EQUAL( *v.next().data().begin(), 0xf0 );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////