projects / senf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Cleanup: Remove TAB chars and std::cerr debug output
[senf.git] / Packets / 80211Bundle / WLANPacket.test.cc
diff --git a/Packets/80211Bundle/WLANPacket.test.cc b/Packets/80211Bundle/WLANPacket.test.cc
index 5f10603..608fbda 100644 (file)
--- a/Packets/80211Bundle/WLANPacket.test.cc
+++ b/Packets/80211Bundle/WLANPacket.test.cc
@@ -41,11 +41,9 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_packet)
             0x06, 0xb0, 0x00, 0x18, 0x4d, 0x6e, 0x78, 0x48,
             0x30, 0x00, 0x01, 0x00,
             0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00,  //llc header
-            0x38, 0x39, 0x30, 0x31                          //trailer
     };
 
-
-    senf::WLANPacket p (senf::WLANPacket::create(data));
+    senf::WLANPacket_DataFrame p (senf::WLANPacket_DataFrame::create(data));
 
     BOOST_CHECK_EQUAL( p->version(),        0u    );
     BOOST_CHECK_EQUAL( p->type(),           2u    );
@@ -61,30 +59,25 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_packet)
 
     BOOST_CHECK_EQUAL( p->duration(),       0u    );
 
-    BOOST_CHECK_EQUAL(
-            p->dataFrame().destinationAddress().value(),
+    BOOST_CHECK_EQUAL( p->destinationAddress().value(),
             senf::MACAddress::from_string("00:18:4d:6e:78:48") );
-    BOOST_CHECK_EQUAL(
-            p->dataFrame().sourceAddress().value(),
-            senf::MACAddress::from_string("00:0b:6b:57:06:b0") );
-    BOOST_CHECK_EQUAL(
-            p->dataFrame().bssid().value(),
-            senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
-
-    BOOST_CHECK_EQUAL(
-            p->dataFrame().bssid().value(),
-            p->dataFrame().receiverAddress().value() );
-    BOOST_CHECK_EQUAL(
-            p->dataFrame().transmitterAddress().value(),
-            p->dataFrame().sourceAddress().value() );
-
-    BOOST_CHECK_EQUAL( p->dataFrame().sequenceNumber(), 3u );
-    BOOST_CHECK_EQUAL( p->dataFrame().fragmentNumber(), 0u );
+    BOOST_CHECK_EQUAL( p->sourceAddress().value(),
+                       senf::MACAddress::from_string("00:0b:6b:57:06:b0") );
+    BOOST_CHECK_EQUAL (p->bssid().value(),
+                       senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
+
+    BOOST_CHECK_EQUAL( p->bssid().value(),
+                       p->receiverAddress().value() );
+    BOOST_CHECK_EQUAL( p->transmitterAddress().value(),
+                       p->sourceAddress().value() );
+
+    BOOST_CHECK_EQUAL( p->sequenceNumber(), 3u );
+    BOOST_CHECK_EQUAL( p->fragmentNumber(), 0u );
 
     std::ostringstream oss (std::ostringstream::out);
-    SENF_CHECK_NO_THROW( p.dump( oss));
+    SENF_CHECK_NO_THROW( p.dump(oss) );
 
-    BOOST_CHECK( p.next());
+    BOOST_REQUIRE( p.next(senf::nothrow) );
     BOOST_CHECK( p.next().is<senf::LlcSnapPacket>() );
 }
 
@@ -92,10 +85,9 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_packet)
 /* test parser with creating a data frame*/
 BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_create)
 {
-    senf::WLANPacket p (senf::WLANPacket::create());
+    senf::WLANPacket_DataFrame p (senf::WLANPacket_DataFrame::create());
 
-    SENF_CHECK_NO_THROW( p->init_dataFrame() );
-    SENF_CHECK_NO_THROW( p->dataFrame().bssid() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
+    SENF_CHECK_NO_THROW( p->bssid() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
     BOOST_CHECK_EQUAL( p->type(), 2u );
 }
 
@@ -122,10 +114,10 @@ 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, 0x87, 0x07, 0x1f, 0xf5,
+            0x00, 0x24, 0xff, 0x7f, 
     };
 
-    senf::WLANPacket p (senf::WLANPacket::create(data));
+    senf::WLANPacket_MgtFrame p (senf::WLANPacket_MgtFrame::create(data));
 
     BOOST_CHECK_EQUAL( p->version(),        0u    );
     BOOST_CHECK_EQUAL( p->type(),           0u    );
@@ -140,39 +132,31 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_beaconFrame_packet)
     BOOST_CHECK_EQUAL( p->order(),          false );
     BOOST_CHECK_EQUAL( p->duration(),       0u    );
 
-    BOOST_CHECK_EQUAL( p->is_mgtFrame(),    true  );
+    BOOST_CHECK_EQUAL( p->destinationAddress().value(),
+                       senf::MACAddress::from_string("ff:ff:ff:ff:ff:ff") );
+    BOOST_CHECK_EQUAL( p->sourceAddress().value(),
+                       senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
+    BOOST_CHECK_EQUAL( p->bssid().value(),
+                       senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
 
-    BOOST_CHECK_EQUAL(
-            p->mgtFrame().destinationAddress().value(),
-            senf::MACAddress::from_string("ff:ff:ff:ff:ff:ff") );
-    BOOST_CHECK_EQUAL(
-            p->mgtFrame().sourceAddress().value(),
-            senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
-    BOOST_CHECK_EQUAL(
-            p->mgtFrame().bssid().value(),
-            senf::MACAddress::from_string("00:1a:4d:3e:c7:5c") );
-
-    BOOST_CHECK_EQUAL( p->mgtFrame().sequenceNumber(), 302u );
-    BOOST_CHECK_EQUAL( p->mgtFrame().fragmentNumber(), 0u   );
-
-    BOOST_CHECK_EQUAL( p->fcs(), 0x87071ff5 );
+    BOOST_CHECK_EQUAL( p->sequenceNumber(), 302u );
+    BOOST_CHECK_EQUAL( p->fragmentNumber(), 0u   );
 }
 
 
 /* test parser with creating a beacon frame*/
 BOOST_AUTO_UNIT_TEST(WLANPacket_mgtFrame_create)
 {
-    senf::WLANPacket p (senf::WLANPacket::create());
+    senf::WLANPacket_MgtFrame p (senf::WLANPacket_MgtFrame::create());
 
-    SENF_CHECK_NO_THROW( p->init_mgtFrame() );
     SENF_CHECK_NO_THROW(
-            p->mgtFrame().destinationAddress() = senf::MACAddress::from_string("ff:ff:ff:ff:ff:ff")
+            p->destinationAddress() = senf::MACAddress::from_string("ff:ff:ff:ff:ff:ff")
     );
     SENF_CHECK_NO_THROW(
-            p->mgtFrame().sourceAddress() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c")
+            p->sourceAddress() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c")
     );
     SENF_CHECK_NO_THROW(
-            p->mgtFrame().bssid() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c")
+            p->bssid() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c")
     );
 
     BOOST_CHECK_EQUAL( p->type(), 0u );
@@ -183,11 +167,12 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_mgtFrame_create)
 BOOST_AUTO_UNIT_TEST(WLANPacket_ctrlFrame_packet)
 {
     unsigned char data[] = {
-            0xd4, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x6b, 0x57,
-            0x06, 0xb0, 0x4f, 0xda
+            0xd4, 0x00, 0x00, 0x00, 
+            0x00, 0x0b, 0x6b, 0x57, 0x06, 0xb0, 
+            0x4f, 0xda, // What is this ?
     };
 
-    senf::WLANPacket p (senf::WLANPacket::create(data));
+    senf::WLANPacket_CtrlFrame p (senf::WLANPacket_CtrlFrame::create(data));
 
     BOOST_CHECK_EQUAL( p->version(),        0u    );
     BOOST_CHECK_EQUAL( p->type(),           1u    );
@@ -203,22 +188,27 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_ctrlFrame_packet)
 
     BOOST_CHECK_EQUAL( p->duration(),       0u    );
 
-    BOOST_CHECK_EQUAL(
-            p->ctrlFrame().receiverAddress().value(),
-            senf::MACAddress::from_string("00:0b:6b:57:06:b0") );
+    BOOST_CHECK_EQUAL( p->receiverAddress().value(),
+                       senf::MACAddress::from_string("00:0b:6b:57:06:b0") );
 }
 
-
 /* test parser with creating an ACK frame*/
 BOOST_AUTO_UNIT_TEST(WLANPacket_ctrlFrame_create)
 {
-    senf::WLANPacket p (senf::WLANPacket::create()) ;
-//    std::cout << unsigned( senf::init_bytes<senf::WLANPacketParser_CtrlFrameParser>::value ) << "\n";
-    SENF_CHECK_NO_THROW(p->init_ctrlFrame());
-//    std::cout << unsigned( senf::init_bytes<senf::WLANPacketParser_CtrlFrameParser>::value ) << "\n";
-    p->ctrlFrame().receiverAddress() = senf::MACAddress::from_string("00:1a:4d:3e:c7:5c");
-    p->ctrlFrame().set_ack();
+    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);
 }
 
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End:
SENF git-svn repository