From: tho Date: Tue, 26 Jan 2010 09:34:24 +0000 (+0000) Subject: all unit tests: replaced BOOST_AUTO_UNIT_TEST with new SENF_AUTO_UNIT_TEST macro X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git all unit tests: replaced BOOST_AUTO_UNIT_TEST with new SENF_AUTO_UNIT_TEST macro git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1550 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Examples/psi2tsModule/main.test.cc b/Examples/psi2tsModule/main.test.cc index a5239f8..782a50c 100644 --- a/Examples/psi2tsModule/main.test.cc +++ b/Examples/psi2tsModule/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/Examples/psi2tsModule/psi2ts.test.cc b/Examples/psi2tsModule/psi2ts.test.cc index b23fc83..434cf5f 100644 --- a/Examples/psi2tsModule/psi2ts.test.cc +++ b/Examples/psi2tsModule/psi2ts.test.cc @@ -58,7 +58,7 @@ bool equal_elements(InputIterator first, InputIterator last, const T& value) } -BOOST_AUTO_UNIT_TEST(one_section_to_one_transportpacket) +SENF_AUTO_UNIT_TEST(one_section_to_one_transportpacket) { senf::ppi::module::debug::ActiveSource source; senf::ppi::module::debug::PassiveSink sink; @@ -90,7 +90,7 @@ BOOST_AUTO_UNIT_TEST(one_section_to_one_transportpacket) 0xffu)); } -BOOST_AUTO_UNIT_TEST(one_section_to_two_transportpackets) +SENF_AUTO_UNIT_TEST(one_section_to_two_transportpackets) { senf::ppi::module::debug::ActiveSource source; senf::ppi::module::debug::PassiveSink sink; @@ -130,7 +130,7 @@ BOOST_AUTO_UNIT_TEST(one_section_to_two_transportpackets) 0xffu)); } -BOOST_AUTO_UNIT_TEST(many_sections_to_many_transportpackets) +SENF_AUTO_UNIT_TEST(many_sections_to_many_transportpackets) { senf::ppi::module::debug::ActiveSource source; senf::ppi::module::debug::PassiveSink sink; diff --git a/senf/PPI/ActiveFeeder.test.cc b/senf/PPI/ActiveFeeder.test.cc index 995f477..4418d55 100644 --- a/senf/PPI/ActiveFeeder.test.cc +++ b/senf/PPI/ActiveFeeder.test.cc @@ -56,7 +56,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(activeFeeder) +SENF_AUTO_UNIT_TEST(activeFeeder) { senf::PacketData::byte data[] = { 0xab }; senf::Packet p (senf::DataPacket::create(data)); diff --git a/senf/PPI/AnnotationRouter.test.cc b/senf/PPI/AnnotationRouter.test.cc index 9919d22..28de963 100644 --- a/senf/PPI/AnnotationRouter.test.cc +++ b/senf/PPI/AnnotationRouter.test.cc @@ -60,7 +60,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(annotationRouter) +SENF_AUTO_UNIT_TEST(annotationRouter) { debug::ActiveSource source; debug::PassiveSink sink1; diff --git a/senf/PPI/CloneSource.test.cc b/senf/PPI/CloneSource.test.cc index 9da9f80..a54ea31 100644 --- a/senf/PPI/CloneSource.test.cc +++ b/senf/PPI/CloneSource.test.cc @@ -38,7 +38,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(cloneSource) +SENF_AUTO_UNIT_TEST(cloneSource) { senf::PacketData::byte data[] = { 0xab }; senf::Packet p (senf::DataPacket::create(data)); diff --git a/senf/PPI/Connectors.test.cc b/senf/PPI/Connectors.test.cc index f8ed64d..0e06053 100644 --- a/senf/PPI/Connectors.test.cc +++ b/senf/PPI/Connectors.test.cc @@ -44,7 +44,7 @@ namespace debug = ppi::module::debug; // the corresponding connected module since otherwise the connectors cannot be connected anywhere // and will be unusable. -BOOST_AUTO_UNIT_TEST(connector) +SENF_AUTO_UNIT_TEST(connector) { // It doesn't matter, which type of connectors we use here since they are all based on // Connector. @@ -61,7 +61,7 @@ BOOST_AUTO_UNIT_TEST(connector) BOOST_CHECK_EQUAL( & target.input.peer(), & source.output ); } -BOOST_AUTO_UNIT_TEST(passiveConnector) +SENF_AUTO_UNIT_TEST(passiveConnector) { debug::ActiveSource source; debug::PassiveSink target; @@ -90,7 +90,7 @@ namespace { void handler() { called = true; } } -BOOST_AUTO_UNIT_TEST(activeConnector) +SENF_AUTO_UNIT_TEST(activeConnector) { debug::ActiveSource source; debug::PassiveSink target; @@ -122,7 +122,7 @@ BOOST_AUTO_UNIT_TEST(activeConnector) BOOST_CHECK_EQUAL( & source.output.peer(), & target.input ); } -BOOST_AUTO_UNIT_TEST(inputConnector) +SENF_AUTO_UNIT_TEST(inputConnector) { debug::ActiveSource source; debug::PassiveSink target; @@ -142,7 +142,7 @@ BOOST_AUTO_UNIT_TEST(inputConnector) BOOST_CHECK( target.input.empty() ); } -BOOST_AUTO_UNIT_TEST(outputConnector) +SENF_AUTO_UNIT_TEST(outputConnector) { debug::ActiveSource source; debug::PassiveSink target; @@ -179,7 +179,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(passiveInput) +SENF_AUTO_UNIT_TEST(passiveInput) { debug::ActiveSource source; PassiveInputTest target; @@ -222,7 +222,7 @@ BOOST_AUTO_UNIT_TEST(passiveInput) BOOST_CHECK( ! target.input.throttled() ); } -BOOST_AUTO_UNIT_TEST(passiveOutput) +SENF_AUTO_UNIT_TEST(passiveOutput) { debug::PassiveSource source; debug::ActiveSink target; @@ -243,7 +243,7 @@ BOOST_AUTO_UNIT_TEST(passiveOutput) // connect() is tested indirectly via ppi::connect } -BOOST_AUTO_UNIT_TEST(activeInput) +SENF_AUTO_UNIT_TEST(activeInput) { debug::PassiveSource source; debug::ActiveSink target; @@ -268,7 +268,7 @@ BOOST_AUTO_UNIT_TEST(activeInput) BOOST_CHECK( target.request() == p ); } -BOOST_AUTO_UNIT_TEST(activeOutput) +SENF_AUTO_UNIT_TEST(activeOutput) { debug::ActiveSource source; debug::PassiveSink target; @@ -362,7 +362,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(typedInput) +SENF_AUTO_UNIT_TEST(typedInput) { debug::ActiveSource source; TypedPassiveInput<> target; @@ -374,7 +374,7 @@ BOOST_AUTO_UNIT_TEST(typedInput) source.submit(p); } -BOOST_AUTO_UNIT_TEST(tyepdOutput) +SENF_AUTO_UNIT_TEST(tyepdOutput) { TypedPassiveOutput<> source; debug::ActiveSink target; @@ -385,7 +385,7 @@ BOOST_AUTO_UNIT_TEST(tyepdOutput) (void) target.request(); } -BOOST_AUTO_UNIT_TEST(connectorTest) +SENF_AUTO_UNIT_TEST(connectorTest) { { TypedPassiveInput<> input; @@ -421,7 +421,7 @@ BOOST_AUTO_UNIT_TEST(connectorTest) } } -BOOST_AUTO_UNIT_TEST(delayedConnect) +SENF_AUTO_UNIT_TEST(delayedConnect) { { debug::PassiveSource source; @@ -501,7 +501,7 @@ BOOST_AUTO_UNIT_TEST(delayedConnect) } } -BOOST_AUTO_UNIT_TEST(disconnect) +SENF_AUTO_UNIT_TEST(disconnect) { { debug::PassiveSource source; diff --git a/senf/PPI/DebugEvent.test.cc b/senf/PPI/DebugEvent.test.cc index 987cfae..a46e176 100644 --- a/senf/PPI/DebugEvent.test.cc +++ b/senf/PPI/DebugEvent.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(debugEvent) +SENF_AUTO_UNIT_TEST(debugEvent) { // Tested in Module.test.cc } diff --git a/senf/PPI/DebugModules.test.cc b/senf/PPI/DebugModules.test.cc index ebdc568..cda1687 100644 --- a/senf/PPI/DebugModules.test.cc +++ b/senf/PPI/DebugModules.test.cc @@ -45,7 +45,7 @@ namespace debug = senf::ppi::module::debug; namespace ppi = senf::ppi; -BOOST_AUTO_UNIT_TEST(debugModules) +SENF_AUTO_UNIT_TEST(debugModules) { { debug::ActiveSource source; @@ -95,7 +95,7 @@ BOOST_AUTO_UNIT_TEST(debugModules) } } -BOOST_AUTO_UNIT_TEST(activeFeederSource) +SENF_AUTO_UNIT_TEST(activeFeederSource) { debug::ActiveFeederSource source; debug::PassiveSink sink; @@ -109,7 +109,7 @@ BOOST_AUTO_UNIT_TEST(activeFeederSource) BOOST_CHECK_EQUAL( sink.size(), 1u ); } -BOOST_AUTO_UNIT_TEST(activeFeederSink) +SENF_AUTO_UNIT_TEST(activeFeederSink) { debug::PassiveSource source; debug::ActiveFeederSink sink; @@ -128,7 +128,7 @@ BOOST_AUTO_UNIT_TEST(activeFeederSink) BOOST_CHECK( source.empty() ); } -BOOST_AUTO_UNIT_TEST(logSink) +SENF_AUTO_UNIT_TEST(logSink) { senf::log::StringTarget logTarget; logTarget.route(); diff --git a/senf/PPI/DiscardSink.test.cc b/senf/PPI/DiscardSink.test.cc index 5e32f96..c57664b 100644 --- a/senf/PPI/DiscardSink.test.cc +++ b/senf/PPI/DiscardSink.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(discardSink) +SENF_AUTO_UNIT_TEST(discardSink) { // here we really can just validate that everything compiles ... diff --git a/senf/PPI/Duplicators.test.cc b/senf/PPI/Duplicators.test.cc index ed8701f..ade8028 100644 --- a/senf/PPI/Duplicators.test.cc +++ b/senf/PPI/Duplicators.test.cc @@ -43,7 +43,7 @@ namespace connector = ppi::connector; namespace module = ppi::module; namespace debug = module::debug; -BOOST_AUTO_UNIT_TEST(activeDuplicator) +SENF_AUTO_UNIT_TEST(activeDuplicator) { debug::ActiveSource source; module::ActiveDuplicator duplicator; diff --git a/senf/PPI/EventManager.test.cc b/senf/PPI/EventManager.test.cc index d0e1f22..7a4d07b 100644 --- a/senf/PPI/EventManager.test.cc +++ b/senf/PPI/EventManager.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(eventManager) +SENF_AUTO_UNIT_TEST(eventManager) { // Tested indirectly by Route.test.cc and Module.test.cc } diff --git a/senf/PPI/Events.test.cc b/senf/PPI/Events.test.cc index f090864..d07660a 100644 --- a/senf/PPI/Events.test.cc +++ b/senf/PPI/Events.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(events) +SENF_AUTO_UNIT_TEST(events) { // Tested in Route.test.cc } diff --git a/senf/PPI/IOEvent.test.cc b/senf/PPI/IOEvent.test.cc index 35bc6ac..cb7b654 100644 --- a/senf/PPI/IOEvent.test.cc +++ b/senf/PPI/IOEvent.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(ioEvent) +SENF_AUTO_UNIT_TEST(ioEvent) { // Tested in SocketSource.test.cc and SocketSink.test.cc } diff --git a/senf/PPI/IdleEvent.test.cc b/senf/PPI/IdleEvent.test.cc index 0996541..443e29d 100644 --- a/senf/PPI/IdleEvent.test.cc +++ b/senf/PPI/IdleEvent.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(idleEvent) +SENF_AUTO_UNIT_TEST(idleEvent) { // Tested by ActiveFeeder.test.cc } diff --git a/senf/PPI/IntervalTimer.test.cc b/senf/PPI/IntervalTimer.test.cc index 7dd31d6..66c0da6 100644 --- a/senf/PPI/IntervalTimer.test.cc +++ b/senf/PPI/IntervalTimer.test.cc @@ -71,7 +71,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(intervalTimer) +SENF_AUTO_UNIT_TEST(intervalTimer) { char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS")); BOOST_WARN_MESSAGE(enabled, "Set SENF_TIMING_CRITICAL_TESTS to not skip timing critical tests"); diff --git a/senf/PPI/Jack.test.cc b/senf/PPI/Jack.test.cc index 93734b5..828a965 100644 --- a/senf/PPI/Jack.test.cc +++ b/senf/PPI/Jack.test.cc @@ -111,7 +111,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(jacks) +SENF_AUTO_UNIT_TEST(jacks) { { ActiveGroup group; diff --git a/senf/PPI/Joins.test.cc b/senf/PPI/Joins.test.cc index 772a761..89ce8a8 100644 --- a/senf/PPI/Joins.test.cc +++ b/senf/PPI/Joins.test.cc @@ -52,7 +52,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(passiveJoin) +SENF_AUTO_UNIT_TEST(passiveJoin) { debug::ActiveSource source1; debug::ActiveSource source2; @@ -89,7 +89,7 @@ BOOST_AUTO_UNIT_TEST(passiveJoin) BOOST_CHECK_EQUAL( join.connectors().size(), 2u); } -BOOST_AUTO_UNIT_TEST(priorityJoin) +SENF_AUTO_UNIT_TEST(priorityJoin) { debug::PassiveSource source1; debug::PassiveSource source2; diff --git a/senf/PPI/Module.test.cc b/senf/PPI/Module.test.cc index bc72b70..537970a 100644 --- a/senf/PPI/Module.test.cc +++ b/senf/PPI/Module.test.cc @@ -68,7 +68,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(module) +SENF_AUTO_UNIT_TEST(module) { // route and registerEvent are tested in Route.test.cc @@ -111,7 +111,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(delayedInit) +SENF_AUTO_UNIT_TEST(delayedInit) { MakeInit maker; senf::scheduler::TimerEvent timer ( diff --git a/senf/PPI/ModuleManager.test.cc b/senf/PPI/ModuleManager.test.cc index 20c5080..60fe353 100644 --- a/senf/PPI/ModuleManager.test.cc +++ b/senf/PPI/ModuleManager.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(moduleManager) +SENF_AUTO_UNIT_TEST(moduleManager) { // Tested in Module.test.cc } diff --git a/senf/PPI/MonitorModule.test.cc b/senf/PPI/MonitorModule.test.cc index ab9ce99..74a3246 100644 --- a/senf/PPI/MonitorModule.test.cc +++ b/senf/PPI/MonitorModule.test.cc @@ -49,7 +49,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(monitorModulePassthrough) +SENF_AUTO_UNIT_TEST(monitorModulePassthrough) { senf::ppi::module::debug::ActiveSource source; senf::ppi::module::debug::PassiveSink sink; @@ -73,7 +73,7 @@ BOOST_AUTO_UNIT_TEST(monitorModulePassthrough) BOOST_CHECK( source ); } -BOOST_AUTO_UNIT_TEST(monitorModuleNoPassthrough) +SENF_AUTO_UNIT_TEST(monitorModuleNoPassthrough) { senf::ppi::module::debug::ActiveSource source; PacketCounter counter; @@ -90,7 +90,7 @@ BOOST_AUTO_UNIT_TEST(monitorModuleNoPassthrough) BOOST_CHECK( source ); } -BOOST_AUTO_UNIT_TEST(monitorModuleDynamicConnect) +SENF_AUTO_UNIT_TEST(monitorModuleDynamicConnect) { senf::ppi::module::debug::ActiveSource source; PacketCounter counter; diff --git a/senf/PPI/MultiConnectorMixin.test.cc b/senf/PPI/MultiConnectorMixin.test.cc index 841dac1..eac542c 100644 --- a/senf/PPI/MultiConnectorMixin.test.cc +++ b/senf/PPI/MultiConnectorMixin.test.cc @@ -141,7 +141,7 @@ namespace { { os << value.value; return os; } } -BOOST_AUTO_UNIT_TEST(multiConnectorMixin_sequenceContainer) +SENF_AUTO_UNIT_TEST(multiConnectorMixin_sequenceContainer) { debug::ActiveSource source1; debug::ActiveSource source2; @@ -169,7 +169,7 @@ BOOST_AUTO_UNIT_TEST(multiConnectorMixin_sequenceContainer) BOOST_CHECK_EQUAL( module.count, 1u ); } -BOOST_AUTO_UNIT_TEST(multiConnectorMixin_userContainer) +SENF_AUTO_UNIT_TEST(multiConnectorMixin_userContainer) { debug::ActiveSource source; UserContainerModule module; @@ -194,7 +194,7 @@ BOOST_AUTO_UNIT_TEST(multiConnectorMixin_userContainer) BOOST_CHECK_EQUAL( module.connectors().size(), 1u ); } -BOOST_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules) +SENF_AUTO_UNIT_TEST(multiConnectorMixin_multipleModules) { debug::ActiveSource source; debug::PassiveSink sink; diff --git a/senf/PPI/PassiveQueue.test.cc b/senf/PPI/PassiveQueue.test.cc index 232b63d..6611970 100644 --- a/senf/PPI/PassiveQueue.test.cc +++ b/senf/PPI/PassiveQueue.test.cc @@ -43,7 +43,7 @@ namespace connector = ppi::connector; namespace module = ppi::module; namespace debug = module::debug; -BOOST_AUTO_UNIT_TEST(passiveQueue) +SENF_AUTO_UNIT_TEST(passiveQueue) { debug::ActiveSource source; module::PassiveQueue queue; diff --git a/senf/PPI/Queueing.test.cc b/senf/PPI/Queueing.test.cc index eab8d66..3c10045 100644 --- a/senf/PPI/Queueing.test.cc +++ b/senf/PPI/Queueing.test.cc @@ -69,7 +69,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(thresholdQueueing) +SENF_AUTO_UNIT_TEST(thresholdQueueing) { debug::ActiveSource source; QueueTester tester; diff --git a/senf/PPI/RateAnalyzer.test.cc b/senf/PPI/RateAnalyzer.test.cc index fbc1d50..27caa4d 100644 --- a/senf/PPI/RateAnalyzer.test.cc +++ b/senf/PPI/RateAnalyzer.test.cc @@ -72,7 +72,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(rateAnalyzer) +SENF_AUTO_UNIT_TEST(rateAnalyzer) { char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS")); if (! enabled) { diff --git a/senf/PPI/RateFilter.test.cc b/senf/PPI/RateFilter.test.cc index 6557c07..2f8e1bd 100644 --- a/senf/PPI/RateFilter.test.cc +++ b/senf/PPI/RateFilter.test.cc @@ -44,7 +44,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(rateFilter) +SENF_AUTO_UNIT_TEST(rateFilter) { module::RateFilter rateFilter ( senf::ClockService::milliseconds(100) ); debug::PassiveSource source; @@ -80,7 +80,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(rateFilter_changeInterval) +SENF_AUTO_UNIT_TEST(rateFilter_changeInterval) { char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS")); if (! enabled) { diff --git a/senf/PPI/Route.test.cc b/senf/PPI/Route.test.cc index f798e4f..6130159 100644 --- a/senf/PPI/Route.test.cc +++ b/senf/PPI/Route.test.cc @@ -109,7 +109,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(route) +SENF_AUTO_UNIT_TEST(route) { debug::PassiveSource passiveSource; debug::ActiveSource activeSource; @@ -214,7 +214,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(connect_runtime) +SENF_AUTO_UNIT_TEST(connect_runtime) { TestSink sink; module::ActiveFeeder feeder; diff --git a/senf/PPI/Setup.test.cc b/senf/PPI/Setup.test.cc index ea12ce4..f8975da 100644 --- a/senf/PPI/Setup.test.cc +++ b/senf/PPI/Setup.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(setup) +SENF_AUTO_UNIT_TEST(setup) { // Tested in nearly all other modules ... } diff --git a/senf/PPI/SocketSink.test.cc b/senf/PPI/SocketSink.test.cc index 3f424fa..c732086 100644 --- a/senf/PPI/SocketSink.test.cc +++ b/senf/PPI/SocketSink.test.cc @@ -68,7 +68,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(passiveSocketSink) +SENF_AUTO_UNIT_TEST(passiveSocketSink) { senf::ConnectedUDPv4ClientSocketHandle outputSocket ( senf::INet4SocketAddress(localhost4str(0))); @@ -88,7 +88,7 @@ BOOST_AUTO_UNIT_TEST(passiveSocketSink) BOOST_CHECK_EQUAL( data, input ); } -BOOST_AUTO_UNIT_TEST(activeSocketSink) +SENF_AUTO_UNIT_TEST(activeSocketSink) { senf::ConnectedUDPv4ClientSocketHandle outputSocket ( senf::INet4SocketAddress(localhost4str(0))); diff --git a/senf/PPI/SocketSource.test.cc b/senf/PPI/SocketSource.test.cc index 7daad72..0b207c4 100644 --- a/senf/PPI/SocketSource.test.cc +++ b/senf/PPI/SocketSource.test.cc @@ -68,7 +68,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(socketSource) +SENF_AUTO_UNIT_TEST(socketSource) { senf::UDPv4ClientSocketHandle inputSocket; inputSocket.bind(senf::INet4SocketAddress(localhost4str(0))); diff --git a/senf/PPI/ThrottleBarrier.test.cc b/senf/PPI/ThrottleBarrier.test.cc index ad66dd7..18edff7 100644 --- a/senf/PPI/ThrottleBarrier.test.cc +++ b/senf/PPI/ThrottleBarrier.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(throttleBarrier) +SENF_AUTO_UNIT_TEST(throttleBarrier) { senf::ppi::module::debug::ActiveSource source; senf::ppi::module::ThrottleBarrier barrier; diff --git a/senf/PPI/main.test.cc b/senf/PPI/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/PPI/main.test.cc +++ b/senf/PPI/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Packets/80211Bundle/RadiotapPacket.test.cc b/senf/Packets/80211Bundle/RadiotapPacket.test.cc index 57da0d3..0ebcdf1 100644 --- a/senf/Packets/80211Bundle/RadiotapPacket.test.cc +++ b/senf/Packets/80211Bundle/RadiotapPacket.test.cc @@ -30,7 +30,7 @@ #include ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(RadiotapPacket_packet) +SENF_AUTO_UNIT_TEST(RadiotapPacket_packet) { /* used madwifi 0.9.4 */ unsigned char data[] = { @@ -99,7 +99,7 @@ BOOST_AUTO_UNIT_TEST(RadiotapPacket_packet) SENF_CHECK_NO_THROW( p.dump( oss)); } -BOOST_AUTO_UNIT_TEST(RadiotapPacket_create) +SENF_AUTO_UNIT_TEST(RadiotapPacket_create) { unsigned char data[] = { 0x00 ,0x00 ,0x1a ,0x00, 0x6f, 0x18, 0x00, 0x00, @@ -155,7 +155,7 @@ BOOST_AUTO_UNIT_TEST(RadiotapPacket_create) data, data+sizeof(data)/sizeof(data[0]) ); } -BOOST_AUTO_UNIT_TEST(RadiotapPacket_packet_ath9k) +SENF_AUTO_UNIT_TEST(RadiotapPacket_packet_ath9k) { /* radiotap packet from ath9k with atheros card*/ unsigned char data[] = { diff --git a/senf/Packets/80211Bundle/WLANBeaconPacket.test.cc b/senf/Packets/80211Bundle/WLANBeaconPacket.test.cc index a49709f..8c8d8fd 100644 --- a/senf/Packets/80211Bundle/WLANBeaconPacket.test.cc +++ b/senf/Packets/80211Bundle/WLANBeaconPacket.test.cc @@ -32,7 +32,7 @@ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(WLANBeaconPacket_parse) +SENF_AUTO_UNIT_TEST(WLANBeaconPacket_parse) { unsigned char data[] = { 0x3a, 0x30, 0xaa, 0x4c, 0x9c, 0x00, 0x00, 0x00, //timestamp @@ -92,7 +92,7 @@ BOOST_AUTO_UNIT_TEST(WLANBeaconPacket_parse) SENF_CHECK_NO_THROW( p.dump( oss )); } -BOOST_AUTO_UNIT_TEST(WLANBeaconPacket_create) +SENF_AUTO_UNIT_TEST(WLANBeaconPacket_create) { senf::WLANBeaconPacket p (senf::WLANBeaconPacket::create()); p->timestamp() << 0x0000009C4CAA303AuLL; diff --git a/senf/Packets/80211Bundle/WLANPacket.test.cc b/senf/Packets/80211Bundle/WLANPacket.test.cc index 36a1c3c..9a99389 100644 --- a/senf/Packets/80211Bundle/WLANPacket.test.cc +++ b/senf/Packets/80211Bundle/WLANPacket.test.cc @@ -31,7 +31,7 @@ ///////////////////////////////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 @@ -81,7 +81,7 @@ 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()); @@ -91,7 +91,7 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_create) /* 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, @@ -143,7 +143,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()); @@ -162,7 +162,7 @@ BOOST_AUTO_UNIT_TEST(WLANPacket_mgtFrame_create) /* 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, @@ -191,7 +191,7 @@ 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"); diff --git a/senf/Packets/80211Bundle/main.test.cc b/senf/Packets/80211Bundle/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Packets/80211Bundle/main.test.cc +++ b/senf/Packets/80211Bundle/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Packets/80221Bundle/MIHPacket.test.cc b/senf/Packets/80221Bundle/MIHPacket.test.cc index 2227b30..cd99702 100644 --- a/senf/Packets/80221Bundle/MIHPacket.test.cc +++ b/senf/Packets/80221Bundle/MIHPacket.test.cc @@ -37,7 +37,7 @@ ///////////////////////////////cc.p//////////////////////////////////////// using namespace senf; -BOOST_AUTO_UNIT_TEST(MIHPacket_msgId) +SENF_AUTO_UNIT_TEST(MIHPacket_msgId) { MIHPacket mihPacket (MIHPacket::create()); mihPacket->sid() = 4; @@ -46,7 +46,7 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_msgId) BOOST_CHECK_EQUAL( mihPacket->messageId(), 0x4c2a ); } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_eth) +SENF_AUTO_UNIT_TEST(MIHPacket_create_eth) { EthernetPacket eth (EthernetPacket::create()); MIHPacket mihPacket (MIHPacket::createAfter(eth)); @@ -56,7 +56,7 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_create_eth) SENF_CHECK_NO_THROW( eth.dump( oss)); } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_string) +SENF_AUTO_UNIT_TEST(MIHPacket_create_string) { MIHPacket mihPacket (MIHPacket::create()); // set some fields @@ -118,7 +118,7 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_create_string) } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_mac) +SENF_AUTO_UNIT_TEST(MIHPacket_create_mac) { MACAddress srcMac ( MACAddress::from_string("01:02:03:04:05:06")); MACAddress dstMac ( MACAddress::from_string("07:08:09:0a:0b:0c")); @@ -151,7 +151,7 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_create_mac) } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_inet4) +SENF_AUTO_UNIT_TEST(MIHPacket_create_inet4) { MIHPacket mihPacket (MIHPacket::create()); // set some fields @@ -184,7 +184,7 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_create_inet4) } -BOOST_AUTO_UNIT_TEST(MIHPacket_create_inet6) +SENF_AUTO_UNIT_TEST(MIHPacket_create_inet6) { MIHPacket mihPacket (MIHPacket::create()); // set some fields @@ -225,7 +225,7 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_create_inet6) } -BOOST_AUTO_UNIT_TEST(MIHPayload_parse) +SENF_AUTO_UNIT_TEST(MIHPayload_parse) { unsigned char data[] = { // MIH header @@ -275,7 +275,7 @@ BOOST_AUTO_UNIT_TEST(MIHPayload_parse) } -BOOST_AUTO_UNIT_TEST(MIHPayload_create) +SENF_AUTO_UNIT_TEST(MIHPayload_create) { MIHPacket mihPacket (MIHPacket::create()); mihPacket->fragmentNr() = 42; diff --git a/senf/Packets/80221Bundle/MIHTypes.test.cc b/senf/Packets/80221Bundle/MIHTypes.test.cc index 4f2c71d..e20d966 100644 --- a/senf/Packets/80221Bundle/MIHTypes.test.cc +++ b/senf/Packets/80221Bundle/MIHTypes.test.cc @@ -36,7 +36,7 @@ ///////////////////////////////cc.p//////////////////////////////////////// using namespace senf; -BOOST_AUTO_UNIT_TEST(mihfId) +SENF_AUTO_UNIT_TEST(mihfId) { MIHFId id ( MACAddress::from_string("01:02:03:04:05:06")); BOOST_CHECK_EQUAL( id.type(), MIHFId::MACAddress); diff --git a/senf/Packets/80221Bundle/TLVParser.test.cc b/senf/Packets/80221Bundle/TLVParser.test.cc index 2c213c4..9c6d2c9 100644 --- a/senf/Packets/80221Bundle/TLVParser.test.cc +++ b/senf/Packets/80221Bundle/TLVParser.test.cc @@ -56,7 +56,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_simple_length) +SENF_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_simple_length) { PacketInterpreterBase::byte data[] = { 0x01, // type @@ -69,7 +69,7 @@ BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_simple_length) } -BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_extended_length) +SENF_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_extended_length) { PacketInterpreterBase::byte data[] = { 0x01, // type @@ -96,7 +96,7 @@ BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_parse_with_extended_length) } -BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_simple_length) +SENF_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_simple_length) { PacketInterpreterBase::byte value[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 @@ -120,7 +120,7 @@ BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_simple_length) } -BOOST_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_extended_length) +SENF_AUTO_UNIT_TEST(MIHGenericTLVParser_create_with_extended_length) { PacketInterpreterBase::byte value[255]; for (unsigned i=0; i::create( senf::PacketInterpreterBase::size_type(2u))); @@ -194,7 +194,7 @@ namespace { typedef ConcretePacket TestMacAddressTLVPacket; } -BOOST_AUTO_UNIT_TEST(TestMacAddressTLVPacket_create) +SENF_AUTO_UNIT_TEST(TestMacAddressTLVPacket_create) { TestMacAddressTLVPacket tlvPacket (TestMacAddressTLVPacket::create()); tlvPacket->type() = 42; diff --git a/senf/Packets/80221Bundle/main.test.cc b/senf/Packets/80221Bundle/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Packets/80221Bundle/main.test.cc +++ b/senf/Packets/80221Bundle/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Packets/ArrayParser.test.cc b/senf/Packets/ArrayParser.test.cc index 7d12add..c7e6829 100644 --- a/senf/Packets/ArrayParser.test.cc +++ b/senf/Packets/ArrayParser.test.cc @@ -63,7 +63,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(ArrayParser_test) +SENF_AUTO_UNIT_TEST(ArrayParser_test) { senf::PacketParserBase::byte data[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 }; senf::PacketInterpreterBase::ptr p (senf::PacketInterpreter::create(data)); diff --git a/senf/Packets/AuxParser.test.cc b/senf/Packets/AuxParser.test.cc index 4aa28d5..183ff89 100644 --- a/senf/Packets/AuxParser.test.cc +++ b/senf/Packets/AuxParser.test.cc @@ -37,7 +37,7 @@ // The other aux policies are tested with the corresponding container classes -BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy) +SENF_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy) { unsigned char data[] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25 }; @@ -74,7 +74,7 @@ BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy) } } -BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy_transformed) +SENF_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy_transformed) { unsigned char data[] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25 }; @@ -119,7 +119,7 @@ BOOST_AUTO_UNIT_TEST(vectorPacketSizeAuxPolicy_transformed) } } -BOOST_AUTO_UNIT_TEST(listPacketSizeAuxPolicy) +SENF_AUTO_UNIT_TEST(listPacketSizeAuxPolicy) { unsigned char data[] = { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25 }; diff --git a/senf/Packets/DefaultBundle/EthernetPacket.test.cc b/senf/Packets/DefaultBundle/EthernetPacket.test.cc index 5ddae82..df66a5d 100644 --- a/senf/Packets/DefaultBundle/EthernetPacket.test.cc +++ b/senf/Packets/DefaultBundle/EthernetPacket.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(ethernetPacket_parse) +SENF_AUTO_UNIT_TEST(ethernetPacket_parse) { senf::PacketData::byte data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, // destination MAC @@ -54,7 +54,7 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_parse) SENF_CHECK_NO_THROW( p.dump( oss)); } -BOOST_AUTO_UNIT_TEST(ethernetPacket_parse_chain) +SENF_AUTO_UNIT_TEST(ethernetPacket_parse_chain) { unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, // destination MAC @@ -76,7 +76,7 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_parse_chain) BOOST_CHECK_EQUAL( *v.next().data().begin(), 0xf0 ); } -BOOST_AUTO_UNIT_TEST(ethernetPacket_create) +SENF_AUTO_UNIT_TEST(ethernetPacket_create) { senf::EthernetPacket eth (senf::EthernetPacket::create()); eth->source() = senf::MACAddress::from_string("01:02:03:04:05:06"); @@ -96,7 +96,7 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_create) BOOST_CHECK_EQUAL(vlan->type(), 0x0800u); } -BOOST_AUTO_UNIT_TEST(ethernetPacket_llcsnap) +SENF_AUTO_UNIT_TEST(ethernetPacket_llcsnap) { senf::EthernetPacket eth (senf::EthernetPacket::create()); eth->source() = senf::MACAddress::from_string("01:02:03:04:05:06"); diff --git a/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc b/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc index 0d288d1..695ccae 100644 --- a/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc +++ b/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc @@ -33,7 +33,7 @@ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(ICMPv6Packet_packet) +SENF_AUTO_UNIT_TEST(ICMPv6Packet_packet) { unsigned char dataListenerReport[] = { 0x8f, 0x00, 0x8d, 0x54, 0x00, 0x00, 0x00, 0x01, @@ -159,7 +159,7 @@ BOOST_AUTO_UNIT_TEST(ICMPv6Packet_packet) } -BOOST_AUTO_UNIT_TEST(ICMPv6Packet_create) +SENF_AUTO_UNIT_TEST(ICMPv6Packet_create) { std::ostringstream oss (std::ostringstream::out); diff --git a/senf/Packets/DefaultBundle/IPv4Packet.test.cc b/senf/Packets/DefaultBundle/IPv4Packet.test.cc index 87bb251..2447f5b 100644 --- a/senf/Packets/DefaultBundle/IPv4Packet.test.cc +++ b/senf/Packets/DefaultBundle/IPv4Packet.test.cc @@ -38,7 +38,7 @@ using namespace senf; -BOOST_AUTO_UNIT_TEST(ipV4Packet_parse) +SENF_AUTO_UNIT_TEST(ipV4Packet_parse) { unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, @@ -66,7 +66,7 @@ BOOST_AUTO_UNIT_TEST(ipV4Packet_parse) SENF_CHECK_NO_THROW( p.dump( oss)); } -BOOST_AUTO_UNIT_TEST(ipV4Packet_create) +SENF_AUTO_UNIT_TEST(ipV4Packet_create) { senf::IPv4Packet ip (senf::IPv4Packet::create()); diff --git a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc index c25f389..7b6791c 100644 --- a/senf/Packets/DefaultBundle/IPv6Extensions.test.cc +++ b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc @@ -41,7 +41,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(ipv6Extensions_fragment) +SENF_AUTO_UNIT_TEST(ipv6Extensions_fragment) { // Just for the fun of it, we test a nice chain: A fragment of a fragmented UDP packet unsigned char Fragment_packetData[] = { @@ -104,7 +104,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_fragment) } -BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing) +SENF_AUTO_UNIT_TEST(ipv6Extensions_routing) { unsigned char Routing_packetData[] = { // IP header @@ -161,7 +161,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_routing) } -BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse) +SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse) { unsigned char HopByHop_packetData[] = { 0x60, 0x00, 0x00, 0x00, // IP version, class, flow label @@ -224,7 +224,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse) } -BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create) +SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create) { std::ostringstream oss (std::ostringstream::out); unsigned char HopByHop_packetData[] = { @@ -328,7 +328,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN) +SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN) { senf::IPv6HopByHopOptionsPacket p ( senf::IPv6HopByHopOptionsPacket::create() ); p->nextHeader() = 0x3a; @@ -354,7 +354,7 @@ BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_create_SN) } -BOOST_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse_SN) +SENF_AUTO_UNIT_TEST(ipv6Extensions_hopByHop_parse_SN) { unsigned char data[] = { 0x3a, 0x01, // Hop-By-Hop Header (nextHeader, length) diff --git a/senf/Packets/DefaultBundle/IPv6Packet.test.cc b/senf/Packets/DefaultBundle/IPv6Packet.test.cc index c2a35bf..53a6afc 100644 --- a/senf/Packets/DefaultBundle/IPv6Packet.test.cc +++ b/senf/Packets/DefaultBundle/IPv6Packet.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(ipV6Packet_parse) +SENF_AUTO_UNIT_TEST(ipV6Packet_parse) { unsigned char data[] = { 0x60, 0x12, 0x20, 0x30, @@ -70,7 +70,7 @@ BOOST_AUTO_UNIT_TEST(ipV6Packet_parse) SENF_CHECK_NO_THROW( p.dump( oss)); } -BOOST_AUTO_UNIT_TEST(ipV6Packet_create) +SENF_AUTO_UNIT_TEST(ipV6Packet_create) { senf::IPv6Packet ip (senf::IPv6Packet::create()); diff --git a/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc b/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc index 4989c31..d2a7cf1 100644 --- a/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc +++ b/senf/Packets/DefaultBundle/ListOptionTypeParser.test.cc @@ -50,7 +50,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(ListOptionTypeParser) +SENF_AUTO_UNIT_TEST(ListOptionTypeParser) { senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter::create( OptionParser::init_bytes)); @@ -75,7 +75,7 @@ BOOST_AUTO_UNIT_TEST(ListOptionTypeParser) BOOST_CHECK_EQUAL( p.list().empty(), false ); } -BOOST_AUTO_UNIT_TEST(ListOptionTypeParser_container) +SENF_AUTO_UNIT_TEST(ListOptionTypeParser_container) { senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter::create( OptionParser::init_bytes)); diff --git a/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc b/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc index bcebcb8..7d38335 100644 --- a/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc +++ b/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(llcsnap_parse) +SENF_AUTO_UNIT_TEST(llcsnap_parse) { senf::PacketData::byte data[] = { 0xaa, // DSAP @@ -57,7 +57,7 @@ BOOST_AUTO_UNIT_TEST(llcsnap_parse) SENF_CHECK_NO_THROW( p.dump( oss)); } -BOOST_AUTO_UNIT_TEST(llcSnapPacket_ethernet) +SENF_AUTO_UNIT_TEST(llcSnapPacket_ethernet) { senf::LlcSnapPacket llcsnap (senf::LlcSnapPacket::create()); senf::EthernetPacket eth (senf::EthernetPacket::createAfter(llcsnap)); diff --git a/senf/Packets/DefaultBundle/Mldv2Packet.test.cc b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc index e1451fe..4449d13 100644 --- a/senf/Packets/DefaultBundle/Mldv2Packet.test.cc +++ b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc @@ -32,7 +32,7 @@ #include -BOOST_AUTO_UNIT_TEST(ICMPv6_MLDv2_Packet_packet) +SENF_AUTO_UNIT_TEST(ICMPv6_MLDv2_Packet_packet) { unsigned char data[] = { 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00, diff --git a/senf/Packets/DefaultBundle/RTPPacket.test.cc b/senf/Packets/DefaultBundle/RTPPacket.test.cc index 9598a03..5379473 100644 --- a/senf/Packets/DefaultBundle/RTPPacket.test.cc +++ b/senf/Packets/DefaultBundle/RTPPacket.test.cc @@ -30,7 +30,7 @@ #include -BOOST_AUTO_UNIT_TEST(RTPPacket_packet) +SENF_AUTO_UNIT_TEST(RTPPacket_packet) { unsigned char data[] = {0x80 , 0x08 , 0x1b , 0xbb , 0x02 , 0xcb , 0xad , 0x80 , 0x50 , 0x48 , 0xa7, 0x8c }; diff --git a/senf/Packets/DefaultBundle/TCPPacket.test.cc b/senf/Packets/DefaultBundle/TCPPacket.test.cc index 99cc2bb..70afb0c 100644 --- a/senf/Packets/DefaultBundle/TCPPacket.test.cc +++ b/senf/Packets/DefaultBundle/TCPPacket.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(tcpPacket_parse) +SENF_AUTO_UNIT_TEST(tcpPacket_parse) { unsigned char data[] = { @@ -66,7 +66,7 @@ BOOST_AUTO_UNIT_TEST(tcpPacket_parse) SENF_CHECK_NO_THROW( p.dump( oss)); } -BOOST_AUTO_UNIT_TEST(tcpPacket_in_ipv4_parse) +SENF_AUTO_UNIT_TEST(tcpPacket_in_ipv4_parse) { unsigned char data[] = { //20 Byte IPv4-Header @@ -100,7 +100,7 @@ BOOST_AUTO_UNIT_TEST(tcpPacket_in_ipv4_parse) } -BOOST_AUTO_UNIT_TEST(tcpPacket_in_ipv6_parse) +SENF_AUTO_UNIT_TEST(tcpPacket_in_ipv6_parse) { unsigned char data[] = { // IPv6-Header @@ -136,7 +136,7 @@ BOOST_AUTO_UNIT_TEST(tcpPacket_in_ipv6_parse) BOOST_CHECK( tcp->validateChecksum() ); } -BOOST_AUTO_UNIT_TEST(tcpPacket_in_ipv6_create) +SENF_AUTO_UNIT_TEST(tcpPacket_in_ipv6_create) { unsigned char data[] = { // IPv6-Header diff --git a/senf/Packets/DefaultBundle/UDPPacket.test.cc b/senf/Packets/DefaultBundle/UDPPacket.test.cc index b8925b2..12c5171 100644 --- a/senf/Packets/DefaultBundle/UDPPacket.test.cc +++ b/senf/Packets/DefaultBundle/UDPPacket.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(udpPacket_parse) +SENF_AUTO_UNIT_TEST(udpPacket_parse) { unsigned char data[] = { @@ -55,7 +55,7 @@ BOOST_AUTO_UNIT_TEST(udpPacket_parse) SENF_CHECK_NO_THROW( p.dump( oss)); } -BOOST_AUTO_UNIT_TEST(udpPacket_in_ipv4_create) +SENF_AUTO_UNIT_TEST(udpPacket_in_ipv4_create) { unsigned char data[] = { 0x45, 0x00, 0x00, 0x26, 0x00, 0x00, 0x40, 0x00, @@ -86,7 +86,7 @@ BOOST_AUTO_UNIT_TEST(udpPacket_in_ipv4_create) BOOST_CHECK( udp->validateChecksum() ); } -BOOST_AUTO_UNIT_TEST(udpPacket_in_ipv6_parse) +SENF_AUTO_UNIT_TEST(udpPacket_in_ipv6_parse) { // captured udp packet generated with mgen send over ipv6 unsigned char data[] = { diff --git a/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc b/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc index 4cdf0e8..9d4f7d8 100644 --- a/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc +++ b/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(packetLink) +SENF_AUTO_UNIT_TEST(packetLink) { // This test shall test, whether referencing a packet (in this case IPv6Packet) as template // argument correctly includes the corresponding object file when linking diff --git a/senf/Packets/DefaultBundle/extra_tests/main.test.cc b/senf/Packets/DefaultBundle/extra_tests/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Packets/DefaultBundle/extra_tests/main.test.cc +++ b/senf/Packets/DefaultBundle/extra_tests/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Packets/DefaultBundle/main.test.cc b/senf/Packets/DefaultBundle/main.test.cc index c44a8c0..dc35e39 100644 --- a/senf/Packets/DefaultBundle/main.test.cc +++ b/senf/Packets/DefaultBundle/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Packets/DumpFormat.test.cc b/senf/Packets/DumpFormat.test.cc index 87463fc..31e7532 100644 --- a/senf/Packets/DumpFormat.test.cc +++ b/senf/Packets/DumpFormat.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(dumpFormat) +SENF_AUTO_UNIT_TEST(dumpFormat) { BOOST_CHECK_EQUAL( senf::fieldName("test"), " test : " ); BOOST_CHECK_EQUAL( senf::fieldName("xxxxxxxxxxxxxxxxxxxxxxx"), " xxxxxxxxxxxxxxxxxxxxxxx : " ); diff --git a/senf/Packets/GenericTLV.test.cc b/senf/Packets/GenericTLV.test.cc index b80d3fe..2af6ed6 100644 --- a/senf/Packets/GenericTLV.test.cc +++ b/senf/Packets/GenericTLV.test.cc @@ -122,7 +122,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(GenericTLV_parser) +SENF_AUTO_UNIT_TEST(GenericTLV_parser) { BOOST_CHECK_EQUAL( senf::init_bytes::value, senf::init_bytes::value) ; @@ -155,7 +155,7 @@ BOOST_AUTO_UNIT_TEST(GenericTLV_parser) BOOST_CHECK_EQUAL( concreteTLVParser.myValue(), 0xabababab ); } -BOOST_AUTO_UNIT_TEST(GenericTLV_packet) +SENF_AUTO_UNIT_TEST(GenericTLV_packet) { MyTestPacket p ( MyTestPacket::create()); MyTestPacket::Parser::tlv_list_t::container tlvContainer (p->tlv_list() ); @@ -174,7 +174,7 @@ BOOST_AUTO_UNIT_TEST(GenericTLV_packet) } -BOOST_AUTO_UNIT_TEST(GenericTLV_registry) +SENF_AUTO_UNIT_TEST(GenericTLV_registry) { MyTestPacket p ( MyTestPacket::create()); MyTestPacket::Parser::tlv_list_t::container tlvContainer (p->tlv_list() ); @@ -196,7 +196,7 @@ BOOST_AUTO_UNIT_TEST(GenericTLV_registry) BOOST_CHECK_EQUAL( ss.str().substr(0,21), " MyConcreteTLVParser" ); } -BOOST_AUTO_UNIT_TEST(GenericTLV_predicate) +SENF_AUTO_UNIT_TEST(GenericTLV_predicate) { MyTestPacket p ( MyTestPacket::create() ); MyTestPacket::Parser::tlv_list_t::container tlvContainer (p->tlv_list() ); diff --git a/senf/Packets/IntParser.test.cc b/senf/Packets/IntParser.test.cc index b54908d..2c73175 100644 --- a/senf/Packets/IntParser.test.cc +++ b/senf/Packets/IntParser.test.cc @@ -42,7 +42,7 @@ namespace { {}; } -BOOST_AUTO_UNIT_TEST(parseInt_fixedSizes) +SENF_AUTO_UNIT_TEST(parseInt_fixedSizes) { PacketInterpreterBase::byte data[] = { 0x8e, 0x2f, 0x57, 0x12, 0xd1 }; PacketInterpreterBase::ptr p (PacketInterpreter::create(data)); @@ -64,7 +64,7 @@ BOOST_AUTO_UNIT_TEST(parseInt_fixedSizes) BOOST_CHECK_EQUAL(UInt32Parser(p->data().begin(),&p->data()).value(), 2385467154u); } -BOOST_AUTO_UNIT_TEST(parseInt_bits) +SENF_AUTO_UNIT_TEST(parseInt_bits) { // 0 1 2 3 4 // 012345678901234567890123456789012345678901234567 @@ -107,7 +107,7 @@ BOOST_AUTO_UNIT_TEST(parseInt_bits) BOOST_CHECK_EQUAL((FlagParser<12>(p->data().begin(),&p->data()).value()), false); } -BOOST_AUTO_UNIT_TEST(parseInt_assign) +SENF_AUTO_UNIT_TEST(parseInt_assign) { PacketInterpreterBase::byte data[] = { 0x00, 0x00, 0x00, 0x00, 0x00 }; PacketInterpreterBase::ptr p (PacketInterpreter::create(data)); @@ -149,7 +149,7 @@ BOOST_AUTO_UNIT_TEST(parseInt_assign) BOOST_CHECK_EQUAL( (UIntFieldParser<4,34>(p->data().begin(),&p->data()).value()), 0x268ad497u ); } -BOOST_AUTO_UNIT_TEST(parseInt_operators) +SENF_AUTO_UNIT_TEST(parseInt_operators) { PacketInterpreterBase::byte data[] = { 0x63, 0xd7, 0x5a, 0x31, 0xa4, 0x46 }; PacketInterpreterBase::ptr p (PacketInterpreter::create(data)); diff --git a/senf/Packets/ListBParser.test.cc b/senf/Packets/ListBParser.test.cc index d380738..83ba23b 100644 --- a/senf/Packets/ListBParser.test.cc +++ b/senf/Packets/ListBParser.test.cc @@ -55,7 +55,7 @@ namespace { senf::detail::PrefixAuxParserPolicy > > MyListBParser; } -BOOST_AUTO_UNIT_TEST(ListBParser) +SENF_AUTO_UNIT_TEST(ListBParser) { senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter::create( MyListBParser::init_bytes)); @@ -76,7 +76,7 @@ BOOST_AUTO_UNIT_TEST(ListBParser) BOOST_CHECK( ! p.empty() ); } -BOOST_AUTO_UNIT_TEST(ListBParser_container) +SENF_AUTO_UNIT_TEST(ListBParser_container) { senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter::create( MyListBParser::init_bytes)); @@ -173,7 +173,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(listBytesMacro) +SENF_AUTO_UNIT_TEST(listBytesMacro) { unsigned char data[] = { 8, // size1 18, // size2 @@ -253,7 +253,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(listBytesParser_packetSize) +SENF_AUTO_UNIT_TEST(listBytesParser_packetSize) { unsigned char data[] = { 0x01, // list()[0].vec().size() 0x05, 0x06, // list()[0].vec()[0] diff --git a/senf/Packets/ListNParser.test.cc b/senf/Packets/ListNParser.test.cc index 1a592c1..6500e2b 100644 --- a/senf/Packets/ListNParser.test.cc +++ b/senf/Packets/ListNParser.test.cc @@ -57,7 +57,7 @@ namespace { senf::UInt16Parser> > > MyListNParser; } -BOOST_AUTO_UNIT_TEST(ListNParser_container) +SENF_AUTO_UNIT_TEST(ListNParser_container) { VoidPacket vp (VoidPacket::create(MyListNParser::init_bytes)); MyListNParser(vp.data().begin(),&vp.data()).init(); @@ -86,7 +86,7 @@ BOOST_AUTO_UNIT_TEST(ListNParser_container) } } -BOOST_AUTO_UNIT_TEST(ListNParser) +SENF_AUTO_UNIT_TEST(ListNParser) { VoidPacket vp (VoidPacket::create(MyListNParser::init_bytes)); @@ -167,7 +167,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(listMacro) +SENF_AUTO_UNIT_TEST(listMacro) { unsigned char data[] = { 0x04, // size1 0x03, // size2 diff --git a/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc b/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc index ac05aae..98a5243 100644 --- a/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc +++ b/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(dtcpPacket) +SENF_AUTO_UNIT_TEST(dtcpPacket) { unsigned char data[] = { 0x11, // versionNumber = 1, command = JOIN diff --git a/senf/Packets/MPEGDVBBundle/GREPacket.test.cc b/senf/Packets/MPEGDVBBundle/GREPacket.test.cc index a662ba6..2fe1017 100644 --- a/senf/Packets/MPEGDVBBundle/GREPacket.test.cc +++ b/senf/Packets/MPEGDVBBundle/GREPacket.test.cc @@ -37,7 +37,7 @@ using namespace senf; -BOOST_AUTO_UNIT_TEST(GREPacket_packet) +SENF_AUTO_UNIT_TEST(GREPacket_packet) { senf::GREPacket p (senf::GREPacket::create()); diff --git a/senf/Packets/MPEGDVBBundle/MPESection.test.cc b/senf/Packets/MPEGDVBBundle/MPESection.test.cc index bff8970..9463ee2 100644 --- a/senf/Packets/MPEGDVBBundle/MPESection.test.cc +++ b/senf/Packets/MPEGDVBBundle/MPESection.test.cc @@ -40,7 +40,7 @@ using namespace senf; -BOOST_AUTO_UNIT_TEST(MPESection_parse_chain) +SENF_AUTO_UNIT_TEST(MPESection_parse_chain) { // MPE section captured with dvbsnoop unsigned char data[] = { @@ -131,7 +131,7 @@ BOOST_AUTO_UNIT_TEST(MPESection_parse_chain) } -BOOST_AUTO_UNIT_TEST(MPESection_create) +SENF_AUTO_UNIT_TEST(MPESection_create) { senf::MPESection sec (senf::MPESection::create()); sec->real_time_parameters().delta_t() = 0x027u; diff --git a/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc b/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc index 11d3b6c..1978000 100644 --- a/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc +++ b/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc @@ -37,7 +37,7 @@ using namespace senf; -BOOST_AUTO_UNIT_TEST(transportPacket_parse) +SENF_AUTO_UNIT_TEST(transportPacket_parse) { // TransportStream-Packet containing a ULE encoded IPv6 ping packet, // captured with dvbsnoop @@ -93,7 +93,7 @@ BOOST_AUTO_UNIT_TEST(transportPacket_parse) } -BOOST_AUTO_UNIT_TEST(transportPacket_create_with_pusi) +SENF_AUTO_UNIT_TEST(transportPacket_create_with_pusi) { TransportPacket ts_packet (TransportPacket::create()); ts_packet->setPUSI(true); diff --git a/senf/Packets/MPEGDVBBundle/main.test.cc b/senf/Packets/MPEGDVBBundle/main.test.cc index 8336519..fb7859c 100644 --- a/senf/Packets/MPEGDVBBundle/main.test.cc +++ b/senf/Packets/MPEGDVBBundle/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Packets/Packet.test.cc b/senf/Packets/Packet.test.cc index 4dbe329..f1b941d 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); @@ -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 }; @@ -285,7 +285,7 @@ BOOST_AUTO_UNIT_TEST(concretePacket) 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); diff --git a/senf/Packets/PacketData.test.cc b/senf/Packets/PacketData.test.cc index 2a26865..d69f875 100644 --- a/senf/Packets/PacketData.test.cc +++ b/senf/Packets/PacketData.test.cc @@ -39,7 +39,7 @@ namespace { struct VoidPacket : public senf::PacketTypeBase {}; } -BOOST_AUTO_UNIT_TEST(packetData) +SENF_AUTO_UNIT_TEST(packetData) { // We cannot simply allocate a packetData instance .. we must go through PacketInterpreterBase // and PacketImpl. @@ -93,7 +93,7 @@ BOOST_AUTO_UNIT_TEST(packetData) BOOST_CHECK( d.empty() ); } -BOOST_AUTO_UNIT_TEST(safePacketIterator) +SENF_AUTO_UNIT_TEST(safePacketIterator) { // We cannot simply allocate a packetData instance .. we must go through PacketInterpreterBase // and PacketImpl. diff --git a/senf/Packets/PacketImpl.test.cc b/senf/Packets/PacketImpl.test.cc index 13db554..a6c08df 100644 --- a/senf/Packets/PacketImpl.test.cc +++ b/senf/Packets/PacketImpl.test.cc @@ -44,7 +44,7 @@ namespace { // only validate PacketInterpreterBase as far as to ensure that a failure of one test is not due to // an error in PacketInterpreterbase -BOOST_AUTO_UNIT_TEST(packetImpl_mem) +SENF_AUTO_UNIT_TEST(packetImpl_mem) { senf::detail::PacketImpl * p (new senf::detail::PacketImpl()); BOOST_CHECK_EQUAL(p->refcount(), 0); @@ -101,7 +101,7 @@ BOOST_AUTO_UNIT_TEST(packetImpl_mem) #endif } -BOOST_AUTO_UNIT_TEST(packetImpl_data) +SENF_AUTO_UNIT_TEST(packetImpl_data) { senf::PacketInterpreterBase::ptr pi (senf::PacketInterpreter::create()); senf::detail::PacketImpl * p (senf::detail::packet::test::TestDriver::impl(pi)); @@ -147,7 +147,7 @@ BOOST_AUTO_UNIT_TEST(packetImpl_data) BOOST_CHECK(pi->data().begin() == p->begin()); } -BOOST_AUTO_UNIT_TEST(packetImpl_interpreters) +SENF_AUTO_UNIT_TEST(packetImpl_interpreters) { senf::detail::PacketImpl * p (new senf::detail::PacketImpl()); p->add_ref(); diff --git a/senf/Packets/PacketInterpreter.test.cc b/senf/Packets/PacketInterpreter.test.cc index e916d69..0afb7bb 100644 --- a/senf/Packets/PacketInterpreter.test.cc +++ b/senf/Packets/PacketInterpreter.test.cc @@ -43,7 +43,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(packetInterpreterBase) +SENF_AUTO_UNIT_TEST(packetInterpreterBase) { { senf::PacketInterpreter::ptr pi2 (senf::PacketInterpreter::create()); @@ -103,7 +103,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(packetInterpreter) +SENF_AUTO_UNIT_TEST(packetInterpreter) { typedef senf::PacketInterpreterBase::size_type size_type; { @@ -215,7 +215,7 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter) // fields() is tested in DefaultBundle/EthernetPacket.test.cc // initSize() and initHeadSize() are already tested indirectly above -BOOST_AUTO_UNIT_TEST(packetInterpreter_factory) +SENF_AUTO_UNIT_TEST(packetInterpreter_factory) { typedef senf::PacketInterpreterBase::size_type size_type; diff --git a/senf/Packets/PacketParser.test.cc b/senf/Packets/PacketParser.test.cc index c793560..b9b5b91 100644 --- a/senf/Packets/PacketParser.test.cc +++ b/senf/Packets/PacketParser.test.cc @@ -68,7 +68,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(packetParserBase) +SENF_AUTO_UNIT_TEST(packetParserBase) { senf::PacketInterpreter::ptr pi (senf::PacketInterpreter::create( senf::PacketInterpreterBase::size_type(6u))); diff --git a/senf/Packets/PacketRegistry.test.cc b/senf/Packets/PacketRegistry.test.cc index 872f490..0e320f9 100644 --- a/senf/Packets/PacketRegistry.test.cc +++ b/senf/Packets/PacketRegistry.test.cc @@ -61,7 +61,7 @@ namespace { SENF_PACKET_REGISTRY_REGISTER(StringTag, "foo", FooPacket); SENF_PACKET_REGISTRY_REGISTER(StringTag, "bar", BarPacket); -BOOST_AUTO_UNIT_TEST(packetRegistry_test) +SENF_AUTO_UNIT_TEST(packetRegistry_test) { PacketRegistry::registerPacket(1u); PacketRegistry::registerPacket(2u); diff --git a/senf/Packets/ParseHelpers.test.cc b/senf/Packets/ParseHelpers.test.cc index c0f04d5..d04b474 100644 --- a/senf/Packets/ParseHelpers.test.cc +++ b/senf/Packets/ParseHelpers.test.cc @@ -95,7 +95,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(fixedParser) +SENF_AUTO_UNIT_TEST(fixedParser) { unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x83, 0x84, 0x07, 0x08 }; @@ -205,7 +205,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(variableParser) +SENF_AUTO_UNIT_TEST(variableParser) { unsigned char data[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x83, 0x84, 0x07, 0x08 }; diff --git a/senf/Packets/SafeIterator.test.cc b/senf/Packets/SafeIterator.test.cc index cde9674..b37c06f 100644 --- a/senf/Packets/SafeIterator.test.cc +++ b/senf/Packets/SafeIterator.test.cc @@ -39,7 +39,7 @@ namespace { struct VoidPacket : public senf::PacketTypeBase {}; } -BOOST_AUTO_UNIT_TEST(safePacketParser) +SENF_AUTO_UNIT_TEST(safePacketParser) { senf::PacketInterpreter::ptr pi (senf::PacketInterpreter::create( senf::PacketInterpreterBase::size_type(6u))); diff --git a/senf/Packets/StringParser.test.cc b/senf/Packets/StringParser.test.cc index da9fcb4..f6fa8b0 100644 --- a/senf/Packets/StringParser.test.cc +++ b/senf/Packets/StringParser.test.cc @@ -42,7 +42,7 @@ namespace { typedef senf::StringParser MyStringParser; } -BOOST_AUTO_UNIT_TEST(stringParser) +SENF_AUTO_UNIT_TEST(stringParser) { senf::PacketInterpreterBase::byte data[] = { 0x00, 0x04, 'T', 'E', 'S', 'T' }; senf::PacketInterpreterBase::ptr p (senf::PacketInterpreter::create(data)); diff --git a/senf/Packets/VariantParser.test.cc b/senf/Packets/VariantParser.test.cc index 02ac3fe..20dfc13 100644 --- a/senf/Packets/VariantParser.test.cc +++ b/senf/Packets/VariantParser.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(VariantParser) +SENF_AUTO_UNIT_TEST(VariantParser) { typedef senf::ArrayParser<10, senf::UInt8Parser> Array10; typedef senf::VariantParser< senf::detail::FixedAuxParserPolicy, @@ -117,7 +117,7 @@ namespace VariantParser_test_cc_anon_namespace { } using namespace VariantParser_test_cc_anon_namespace; -BOOST_AUTO_UNIT_TEST(VariantParserMacro) +SENF_AUTO_UNIT_TEST(VariantParserMacro) { senf::DataPacket p (senf::DataPacket::create(senf::init_bytes::value)); diff --git a/senf/Packets/VectorParser.test.cc b/senf/Packets/VectorParser.test.cc index edb9578..9c7185b 100644 --- a/senf/Packets/VectorParser.test.cc +++ b/senf/Packets/VectorParser.test.cc @@ -41,7 +41,7 @@ namespace { {}; } -BOOST_AUTO_UNIT_TEST(VectorParser) +SENF_AUTO_UNIT_TEST(VectorParser) { unsigned char data[] = { 0x03, // size 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, // data @@ -116,7 +116,7 @@ BOOST_AUTO_UNIT_TEST(VectorParser) } } -BOOST_AUTO_UNIT_TEST(VectorParser_wrapper) +SENF_AUTO_UNIT_TEST(VectorParser_wrapper) { unsigned char data[] = { 0x03, // size 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, // data @@ -173,7 +173,7 @@ BOOST_AUTO_UNIT_TEST(VectorParser_wrapper) BOOST_CHECK_EQUAL( w.parser().size(), 0u ); } -BOOST_AUTO_UNIT_TEST(dynamicPolicyVector) +SENF_AUTO_UNIT_TEST(dynamicPolicyVector) { unsigned char data[] = { 0x03, // size 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, // data @@ -237,7 +237,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(vectorMacro_parse) +SENF_AUTO_UNIT_TEST(vectorMacro_parse) { unsigned char data[] = { 0x05, // size1 0x04, // size2 @@ -261,7 +261,7 @@ BOOST_AUTO_UNIT_TEST(vectorMacro_parse) BOOST_CHECK_EQUAL( parser.vec2()[1], 0x0D0Eu ); } -BOOST_AUTO_UNIT_TEST(vectorMacro_create) +SENF_AUTO_UNIT_TEST(vectorMacro_create) { TestVectorPacket p (TestVectorPacket::create()); p->dummy() = 0x01020304u; @@ -315,7 +315,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(vectorMacro_inherit) +SENF_AUTO_UNIT_TEST(vectorMacro_inherit) { unsigned char data[] = { 0x05, // size1 0x04, // size2 @@ -353,7 +353,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(vectorMacro_packetSize) +SENF_AUTO_UNIT_TEST(vectorMacro_packetSize) { unsigned char data[] = { 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26 }; diff --git a/senf/Packets/extra-tests/AllBundles.test.cc b/senf/Packets/extra-tests/AllBundles.test.cc index 7398028..63b69b6 100644 --- a/senf/Packets/extra-tests/AllBundles.test.cc +++ b/senf/Packets/extra-tests/AllBundles.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(packetLink) +SENF_AUTO_UNIT_TEST(packetLink) { // This test shall test, if there is now duplicated packet registration in AllBundles. // The test will fail at the start with an assertion error in this case. diff --git a/senf/Packets/extra-tests/main.test.cc b/senf/Packets/extra-tests/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Packets/extra-tests/main.test.cc +++ b/senf/Packets/extra-tests/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Packets/main.test.cc b/senf/Packets/main.test.cc index e785eca..c3e9643 100644 --- a/senf/Packets/main.test.cc +++ b/senf/Packets/main.test.cc @@ -34,7 +34,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Scheduler/ClockService.test.cc b/senf/Scheduler/ClockService.test.cc index 3ad36bf..93c07f9 100644 --- a/senf/Scheduler/ClockService.test.cc +++ b/senf/Scheduler/ClockService.test.cc @@ -54,7 +54,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(clockService) +SENF_AUTO_UNIT_TEST(clockService) { char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS")); BOOST_WARN_MESSAGE(enabled, "Set SENF_TIMING_CRITICAL_TESTS to not skip timing critical tests"); diff --git a/senf/Scheduler/EventManager.test.cc b/senf/Scheduler/EventManager.test.cc index 529387f..744cfac 100644 --- a/senf/Scheduler/EventManager.test.cc +++ b/senf/Scheduler/EventManager.test.cc @@ -38,7 +38,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(eventManager) +SENF_AUTO_UNIT_TEST(eventManager) { senf::scheduler::FdEvent fdEvent ("fdEvent", 0); senf::scheduler::TimerEvent timer ("timer", 0); diff --git a/senf/Scheduler/FdEvent.test.cc b/senf/Scheduler/FdEvent.test.cc index 9cf36c8..ea0f0e0 100644 --- a/senf/Scheduler/FdEvent.test.cc +++ b/senf/Scheduler/FdEvent.test.cc @@ -164,7 +164,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(fdDispatcher) +SENF_AUTO_UNIT_TEST(fdDispatcher) { senf::scheduler::detail::FdManager::instance().timeout(1000); @@ -246,7 +246,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(fileDispatcher) +SENF_AUTO_UNIT_TEST(fileDispatcher) { char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS")); BOOST_WARN_MESSAGE(enabled, "Set SENF_TIMING_CRITICAL_TESTS to not skip timing critical tests"); diff --git a/senf/Scheduler/IdleEvent.test.cc b/senf/Scheduler/IdleEvent.test.cc index 7507a2c..f3e4236 100644 --- a/senf/Scheduler/IdleEvent.test.cc +++ b/senf/Scheduler/IdleEvent.test.cc @@ -55,7 +55,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(idleEvent) +SENF_AUTO_UNIT_TEST(idleEvent) { senf::scheduler::IdleEvent idle ("idle event unit test", &cb); diff --git a/senf/Scheduler/Poller.test.cc b/senf/Scheduler/Poller.test.cc index 133d840..44a2c33 100644 --- a/senf/Scheduler/Poller.test.cc +++ b/senf/Scheduler/Poller.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(poller) +SENF_AUTO_UNIT_TEST(poller) { BOOST_CHECK( true ); } diff --git a/senf/Scheduler/Scheduler.test.cc b/senf/Scheduler/Scheduler.test.cc index 3a1b3ba..0dfbc99 100644 --- a/senf/Scheduler/Scheduler.test.cc +++ b/senf/Scheduler/Scheduler.test.cc @@ -334,13 +334,13 @@ void schedulerTest() BOOST_CHECK (stop_server(pid)); } -BOOST_AUTO_UNIT_TEST(testSchedulerPollTimers) +SENF_AUTO_UNIT_TEST(testSchedulerPollTimers) { BOOST_CHECK( ! senf::scheduler::usingHiresTimers() ); schedulerTest(); } -BOOST_AUTO_UNIT_TEST(testSchedulerHiresTimers) +SENF_AUTO_UNIT_TEST(testSchedulerHiresTimers) { if (senf::scheduler::haveScalableHiresTimers()) BOOST_MESSAGE( "Using timerfd() hires timers" ); @@ -353,7 +353,7 @@ BOOST_AUTO_UNIT_TEST(testSchedulerHiresTimers) BOOST_CHECK( ! senf::scheduler::usingHiresTimers() ); } -BOOST_AUTO_UNIT_TEST(testSchedulerPOSIXTimers) +SENF_AUTO_UNIT_TEST(testSchedulerPOSIXTimers) { if (senf::scheduler::haveScalableHiresTimers()) { SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().timerSource( @@ -381,7 +381,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(blockSignals) +SENF_AUTO_UNIT_TEST(blockSignals) { char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS")); BOOST_WARN_MESSAGE(enabled, "Set SENF_TIMING_CRITICAL_TESTS to not skip timing critical tests"); diff --git a/senf/Scheduler/SignalEvent.test.cc b/senf/Scheduler/SignalEvent.test.cc index d45d2e0..16f94ec 100644 --- a/senf/Scheduler/SignalEvent.test.cc +++ b/senf/Scheduler/SignalEvent.test.cc @@ -44,7 +44,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(signalDispatcher) +SENF_AUTO_UNIT_TEST(signalDispatcher) { senf::scheduler::detail::FdManager::instance().timeout(1000); senf::scheduler::SignalEvent sig (SIGUSR1, &handler); diff --git a/senf/Scheduler/TimerEvent.test.cc b/senf/Scheduler/TimerEvent.test.cc index 5843eae..04a2e43 100644 --- a/senf/Scheduler/TimerEvent.test.cc +++ b/senf/Scheduler/TimerEvent.test.cc @@ -53,7 +53,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(timerDispatcher) +SENF_AUTO_UNIT_TEST(timerDispatcher) { char const * enabled (getenv("SENF_TIMING_CRITICAL_TESTS")); BOOST_WARN_MESSAGE(enabled, "Set SENF_TIMING_CRITICAL_TESTS to not skip timing critical tests"); @@ -158,7 +158,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(timerJitter) +SENF_AUTO_UNIT_TEST(timerJitter) { senf::scheduler::watchdogTimeout(0); std::cerr << "Epoll timers\n"; diff --git a/senf/Scheduler/main.test.cc b/senf/Scheduler/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Scheduler/main.test.cc +++ b/senf/Scheduler/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Socket/ClientSocketHandle.test.cc b/senf/Socket/ClientSocketHandle.test.cc index ed1999d..6034a00 100644 --- a/senf/Socket/ClientSocketHandle.test.cc +++ b/senf/Socket/ClientSocketHandle.test.cc @@ -53,7 +53,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(clientSocketHandle) +SENF_AUTO_UNIT_TEST(clientSocketHandle) { BOOST_CHECKPOINT("Constructing socket handle"); MySocketHandle myh; diff --git a/senf/Socket/FileHandle.test.cc b/senf/Socket/FileHandle.test.cc index 1023e25..02d5392 100644 --- a/senf/Socket/FileHandle.test.cc +++ b/senf/Socket/FileHandle.test.cc @@ -58,7 +58,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(fileHandle) +SENF_AUTO_UNIT_TEST(fileHandle) { try { { diff --git a/senf/Socket/NetdeviceController.test.cc b/senf/Socket/NetdeviceController.test.cc index c545b40..d99c70b 100644 --- a/senf/Socket/NetdeviceController.test.cc +++ b/senf/Socket/NetdeviceController.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(NetdeviceController) { +SENF_AUTO_UNIT_TEST(NetdeviceController) { std::string ifname ("lo"); senf::NetdeviceController ctrl (ifname); diff --git a/senf/Socket/ProtocolClientSocketHandle.test.cc b/senf/Socket/ProtocolClientSocketHandle.test.cc index b14805e..d520990 100644 --- a/senf/Socket/ProtocolClientSocketHandle.test.cc +++ b/senf/Socket/ProtocolClientSocketHandle.test.cc @@ -44,7 +44,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(protocolClientSocketHandle) +SENF_AUTO_UNIT_TEST(protocolClientSocketHandle) { typedef senf::ProtocolClientSocketHandle MySocketHandle; diff --git a/senf/Socket/ProtocolServerSocketHandle.test.cc b/senf/Socket/ProtocolServerSocketHandle.test.cc index 1dea882..a9e0047 100644 --- a/senf/Socket/ProtocolServerSocketHandle.test.cc +++ b/senf/Socket/ProtocolServerSocketHandle.test.cc @@ -45,7 +45,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle) +SENF_AUTO_UNIT_TEST(protocolServerSocketHandle) { typedef senf::ProtocolServerSocketHandle MySocketHandle; diff --git a/senf/Socket/Protocols/BSDAddressingPolicy.test.cc b/senf/Socket/Protocols/BSDAddressingPolicy.test.cc index e8eb4d7..f0e4e21 100644 --- a/senf/Socket/Protocols/BSDAddressingPolicy.test.cc +++ b/senf/Socket/Protocols/BSDAddressingPolicy.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(bsdAddressingPolicy) +SENF_AUTO_UNIT_TEST(bsdAddressingPolicy) { typedef senf::ClientSocketHandle::policy> BSDHandle; diff --git a/senf/Socket/Protocols/BSDSocketAddress.test.cc b/senf/Socket/Protocols/BSDSocketAddress.test.cc index 3968be9..1827cfd 100644 --- a/senf/Socket/Protocols/BSDSocketAddress.test.cc +++ b/senf/Socket/Protocols/BSDSocketAddress.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(bsdSocketAddress) +SENF_AUTO_UNIT_TEST(bsdSocketAddress) { senf::GenericBSDSocketAddress g1; senf::GenericBSDSocketAddress g2 (senf::INet4SocketAddress("1.2.3.4:5678")); diff --git a/senf/Socket/Protocols/DVB/main.test.cc b/senf/Socket/Protocols/DVB/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Socket/Protocols/DVB/main.test.cc +++ b/senf/Socket/Protocols/DVB/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Socket/Protocols/INet/INet4Address.test.cc b/senf/Socket/Protocols/INet/INet4Address.test.cc index a9e04f1..1e7a45f 100644 --- a/senf/Socket/Protocols/INet/INet4Address.test.cc +++ b/senf/Socket/Protocols/INet/INet4Address.test.cc @@ -38,7 +38,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(inet4Address) +SENF_AUTO_UNIT_TEST(inet4Address) { using senf::INet4Address; using senf::AddressSyntaxException; @@ -91,7 +91,7 @@ BOOST_AUTO_UNIT_TEST(inet4Address) } } -BOOST_AUTO_UNIT_TEST(inet4Network) +SENF_AUTO_UNIT_TEST(inet4Network) { senf::INet4Network net (senf::INet4Address::Loopback,8); BOOST_CHECK_EQUAL( net.address().address(), 0x7F000000u ); diff --git a/senf/Socket/Protocols/INet/INet6Address.test.cc b/senf/Socket/Protocols/INet/INet6Address.test.cc index edfe83c..0ab8bbb 100644 --- a/senf/Socket/Protocols/INet/INet6Address.test.cc +++ b/senf/Socket/Protocols/INet/INet6Address.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(inet6Address) +SENF_AUTO_UNIT_TEST(inet6Address) { using senf::INet6Address; using senf::INet4Address; @@ -163,7 +163,7 @@ BOOST_AUTO_UNIT_TEST(inet6Address) } } -BOOST_AUTO_UNIT_TEST(inet6Network) +SENF_AUTO_UNIT_TEST(inet6Network) { using senf::INet6Address; using senf::INet6Network; diff --git a/senf/Socket/Protocols/INet/INetAddressing.test.cc b/senf/Socket/Protocols/INet/INetAddressing.test.cc index b176dc1..3803207 100644 --- a/senf/Socket/Protocols/INet/INetAddressing.test.cc +++ b/senf/Socket/Protocols/INet/INetAddressing.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(inet4SocketAddress) +SENF_AUTO_UNIT_TEST(inet4SocketAddress) { using senf::INet4SocketAddress; using senf::INet4Address; @@ -94,7 +94,7 @@ BOOST_AUTO_UNIT_TEST(inet4SocketAddress) } } -BOOST_AUTO_UNIT_TEST(inet6SocketAddress) +SENF_AUTO_UNIT_TEST(inet6SocketAddress) { using senf::INet6Address; using senf::INet6SocketAddress; diff --git a/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc b/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc index a4d8d29..6fc84fd 100644 --- a/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc +++ b/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(multicastSocketProtocol) +SENF_AUTO_UNIT_TEST(multicastSocketProtocol) { senf::UDPv4ClientSocketHandle sock; diff --git a/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc index 1b5908a..a3a58e1 100644 --- a/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc @@ -137,7 +137,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(RawV4ClientSocketHandle) +SENF_AUTO_UNIT_TEST(RawV4ClientSocketHandle) { if (getuid() != 0) { BOOST_WARN_MESSAGE(false, "Cannot test senf::RawV4SocketHandle as non-root user"); @@ -166,7 +166,7 @@ BOOST_AUTO_UNIT_TEST(RawV4ClientSocketHandle) } } -BOOST_AUTO_UNIT_TEST(RawV6ClientSocketHandle) +SENF_AUTO_UNIT_TEST(RawV6ClientSocketHandle) { if (getuid() != 0) { BOOST_WARN_MESSAGE(false, "Cannot test senf::RawV6SocketHandle as non-root user"); diff --git a/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc b/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc index 889a139..7e1d051 100644 --- a/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc @@ -109,7 +109,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(tcpv4ClientSocketHandle) +SENF_AUTO_UNIT_TEST(tcpv4ClientSocketHandle) { { senf::TCPv4ClientSocketHandle sock; @@ -180,7 +180,7 @@ BOOST_AUTO_UNIT_TEST(tcpv4ClientSocketHandle) } } -BOOST_AUTO_UNIT_TEST(tcpv6ClientSocketHandle) +SENF_AUTO_UNIT_TEST(tcpv6ClientSocketHandle) { { senf::TCPv6ClientSocketHandle sock; @@ -293,7 +293,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(tcpv4ServerSocketHandle) +SENF_AUTO_UNIT_TEST(tcpv4ServerSocketHandle) { try { alarm(10); @@ -319,7 +319,7 @@ BOOST_AUTO_UNIT_TEST(tcpv4ServerSocketHandle) } } -BOOST_AUTO_UNIT_TEST(tcpv6ServerSocketHandle) +SENF_AUTO_UNIT_TEST(tcpv6ServerSocketHandle) { try { alarm(10); diff --git a/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc b/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc index 9bbd272..1125ef8 100644 --- a/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc @@ -95,7 +95,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(udpv4ClientSocketHandle) +SENF_AUTO_UNIT_TEST(udpv4ClientSocketHandle) { try { alarm(10); diff --git a/senf/Socket/Protocols/INet/main.test.cc b/senf/Socket/Protocols/INet/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Socket/Protocols/INet/main.test.cc +++ b/senf/Socket/Protocols/INet/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Socket/Protocols/Raw/EUI64.test.cc b/senf/Socket/Protocols/Raw/EUI64.test.cc index 962804e..08429a3 100644 --- a/senf/Socket/Protocols/Raw/EUI64.test.cc +++ b/senf/Socket/Protocols/Raw/EUI64.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(eui64) +SENF_AUTO_UNIT_TEST(eui64) { senf::EUI64 eui; BOOST_CHECK( !eui ); diff --git a/senf/Socket/Protocols/Raw/LLAddressing.test.cc b/senf/Socket/Protocols/Raw/LLAddressing.test.cc index 0f1502e..f547d9a 100644 --- a/senf/Socket/Protocols/Raw/LLAddressing.test.cc +++ b/senf/Socket/Protocols/Raw/LLAddressing.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(llAddress) +SENF_AUTO_UNIT_TEST(llAddress) { using senf::LLSocketAddress; diff --git a/senf/Socket/Protocols/Raw/MACAddress.test.cc b/senf/Socket/Protocols/Raw/MACAddress.test.cc index a7b1e71..e4ca627 100644 --- a/senf/Socket/Protocols/Raw/MACAddress.test.cc +++ b/senf/Socket/Protocols/Raw/MACAddress.test.cc @@ -38,7 +38,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(macAddress) +SENF_AUTO_UNIT_TEST(macAddress) { using senf::MACAddress; using senf::AddressSyntaxException; diff --git a/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc b/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc index 6805f27..29951fe 100644 --- a/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc +++ b/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(packetSocketHandle) +SENF_AUTO_UNIT_TEST(packetSocketHandle) { // We have a Problem here .. packet sockets are only allowed for root if (getuid() != 0) { diff --git a/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc b/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc index d5a0811..6946fac 100644 --- a/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc +++ b/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc @@ -40,7 +40,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(tapSocketHandle) +SENF_AUTO_UNIT_TEST(tapSocketHandle) { if (getuid() != 0) { BOOST_WARN_MESSAGE(false, "Cannot test senf::TunTapSocketHandle as non-root user"); diff --git a/senf/Socket/Protocols/Raw/main.test.cc b/senf/Socket/Protocols/Raw/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Socket/Protocols/Raw/main.test.cc +++ b/senf/Socket/Protocols/Raw/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Socket/Protocols/UN/UNAddressing.test.cc b/senf/Socket/Protocols/UN/UNAddressing.test.cc index 86b6e11..6253043 100644 --- a/senf/Socket/Protocols/UN/UNAddressing.test.cc +++ b/senf/Socket/Protocols/UN/UNAddressing.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(UNSocketAddress) +SENF_AUTO_UNIT_TEST(UNSocketAddress) { senf::UNSocketAddress addr; BOOST_CHECK( ! addr); diff --git a/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc index c50c64c..6defe46 100644 --- a/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc +++ b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(unDatagramSocketHandle) +SENF_AUTO_UNIT_TEST(unDatagramSocketHandle) { std::string testString ("Hallo Welt."); std::string socketPath (".socket-UNDatagramSocketHandle.test"); diff --git a/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc b/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc index 57c1bb6..a9c6247 100644 --- a/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc +++ b/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(unProtocol) +SENF_AUTO_UNIT_TEST(unProtocol) { //zZ leer diff --git a/senf/Socket/Protocols/UN/main.test.cc b/senf/Socket/Protocols/UN/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Socket/Protocols/UN/main.test.cc +++ b/senf/Socket/Protocols/UN/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Socket/Protocols/main.test.cc b/senf/Socket/Protocols/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Socket/Protocols/main.test.cc +++ b/senf/Socket/Protocols/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Socket/ServerSocketHandle.test.cc b/senf/Socket/ServerSocketHandle.test.cc index 181d1aa..bacb7ac 100644 --- a/senf/Socket/ServerSocketHandle.test.cc +++ b/senf/Socket/ServerSocketHandle.test.cc @@ -53,7 +53,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(serverSocketHandle) +SENF_AUTO_UNIT_TEST(serverSocketHandle) { typedef senf::MakeSocketPolicy< senf::test::SomeFramingPolicy, diff --git a/senf/Socket/SocketHandle.test.cc b/senf/Socket/SocketHandle.test.cc index 72fc952..1d97c78 100644 --- a/senf/Socket/SocketHandle.test.cc +++ b/senf/Socket/SocketHandle.test.cc @@ -59,7 +59,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(socketHandle) +SENF_AUTO_UNIT_TEST(socketHandle) { typedef senf::MakeSocketPolicy< senf::test::SomeCommunicationPolicy, diff --git a/senf/Socket/SocketPolicy.test.cc b/senf/Socket/SocketPolicy.test.cc index de28327..a9bef41 100644 --- a/senf/Socket/SocketPolicy.test.cc +++ b/senf/Socket/SocketPolicy.test.cc @@ -80,7 +80,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(socketPolicy) +SENF_AUTO_UNIT_TEST(socketPolicy) { // Most of these checks are really compile-time checks ... diff --git a/senf/Socket/SocketProtocol.test.cc b/senf/Socket/SocketProtocol.test.cc index 89e1a10..0864eeb 100644 --- a/senf/Socket/SocketProtocol.test.cc +++ b/senf/Socket/SocketProtocol.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(socketProtocol) +SENF_AUTO_UNIT_TEST(socketProtocol) { senf::test::SomeSocketProtocol protocol; diff --git a/senf/Socket/main.test.cc b/senf/Socket/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Socket/main.test.cc +++ b/senf/Socket/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Utils/Buffer.test.cc b/senf/Utils/Buffer.test.cc index 579236f..7026244 100644 --- a/senf/Utils/Buffer.test.cc +++ b/senf/Utils/Buffer.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(buffer) +SENF_AUTO_UNIT_TEST(buffer) { int size (128); diff --git a/senf/Utils/Console/Config.test.cc b/senf/Utils/Console/Config.test.cc index 5be47ca..d319966 100644 --- a/senf/Utils/Console/Config.test.cc +++ b/senf/Utils/Console/Config.test.cc @@ -62,7 +62,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(configBundle) +SENF_AUTO_UNIT_TEST(configBundle) { senf::console::ScopedDirectory<> root; senf::console::root().add("root", root); diff --git a/senf/Utils/Console/ConfigFile.test.cc b/senf/Utils/Console/ConfigFile.test.cc index adf4f34..ddb9067 100644 --- a/senf/Utils/Console/ConfigFile.test.cc +++ b/senf/Utils/Console/ConfigFile.test.cc @@ -62,7 +62,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(configFile) +SENF_AUTO_UNIT_TEST(configFile) { TempFile cfgf ("test.cfg"); cfgf << "dir1/fun1 10;\n" @@ -96,7 +96,7 @@ BOOST_AUTO_UNIT_TEST(configFile) } } -BOOST_AUTO_UNIT_TEST(configFileRestrict) +SENF_AUTO_UNIT_TEST(configFileRestrict) { TempFile cfgf ("test.cfg"); cfgf << "dir1/fun1 10;\n" @@ -130,7 +130,7 @@ BOOST_AUTO_UNIT_TEST(configFileRestrict) } } -BOOST_AUTO_UNIT_TEST(configFileSkipGroup) +SENF_AUTO_UNIT_TEST(configFileSkipGroup) { TempFile cfgf ("test.cfg"); cfgf << "dir1/fun1 10;\n" @@ -171,7 +171,7 @@ BOOST_AUTO_UNIT_TEST(configFileSkipGroup) } } -BOOST_AUTO_UNIT_TEST(configRestrictAndLink) +SENF_AUTO_UNIT_TEST(configRestrictAndLink) { TempFile cfgf ("test.cfg"); cfgf << "dir1/fun1 10;\n" diff --git a/senf/Utils/Console/Executor.test.cc b/senf/Utils/Console/Executor.test.cc index 0a6a6db..0826459 100644 --- a/senf/Utils/Console/Executor.test.cc +++ b/senf/Utils/Console/Executor.test.cc @@ -47,7 +47,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(executor) +SENF_AUTO_UNIT_TEST(executor) { senf::console::root().mkdir("dir1").mkdir("dir3"); senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand); @@ -180,7 +180,7 @@ BOOST_AUTO_UNIT_TEST(executor) senf::console::root().remove("dir2"); } -BOOST_AUTO_UNIT_TEST(executorChroot) +SENF_AUTO_UNIT_TEST(executorChroot) { senf::console::root().mkdir("dir1").mkdir("dir3"); senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand); @@ -214,7 +214,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(executorPolicy) +SENF_AUTO_UNIT_TEST(executorPolicy) { senf::console::root().mkdir("dir1").mkdir("dir3"); senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand); @@ -245,7 +245,7 @@ BOOST_AUTO_UNIT_TEST(executorPolicy) senf::console::root().remove("dir2"); } -BOOST_AUTO_UNIT_TEST(executorAuto) +SENF_AUTO_UNIT_TEST(executorAuto) { senf::console::root().mkdir("tdir1").mkdir("dir3"); senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand); diff --git a/senf/Utils/Console/Node.test.cc b/senf/Utils/Console/Node.test.cc index f72da5e..e837142 100644 --- a/senf/Utils/Console/Node.test.cc +++ b/senf/Utils/Console/Node.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(genericNode) +SENF_AUTO_UNIT_TEST(genericNode) { senf::console::GenericNode & node ( senf::console::root().mkdir("dir1").mkdir("dir2").doc("help info")); @@ -72,7 +72,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(directoryNode) +SENF_AUTO_UNIT_TEST(directoryNode) { senf::console::DirectoryNode::ptr p (senf::console::DirectoryNode::create()); @@ -136,7 +136,7 @@ BOOST_AUTO_UNIT_TEST(directoryNode) senf::console::root().children().end()), 1 ); } -BOOST_AUTO_UNIT_TEST(linkNode) +SENF_AUTO_UNIT_TEST(linkNode) { senf::console::root().mkdir("dir1"); senf::console::root().link("link1", senf::console::root()["dir1"]); @@ -155,7 +155,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(senfConsoleAddNode) +SENF_AUTO_UNIT_TEST(senfConsoleAddNode) { senf::console::root().add("fn1", &callback); senf::console::root().add("fn2", boost::function(Functor())); @@ -178,7 +178,7 @@ BOOST_AUTO_UNIT_TEST(senfConsoleAddNode) senf::console::root().remove("fn2"); } -BOOST_AUTO_UNIT_TEST(simpleCommandNode) +SENF_AUTO_UNIT_TEST(simpleCommandNode) { senf::console::root().add("fn", senf::console::SimpleCommandNode::create(&callback)) .doc("help text"); diff --git a/senf/Utils/Console/OverloadedCommand.test.cc b/senf/Utils/Console/OverloadedCommand.test.cc index 892f21e..2bd356a 100644 --- a/senf/Utils/Console/OverloadedCommand.test.cc +++ b/senf/Utils/Console/OverloadedCommand.test.cc @@ -55,7 +55,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(overladedCommand) +SENF_AUTO_UNIT_TEST(overladedCommand) { senf::console::OverloadedCommandNode & cmd ( senf::console::root() diff --git a/senf/Utils/Console/Parse.test.cc b/senf/Utils/Console/Parse.test.cc index 0f2e150..41b809f 100644 --- a/senf/Utils/Console/Parse.test.cc +++ b/senf/Utils/Console/Parse.test.cc @@ -77,7 +77,7 @@ namespace }; } -BOOST_AUTO_UNIT_TEST(commandGrammar) +SENF_AUTO_UNIT_TEST(commandGrammar) { senf::console::detail::CommandGrammar::Context context; std::stringstream ss; @@ -198,7 +198,7 @@ namespace { { commands.push_back(i); } } -BOOST_AUTO_UNIT_TEST(commandParser) +SENF_AUTO_UNIT_TEST(commandParser) { senf::console::CommandParser parser; @@ -288,7 +288,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(checkedArgumentIterator) +SENF_AUTO_UNIT_TEST(checkedArgumentIterator) { senf::console::CommandParser parser; @@ -318,7 +318,7 @@ BOOST_AUTO_UNIT_TEST(checkedArgumentIterator) commands.clear(); } -BOOST_AUTO_UNIT_TEST(parseIncremental) +SENF_AUTO_UNIT_TEST(parseIncremental) { senf::console::CommandParser parser; @@ -340,7 +340,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(parseExceptions) +SENF_AUTO_UNIT_TEST(parseExceptions) { senf::console::CommandParser parser; std::string msg; diff --git a/senf/Utils/Console/ParsedCommand.test.cc b/senf/Utils/Console/ParsedCommand.test.cc index 8a4a7bb..7e03013 100644 --- a/senf/Utils/Console/ParsedCommand.test.cc +++ b/senf/Utils/Console/ParsedCommand.test.cc @@ -56,7 +56,7 @@ namespace { { os << "formatter"; } } -BOOST_AUTO_UNIT_TEST(parsedCommand) +SENF_AUTO_UNIT_TEST(parsedCommand) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -257,7 +257,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(memberParsedCommand) +SENF_AUTO_UNIT_TEST(memberParsedCommand) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -287,7 +287,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(directoryReturn) +SENF_AUTO_UNIT_TEST(directoryReturn) { senf::console::Executor executor; senf::console::CommandParser parser; diff --git a/senf/Utils/Console/ProgramOptions.test.cc b/senf/Utils/Console/ProgramOptions.test.cc index 6fdcbc4..a186106 100644 --- a/senf/Utils/Console/ProgramOptions.test.cc +++ b/senf/Utils/Console/ProgramOptions.test.cc @@ -46,7 +46,7 @@ namespace { { val2 = true; } } -BOOST_AUTO_UNIT_TEST(programOptions) +SENF_AUTO_UNIT_TEST(programOptions) { senf::console::ScopedDirectory<> root; senf::console::root().add("root", root); diff --git a/senf/Utils/Console/STLSupport.test.cc b/senf/Utils/Console/STLSupport.test.cc index 37c9af2..0b86895 100644 --- a/senf/Utils/Console/STLSupport.test.cc +++ b/senf/Utils/Console/STLSupport.test.cc @@ -65,7 +65,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(vectorSupport) +SENF_AUTO_UNIT_TEST(vectorSupport) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -96,7 +96,7 @@ BOOST_AUTO_UNIT_TEST(vectorSupport) " default: (7 2)\n" ); } -BOOST_AUTO_UNIT_TEST(listSupport) +SENF_AUTO_UNIT_TEST(listSupport) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -127,7 +127,7 @@ BOOST_AUTO_UNIT_TEST(listSupport) " default: (7 2)\n" ); } -BOOST_AUTO_UNIT_TEST(setSupport) +SENF_AUTO_UNIT_TEST(setSupport) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -158,7 +158,7 @@ BOOST_AUTO_UNIT_TEST(setSupport) " default: (2 7)\n" ); } -BOOST_AUTO_UNIT_TEST(mapSupport) +SENF_AUTO_UNIT_TEST(mapSupport) { senf::console::Executor executor; senf::console::CommandParser parser; diff --git a/senf/Utils/Console/ScopedDirectory.test.cc b/senf/Utils/Console/ScopedDirectory.test.cc index 801de49..8cf9c6c 100644 --- a/senf/Utils/Console/ScopedDirectory.test.cc +++ b/senf/Utils/Console/ScopedDirectory.test.cc @@ -52,7 +52,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(scopedDirectory) +SENF_AUTO_UNIT_TEST(scopedDirectory) { { TestObject ob; @@ -71,7 +71,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(scopedDirectoryVoid) +SENF_AUTO_UNIT_TEST(scopedDirectoryVoid) { { senf::console::ScopedDirectory<> dir; @@ -94,7 +94,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(scopedDirectoryBase) +SENF_AUTO_UNIT_TEST(scopedDirectoryBase) { { senf::console::ScopedDirectory<> dir; diff --git a/senf/Utils/Console/Server.test.cc b/senf/Utils/Console/Server.test.cc index a8047b9..36108c5 100644 --- a/senf/Utils/Console/Server.test.cc +++ b/senf/Utils/Console/Server.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(server) +SENF_AUTO_UNIT_TEST(server) {} ///////////////////////////////cc.e//////////////////////////////////////// diff --git a/senf/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc index a6a1b41..59f848a 100644 --- a/senf/Utils/Console/Traits.test.cc +++ b/senf/Utils/Console/Traits.test.cc @@ -54,7 +54,7 @@ namespace { SENF_CONSOLE_REGISTER_ENUM_MEMBER( TestClass, MemberEnum, (MemberFoo)(MemberBar) ); } -BOOST_AUTO_UNIT_TEST(charTraits) +SENF_AUTO_UNIT_TEST(charTraits) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -85,7 +85,7 @@ BOOST_AUTO_UNIT_TEST(charTraits) ss.str(""); } -BOOST_AUTO_UNIT_TEST(boolTraits) +SENF_AUTO_UNIT_TEST(boolTraits) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -126,14 +126,14 @@ BOOST_AUTO_UNIT_TEST(boolTraits) BOOST_CHECK_EQUAL( ss.str(), "disabled\n" "enabled\n" ); } -BOOST_AUTO_UNIT_TEST(stringTraits) +SENF_AUTO_UNIT_TEST(stringTraits) { BOOST_CHECK_EQUAL( senf::console::ArgumentTraits::str("Test\nOf\nA \"String\"\x01\x7f\xa0\xff"), "\"Test\\x0aOf\\x0aA \\\"String\\\"\\x01\\x7f\\xa0\\xff\"" ); } -BOOST_AUTO_UNIT_TEST(enumSupport) +SENF_AUTO_UNIT_TEST(enumSupport) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -197,7 +197,7 @@ BOOST_AUTO_UNIT_TEST(enumSupport) BOOST_CHECK_EQUAL( ss.str(), "Foo\n" ); } -BOOST_AUTO_UNIT_TEST(singleToken) +SENF_AUTO_UNIT_TEST(singleToken) { BOOST_CHECK( senf::console::ArgumentTraits::singleToken ); BOOST_CHECK( senf::console::ArgumentTraits::singleToken ); diff --git a/senf/Utils/Console/UDPServer.test.cc b/senf/Utils/Console/UDPServer.test.cc index 3cd8b2e..86ad366 100644 --- a/senf/Utils/Console/UDPServer.test.cc +++ b/senf/Utils/Console/UDPServer.test.cc @@ -79,7 +79,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(udpServer) +SENF_AUTO_UNIT_TEST(udpServer) { senf::console::UDPServer server (senf::INet4SocketAddress(localhost4str(0))); senf::ConnectedUDPv4ClientSocketHandle socket (senf::INet4SocketAddress(localhost4str(0))); diff --git a/senf/Utils/Console/Utility.test.cc b/senf/Utils/Console/Utility.test.cc index b9100df..2496f3b 100644 --- a/senf/Utils/Console/Utility.test.cc +++ b/senf/Utils/Console/Utility.test.cc @@ -47,7 +47,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(charAsString) +SENF_AUTO_UNIT_TEST(charAsString) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -65,7 +65,7 @@ BOOST_AUTO_UNIT_TEST(charAsString) BOOST_CHECK_EQUAL( ss.str(), "\x01\n" ); } -BOOST_AUTO_UNIT_TEST(flagCollection) +SENF_AUTO_UNIT_TEST(flagCollection) { senf::console::Executor executor; senf::console::CommandParser parser; diff --git a/senf/Utils/Console/Variables.test.cc b/senf/Utils/Console/Variables.test.cc index 1a4669b..2a63473 100644 --- a/senf/Utils/Console/Variables.test.cc +++ b/senf/Utils/Console/Variables.test.cc @@ -49,7 +49,7 @@ namespace { { changed_ = true; } } -BOOST_AUTO_UNIT_TEST(variables) +SENF_AUTO_UNIT_TEST(variables) { senf::console::Executor executor; senf::console::CommandParser parser; @@ -108,7 +108,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(memberVariables) +SENF_AUTO_UNIT_TEST(memberVariables) { Test2 test2ob; } diff --git a/senf/Utils/Console/main.test.cc b/senf/Utils/Console/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Utils/Console/main.test.cc +++ b/senf/Utils/Console/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Utils/Daemon/Daemon.test.cc b/senf/Utils/Daemon/Daemon.test.cc index 9f8b0f7..09e7ee3 100644 --- a/senf/Utils/Daemon/Daemon.test.cc +++ b/senf/Utils/Daemon/Daemon.test.cc @@ -119,7 +119,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(testDaemon) +SENF_AUTO_UNIT_TEST(testDaemon) { char const * args[] = { "run", "--console-log=testDaemon.log", diff --git a/senf/Utils/Daemon/main.test.cc b/senf/Utils/Daemon/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Utils/Daemon/main.test.cc +++ b/senf/Utils/Daemon/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Utils/DiscardStream.test.cc b/senf/Utils/DiscardStream.test.cc index 56dadd3..93dd9bc 100644 --- a/senf/Utils/DiscardStream.test.cc +++ b/senf/Utils/DiscardStream.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(discardStream) +SENF_AUTO_UNIT_TEST(discardStream) { senf::DiscardStream stream; SENF_CHECK_NO_THROW( stream << "discard me" ); diff --git a/senf/Utils/Exception.test.cc b/senf/Utils/Exception.test.cc index ca3a04d..3de5680 100644 --- a/senf/Utils/Exception.test.cc +++ b/senf/Utils/Exception.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(wrapException) +SENF_AUTO_UNIT_TEST(wrapException) { bool bad_cast (false); @@ -71,7 +71,7 @@ BOOST_AUTO_UNIT_TEST(wrapException) BOOST_CHECK( bad_cast ); } -BOOST_AUTO_UNIT_TEST(errnoException) +SENF_AUTO_UNIT_TEST(errnoException) { try { try { diff --git a/senf/Utils/Format.test.cc b/senf/Utils/Format.test.cc index ef1a2a2..ece8647 100644 --- a/senf/Utils/Format.test.cc +++ b/senf/Utils/Format.test.cc @@ -39,7 +39,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(formatEng) +SENF_AUTO_UNIT_TEST(formatEng) { std::stringstream ss; @@ -132,7 +132,7 @@ BOOST_AUTO_UNIT_TEST(formatEng) " 12.35+-067.00E+00" ); } -BOOST_AUTO_UNIT_TEST(dumpint) +SENF_AUTO_UNIT_TEST(dumpint) { std::stringstream ss; diff --git a/senf/Utils/IpChecksum.test.cc b/senf/Utils/IpChecksum.test.cc index 59f8f41..a1602b2 100644 --- a/senf/Utils/IpChecksum.test.cc +++ b/senf/Utils/IpChecksum.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(ipChecksum) +SENF_AUTO_UNIT_TEST(ipChecksum) { char data[] = { 0x45, 0x00, 0x00, 0x28, 0x49, 0x44, 0x40, 0x00, 0x40, 0x06, 0x00, 0x00, 0x0a, 0xc1, 0x01, 0x06, diff --git a/senf/Utils/IteratorTraits.test.cc b/senf/Utils/IteratorTraits.test.cc index c45084f..6575a60 100644 --- a/senf/Utils/IteratorTraits.test.cc +++ b/senf/Utils/IteratorTraits.test.cc @@ -37,7 +37,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(iteratorTraits) +SENF_AUTO_UNIT_TEST(iteratorTraits) { BOOST_CHECK_EQUAL( senf::contiguous_storage_iterator::value, true ); BOOST_CHECK_EQUAL( senf::contiguous_storage_iterator::value, false ); diff --git a/senf/Utils/Logger/AreaRegistry.test.cc b/senf/Utils/Logger/AreaRegistry.test.cc index 4487679..b01e55a 100644 --- a/senf/Utils/Logger/AreaRegistry.test.cc +++ b/senf/Utils/Logger/AreaRegistry.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(areaRegistry) +SENF_AUTO_UNIT_TEST(areaRegistry) { #if 0 // Need to rewrite this test ... diff --git a/senf/Utils/Logger/Config.test.cc b/senf/Utils/Logger/Config.test.cc index 346cdcb..2bda862 100644 --- a/senf/Utils/Logger/Config.test.cc +++ b/senf/Utils/Logger/Config.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(logConfig) +SENF_AUTO_UNIT_TEST(logConfig) { BOOST_CHECK(( senf::log::Enabled< senf::log::Debug, senf::log::DefaultArea, diff --git a/senf/Utils/Logger/FileTarget.test.cc b/senf/Utils/Logger/FileTarget.test.cc index 3f45b10..5606648 100644 --- a/senf/Utils/Logger/FileTarget.test.cc +++ b/senf/Utils/Logger/FileTarget.test.cc @@ -38,7 +38,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(fileTarget) +SENF_AUTO_UNIT_TEST(fileTarget) { std::string filename ("/tmp/senf_fileTarget_test.log"); senf::log::FileTarget target (filename); diff --git a/senf/Utils/Logger/Log.test.cc b/senf/Utils/Logger/Log.test.cc index f839255..a9b80ba 100644 --- a/senf/Utils/Logger/Log.test.cc +++ b/senf/Utils/Logger/Log.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(logger) +SENF_AUTO_UNIT_TEST(logger) { senf::log::StringTarget target; diff --git a/senf/Utils/Logger/StreamRegistry.test.cc b/senf/Utils/Logger/StreamRegistry.test.cc index 793b9a9..eba72e8 100644 --- a/senf/Utils/Logger/StreamRegistry.test.cc +++ b/senf/Utils/Logger/StreamRegistry.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(streamRegistry) +SENF_AUTO_UNIT_TEST(streamRegistry) { char const * streams[] = { "senf::SenfLog", "senf::log::Debug", "senf::log::test::myStream" }; diff --git a/senf/Utils/Logger/SyslogTarget.test.cc b/senf/Utils/Logger/SyslogTarget.test.cc index 5d042fe..5459aeb 100644 --- a/senf/Utils/Logger/SyslogTarget.test.cc +++ b/senf/Utils/Logger/SyslogTarget.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(syslogTarget) +SENF_AUTO_UNIT_TEST(syslogTarget) { senf::log::SyslogTarget syslog; diff --git a/senf/Utils/Logger/SyslogUDPTarget.test.cc b/senf/Utils/Logger/SyslogUDPTarget.test.cc index d1f06fa..209f353 100644 --- a/senf/Utils/Logger/SyslogUDPTarget.test.cc +++ b/senf/Utils/Logger/SyslogUDPTarget.test.cc @@ -61,7 +61,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(syslogUDPTarget) +SENF_AUTO_UNIT_TEST(syslogUDPTarget) { senf::log::SyslogUDPTarget udplog ( senf::INet4SocketAddress(senf::INet4Address::Loopback, port(0))); diff --git a/senf/Utils/Logger/Target.test.cc b/senf/Utils/Logger/Target.test.cc index 311a421..441bbd8 100644 --- a/senf/Utils/Logger/Target.test.cc +++ b/senf/Utils/Logger/Target.test.cc @@ -55,7 +55,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(target) +SENF_AUTO_UNIT_TEST(target) { senf::log::StringTarget target; diff --git a/senf/Utils/Logger/main.test.cc b/senf/Utils/Logger/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Utils/Logger/main.test.cc +++ b/senf/Utils/Logger/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Utils/Statistics.test.cc b/senf/Utils/Statistics.test.cc index bd89f74..4e2f084 100644 --- a/senf/Utils/Statistics.test.cc +++ b/senf/Utils/Statistics.test.cc @@ -101,7 +101,7 @@ namespace { } } -BOOST_AUTO_UNIT_TEST(statistics) +SENF_AUTO_UNIT_TEST(statistics) { senf::Statistics stats; senf::log::StringTarget statslog; diff --git a/senf/Utils/String.test.cc b/senf/Utils/String.test.cc index 1ba4935..f351e07 100644 --- a/senf/Utils/String.test.cc +++ b/senf/Utils/String.test.cc @@ -36,14 +36,14 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(stringJoin) +SENF_AUTO_UNIT_TEST(stringJoin) { char const * seq[] = { "foo", "bar", "baz" }; BOOST_CHECK_EQUAL( senf::stringJoin(std::make_pair(seq, seq+sizeof(seq)/sizeof(seq[0])), "::"), "foo::bar::baz" ); } -BOOST_AUTO_UNIT_TEST(lexicalCast) +SENF_AUTO_UNIT_TEST(lexicalCast) { SENF_CHECK_NO_THROW( BOOST_CHECK_EQUAL( diff --git a/senf/Utils/Termlib/Telnet.test.cc b/senf/Utils/Termlib/Telnet.test.cc index 49ff472..e0f45bf 100644 --- a/senf/Utils/Termlib/Telnet.test.cc +++ b/senf/Utils/Termlib/Telnet.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(telnet) +SENF_AUTO_UNIT_TEST(telnet) { BOOST_CHECK( true ); } diff --git a/senf/Utils/Termlib/Terminfo.test.cc b/senf/Utils/Termlib/Terminfo.test.cc index 0bd5826..a55cd47 100644 --- a/senf/Utils/Termlib/Terminfo.test.cc +++ b/senf/Utils/Termlib/Terminfo.test.cc @@ -48,7 +48,7 @@ namespace std { } } -BOOST_AUTO_UNIT_TEST(terminfo) +SENF_AUTO_UNIT_TEST(terminfo) { senf::term::Terminfo ifo ("vt220"); senf::term::KeyParser kp (ifo); diff --git a/senf/Utils/Termlib/main.test.cc b/senf/Utils/Termlib/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Utils/Termlib/main.test.cc +++ b/senf/Utils/Termlib/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Utils/TypeIdValue.test.cc b/senf/Utils/TypeIdValue.test.cc index 7f9d816..94c5c34 100644 --- a/senf/Utils/TypeIdValue.test.cc +++ b/senf/Utils/TypeIdValue.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(typeIdValue) +SENF_AUTO_UNIT_TEST(typeIdValue) { // We don't care for the ordering, just that the following compiles (void) ( senf::typeIdValue() < senf::typeIdValue() ); diff --git a/senf/Utils/TypeInfo.test.cc b/senf/Utils/TypeInfo.test.cc index d89c977..9c6b796 100644 --- a/senf/Utils/TypeInfo.test.cc +++ b/senf/Utils/TypeInfo.test.cc @@ -48,7 +48,7 @@ namespace test { enum Blub { A, B, C }; } -BOOST_AUTO_UNIT_TEST(prettyName) +SENF_AUTO_UNIT_TEST(prettyName) { typedef test::Foo< test::Foo, 10> TestType; TestType ob; diff --git a/senf/Utils/auto_unit_test.hh b/senf/Utils/auto_unit_test.hh index 1163e69..c7e090a 100644 --- a/senf/Utils/auto_unit_test.hh +++ b/senf/Utils/auto_unit_test.hh @@ -90,9 +90,9 @@ \ingroup unittest */ -#define SENF_CHECK_NO_THROW(expr) \ - BOOST_CHECK_NO_THROW( \ - try { expr ; } \ +#define SENF_CHECK_NO_THROW(expr) \ + BOOST_CHECK_NO_THROW( \ + try { expr ; } \ catch (std::exception & e) { std::cerr << e.what() << std::endl; throw; } ) namespace senf { @@ -110,11 +110,36 @@ namespace test { numeric form (and not as single characters) if the elements are of any char type. Other types are not affected. + \hideinitializer \ingroup unittest */ -#define SENF_CHECK_EQUAL_COLLECTIONS(a,b,c,d) \ - BOOST_CHECK_EQUAL_COLLECTIONS(senf::test::nocharIterator(a), senf::test::nocharIterator(b), \ - senf::test::nocharIterator(c), senf::test::nocharIterator(d)) +#define SENF_CHECK_EQUAL_COLLECTIONS(left_begin, left_end, right_begin, right_end) \ + BOOST_CHECK_EQUAL_COLLECTIONS( \ + senf::test::nocharIterator(left_begin), senf::test::nocharIterator(left_end), \ + senf::test::nocharIterator(right_begin), senf::test::nocharIterator(right_end)) + +/** \brief Define new test case + + \ref SENF_AUTO_UNIT_TEST() is like \c BOOST_AUTO_UNIT_TEST(). The only difference is, that + if an exception is thrown in the test case \ref SENF_AUTO_UNIT_TEST() will write out the + complete what-message of the exception. + + \hideinitializer + \ingroup unittest + */ +#define SENF_AUTO_UNIT_TEST(name) \ + void senf_test_body_##name(); \ + BOOST_AUTO_UNIT_TEST(name) \ + { \ + try { \ + senf_test_body_##name(); \ + } \ + catch (std::exception & e) { \ + std::cerr << e.what() << std::endl; \ + throw; \ + } \ + } \ + void senf_test_body_##name() ///////////////////////////////hh.e//////////////////////////////////////// //#include "auto_unit_test.cci" diff --git a/senf/Utils/hexdump.test.cc b/senf/Utils/hexdump.test.cc index bd77e28..51b3122 100644 --- a/senf/Utils/hexdump.test.cc +++ b/senf/Utils/hexdump.test.cc @@ -36,7 +36,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(hExDuMp) +SENF_AUTO_UNIT_TEST(hExDuMp) { char data[] = { 0x18, 0x19, 0x20, 0x21, 0x7c, 0x7d, 0x7e, 0x7f }; std::stringstream s; diff --git a/senf/Utils/intrusive_refcount.test.cc b/senf/Utils/intrusive_refcount.test.cc index b86a137..dad19d1 100644 --- a/senf/Utils/intrusive_refcount.test.cc +++ b/senf/Utils/intrusive_refcount.test.cc @@ -70,7 +70,7 @@ namespace { unsigned TesterCustom::refs = 0; } -BOOST_AUTO_UNIT_TEST(intrusive_refcount) +SENF_AUTO_UNIT_TEST(intrusive_refcount) { BOOST_CHECK_EQUAL(Tester::counter,0u); @@ -94,7 +94,7 @@ BOOST_AUTO_UNIT_TEST(intrusive_refcount) BOOST_CHECK_EQUAL(Tester::counter,0u); } -BOOST_AUTO_UNIT_TEST(intrusive_refcount_t) +SENF_AUTO_UNIT_TEST(intrusive_refcount_t) { BOOST_CHECK_EQUAL(TesterCustom::counter,0u); BOOST_CHECK_EQUAL(TesterCustom::refs,0u); diff --git a/senf/Utils/main.test.cc b/senf/Utils/main.test.cc index 9f91d17..768c5aa 100644 --- a/senf/Utils/main.test.cc +++ b/senf/Utils/main.test.cc @@ -33,7 +33,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(testMain) +SENF_AUTO_UNIT_TEST(testMain) { BOOST_CHECK( true ); } diff --git a/senf/Utils/membind.test.cc b/senf/Utils/membind.test.cc index ad5be94..6c0818f 100644 --- a/senf/Utils/membind.test.cc +++ b/senf/Utils/membind.test.cc @@ -53,7 +53,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(membind) +SENF_AUTO_UNIT_TEST(membind) { Test instance; boost::function f1 (senf::membind(&Test::meth1,instance)); diff --git a/senf/Utils/mpl.test.cc b/senf/Utils/mpl.test.cc index 9591a96..98dd09e 100644 --- a/senf/Utils/mpl.test.cc +++ b/senf/Utils/mpl.test.cc @@ -70,7 +70,7 @@ namespace { struct C {}; } -BOOST_AUTO_UNIT_TEST(senfmpl) +SENF_AUTO_UNIT_TEST(senfmpl) { BOOST_CHECK( choice::has_int_value ); BOOST_CHECK( ! choice::has_class_value ); @@ -104,7 +104,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(mplSlot) +SENF_AUTO_UNIT_TEST(mplSlot) { BOOST_CHECK_EQUAL( unsigned(Test::total), 8u ); } diff --git a/senf/Utils/parameter.test.cc b/senf/Utils/parameter.test.cc index e946c97..4781cbf 100644 --- a/senf/Utils/parameter.test.cc +++ b/senf/Utils/parameter.test.cc @@ -35,7 +35,7 @@ #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(parameter) +SENF_AUTO_UNIT_TEST(parameter) {} ///////////////////////////////cc.e//////////////////////////////////////// diff --git a/senf/Utils/pool_alloc_mixin.test.cc b/senf/Utils/pool_alloc_mixin.test.cc index c042aa1..439a837 100644 --- a/senf/Utils/pool_alloc_mixin.test.cc +++ b/senf/Utils/pool_alloc_mixin.test.cc @@ -41,7 +41,7 @@ namespace { {}; } -BOOST_AUTO_UNIT_TEST(poolAllocMixin) +SENF_AUTO_UNIT_TEST(poolAllocMixin) { #ifdef SENF_DEBUG BOOST_CHECK_EQUAL( Test::allocCounter(), 0u ); diff --git a/senf/Utils/safe_bool.test.cc b/senf/Utils/safe_bool.test.cc index 95b7d7f..fb62fd8 100644 --- a/senf/Utils/safe_bool.test.cc +++ b/senf/Utils/safe_bool.test.cc @@ -54,7 +54,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(safeBool) +SENF_AUTO_UNIT_TEST(safeBool) { BOOST_CHECK( TestTrue() ); BOOST_CHECK( ! TestFalse() ); diff --git a/senf/Utils/singleton.test.cc b/senf/Utils/singleton.test.cc index 9d5785c..fa0dd9f 100644 --- a/senf/Utils/singleton.test.cc +++ b/senf/Utils/singleton.test.cc @@ -54,7 +54,7 @@ namespace { }; } -BOOST_AUTO_UNIT_TEST(sInGlEtOn) +SENF_AUTO_UNIT_TEST(sInGlEtOn) { BOOST_CHECK_EQUAL( Test::instance().foo(), 1234 ); BOOST_CHECK( Test::alive() ); @@ -116,7 +116,7 @@ namespace { } -BOOST_AUTO_UNIT_TEST(singletonAlive) +SENF_AUTO_UNIT_TEST(singletonAlive) { (void) AliveTest1::instance(); (void) AliveTest2::instance(); diff --git a/senf/Utils/type_traits.test.cc b/senf/Utils/type_traits.test.cc index 16b9b3f..0040416 100644 --- a/senf/Utils/type_traits.test.cc +++ b/senf/Utils/type_traits.test.cc @@ -41,7 +41,7 @@ namespace { struct Class; } -BOOST_AUTO_UNIT_TEST(typeTraits) +SENF_AUTO_UNIT_TEST(typeTraits) { typedef boost::function_traits traits;