Implement senf::IGNORE and replace all casts-to-void with senf::IGNORE() calls

[senf.git] / senf / Packets / Packet.test.cc

diff --git a/senf/Packets/Packet.test.cc b/senf/Packets/Packet.test.cc
index 6aecfbe..21362e7 100644 (file)
--- a/senf/Packets/Packet.test.cc
+++ b/senf/Packets/Packet.test.cc
@@ -31,7 +31,7 @@
 #include <boost/static_assert.hpp>
 #include "Packets.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -150,7 +150,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(packet)
+SENF_AUTO_UNIT_TEST(packet)
 {
     senf::Packet packet (FooPacket::create());    
     BarPacket::createAfter(packet);
@@ -160,7 +160,7 @@ BOOST_AUTO_UNIT_TEST(packet)
     BOOST_CHECK( ! packet.next().next(senf::nothrow) );
     BOOST_CHECK( ! packet.prev(senf::nothrow) );
     BOOST_CHECK( packet.next().prev() == packet );
-    BOOST_CHECK( packet.next() != packet );
+    SENF_CHECK_NOT_EQUAL( packet.next(), packet );
     BOOST_CHECK_EQUAL( std::distance(packet.data().begin(), packet.next().data().begin()), 4 );
     BOOST_CHECK_EQUAL( std::distance(packet.data().begin(), packet.data().end()), 12 );
     BOOST_CHECK_EQUAL( std::distance(packet.next().data().begin(), packet.next().data().end()), 8 );
@@ -240,9 +240,11 @@ BOOST_AUTO_UNIT_TEST(packet)
     senf::DataPacket::createAfter(packet);
     BOOST_CHECK_THROW( packet.next().next().next().parseNextAs<BarPacket>(),
             senf::InvalidPacketChainException );
+
+    SENF_CHECK_NO_THROW( BarPacket::create(senf::noinit).dump(s));
 }
 
-BOOST_AUTO_UNIT_TEST(concretePacket)
+SENF_AUTO_UNIT_TEST(concretePacket)
 {
     senf::PacketData::byte data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
 
@@ -279,11 +281,11 @@ BOOST_AUTO_UNIT_TEST(concretePacket)
     BOOST_CHECK_EQUAL( FooPacket::createBefore(packet,senf::noinit).size(), 10u );
     BOOST_CHECK_EQUAL( packet.size(), 10u );
 
-    BOOST_CHECK( packet.clone() != packet );
+    SENF_CHECK_NOT_EQUAL( packet.clone(), packet );
     BOOST_CHECK_EQUAL( BarPacket::create()->reserved(), 0xA0A0u );
 }
 
-BOOST_AUTO_UNIT_TEST(packetAssign)
+SENF_AUTO_UNIT_TEST(packetAssign)
 {
     BarPacket bar1 (BarPacket::create());
     BarPacket bar2 (BarPacket::create());
@@ -294,7 +296,7 @@ BOOST_AUTO_UNIT_TEST(packetAssign)
     BOOST_CHECK_EQUAL( bar1->type(), 0x2A2Bu );
 }
 
-BOOST_AUTO_UNIT_TEST(packetAnnotation)
+SENF_AUTO_UNIT_TEST(packetAnnotation)
 {
     senf::Packet packet (FooPacket::create());
     BarPacket::createAfter(packet);
@@ -324,7 +326,7 @@ COMPILE_FAIL(invalidAnnotation)
 #   ifdef BOOST_HAS_TYPE_TRAITS_INTRINSICS
 
     senf::Packet packet (FooPacket::create());
-    (void) packet.annotation<InvalidAnnotation>();
+    senf::IGNORE( packet.annotation<InvalidAnnotation>() );
 
 #   else
 #   endif