X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacket.test.cc;h=21362e71fb9f38c204900f5f598fdb9d18803fdd;hb=b9bc7df8121501f84f5a48e854ebaa4984a44932;hp=4dbe32925f11dee96155ecf917dbca2f01c81b16;hpb=35e271d6c345505475a8cd2654950edd9060e712;p=senf.git

diff --git a/senf/Packets/Packet.test.cc b/senf/Packets/Packet.test.cc
index 4dbe329..21362e7 100644
--- a/senf/Packets/Packet.test.cc
+++ b/senf/Packets/Packet.test.cc
@@ -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 );
@@ -244,7 +244,7 @@ BOOST_AUTO_UNIT_TEST(packet)
     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 };
 
@@ -281,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());
@@ -296,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);
@@ -326,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