X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FWLANPacket.test.cc;h=7a070e767b7a9ca3d35a8847d619b2ad80f145b5;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=1c0a7c5f0a5dbe4353644a01ec1c1e1780f86267;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Packets/80211Bundle/WLANPacket.test.cc b/senf/Packets/80211Bundle/WLANPacket.test.cc
index 1c0a7c5..7a070e7 100644
--- a/senf/Packets/80211Bundle/WLANPacket.test.cc
+++ b/senf/Packets/80211Bundle/WLANPacket.test.cc
@@ -25,15 +25,13 @@
 
 // Custom includes
 #include "WLANPacket.hh"
-#include <senf/Packets/Packets.hh>
-#include <senf/Packets/DefaultBundle/LlcSnapPacket.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 /* test parser with a data frame */
-BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_packet)
+SENF_AUTO_UNIT_TEST(WLANPacket_dataFrame_packet)
 {
     unsigned char data[] = {
             0x88, 0x01, 0x00, 0x00, 0x00, 0x1a,             //header
@@ -83,17 +81,20 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_packet)
 
 
 /* test parser with creating a data frame*/
-BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_create)
+SENF_AUTO_UNIT_TEST(WLANPacket_dataFrame_create)
 {
     senf::WLANPacket_DataFrame p (senf::WLANPacket_DataFrame::create());
 
     SENF_CHECK_NO_THROW( p->bssid() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
+    SENF_CHECK_NO_THROW(p->sequenceNumber(4095u));
+
     BOOST_CHECK_EQUAL( p->type(), 2u );
+    BOOST_CHECK_EQUAL( p->sequenceNumber(), 4095u );
 }
 
 
 /* test parser with a beacon frame */
-BOOST_AUTO_UNIT_TEST(WLANPacket_beaconFrame_packet)
+SENF_AUTO_UNIT_TEST(WLANPacket_beaconFrame_packet)
 {
     unsigned char data[] = {
             0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
@@ -114,7 +115,7 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_beaconFrame_packet)
             0xa3, 0x40, 0x00, 0x27, 0xa4, 0x00, 0x00, 0x42,
             0x43, 0x5e, 0x00, 0x62, 0x32, 0x2f, 0x00, 0xa0,
             0x00, 0xdd, 0x09, 0x00, 0x03, 0x7f, 0x01, 0x01,
-            0x00, 0x24, 0xff, 0x7f, 
+            0x00, 0x24, 0xff, 0x7f,
     };
 
     senf::WLANPacket_MgtFrame p (senf::WLANPacket_MgtFrame::create(data));
@@ -145,7 +146,7 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_beaconFrame_packet)
 
 
 /* test parser with creating a beacon frame*/
-BOOST_AUTO_UNIT_TEST(WLANPacket_mgtFrame_create)
+SENF_AUTO_UNIT_TEST(WLANPacket_mgtFrame_create)
 {
     senf::WLANPacket_MgtFrame p (senf::WLANPacket_MgtFrame::create());
 
@@ -158,17 +159,22 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_mgtFrame_create)
     SENF_CHECK_NO_THROW(
             p->bssid() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c")
     );
+    SENF_CHECK_NO_THROW(
+            p->sequenceNumber(2);
+            p->sequenceNumber(p->sequenceNumber()+1);
+    );
 
     BOOST_CHECK_EQUAL( p->type(), 0u );
+    BOOST_CHECK_EQUAL( p->sequenceNumber(), 3u );
 }
 
 
 /* test parser with an ACK frame*/
-BOOST_AUTO_UNIT_TEST(WLANPacket_ctrlFrame_packet)
+SENF_AUTO_UNIT_TEST(WLANPacket_ctrlFrame_packet)
 {
     unsigned char data[] = {
-            0xd4, 0x00, 0x00, 0x00, 
-            0x00, 0x0b, 0x6b, 0x57, 0x06, 0xb0, 
+            0xd4, 0x00, 0x00, 0x00,
+            0x00, 0x0b, 0x6b, 0x57, 0x06, 0xb0,
             0x4f, 0xda, // What is this ?
     };
 
@@ -193,15 +199,18 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_ctrlFrame_packet)
 }
 
 /* test parser with creating an ACK frame*/
-BOOST_AUTO_UNIT_TEST(WLANPacket_ctrlFrame_create)
+SENF_AUTO_UNIT_TEST(WLANPacket_ctrlFrame_create)
 {
     senf::WLANPacket_CtrlFrame p (senf::WLANPacket_CtrlFrame::create()) ;
     p->receiverAddress() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c");
     p->set_ack();
+
     BOOST_CHECK_EQUAL( p->type(), 1u);
     BOOST_CHECK_EQUAL( p->subtype(), 13u);
 }
 
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+
 
 // Local Variables:
 // mode: c++