X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FTarget.test.cc;h=0a8a299f845ba111da033114ea7bb11aea78c765;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=1a643b0594f77cb4393dc6c0aa7d2063d4587826;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Utils/Logger/Target.test.cc b/senf/Utils/Logger/Target.test.cc index 1a643b0..0a8a299 100644 --- a/senf/Utils/Logger/Target.test.cc +++ b/senf/Utils/Logger/Target.test.cc @@ -30,24 +30,24 @@ #include #include "main.test.hh" -#include "../../Utils/auto_unit_test.hh" +#include #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { - + struct RouteCheck { typedef std::string result_type; std::string operator()(senf::log::Target::RoutingEntry const & entry) const { - static char const * levels[] = { + static char const * levels[] = { "NONE", "VERBOSE", "NOTICE", "MESSAGE", "IMPORTANT", "CRITICAL", "FATAL", "DISABLED" }; static char const * actions[] = { "ACCEPT", "REJECT" }; std::stringstream s; - s << entry.stream() << "-" << entry.area() << "-" << levels[entry.level()] << "-" + s << entry.stream() << "-" << entry.area() << "-" << levels[entry.level()] << "-" << actions[entry.action()]; return s.str(); } @@ -55,15 +55,15 @@ namespace { } -BOOST_AUTO_UNIT_TEST(target) +SENF_AUTO_UNIT_TEST(target) { senf::log::StringTarget target; - BOOST_CHECK_THROW( target.route("senf::log::test::myStream", "invalid_area"), + BOOST_CHECK_THROW( target.route("senf::log::test::myStream", "invalid_area"), senf::log::Target::InvalidAreaException ); BOOST_CHECK_THROW( target.route("invalid_stream", ""), senf::log::Target::InvalidStreamException ); - BOOST_CHECK_THROW( target.unroute("senf::log::test::myStream", "invalid_area"), + BOOST_CHECK_THROW( target.unroute("senf::log::test::myStream", "invalid_area"), senf::log::Target::InvalidAreaException ); BOOST_CHECK_THROW( target.unroute("invalid_stream", ""), senf::log::Target::InvalidStreamException ); @@ -73,18 +73,18 @@ BOOST_AUTO_UNIT_TEST(target) target.route(senf::log::Target::ACCEPT, 0); target.route( senf::log::Target::ACCEPT, 2); - target.route("senf::log::test::myStream", "", senf::log::IMPORTANT::value, + target.route("senf::log::test::myStream", "", senf::log::IMPORTANT::value, senf::log::Target::REJECT, 4); target.route("senf::log::Debug", "senf::log::test::Foo", senf::log::VERBOSE::value, senf::log::Target::REJECT, -5); - target.route("senf::log::Debug", "", senf::log::MESSAGE::value, + target.route("senf::log::Debug", "", senf::log::MESSAGE::value, senf::log::Target::ACCEPT, -7); typedef boost::transform_iterator iterator; iterator i (boost::make_transform_iterator(target.begin(), RouteCheck())); iterator const i_end (boost::make_transform_iterator(target.end(), RouteCheck())); - char const * data[] = { + char const * data[] = { "senf::log::Debug--MESSAGE-ACCEPT", "senf::log::test::myStream--VERBOSE-ACCEPT", "senf::log::Debug-senf::log::test::Foo-VERBOSE-REJECT", @@ -100,7 +100,7 @@ BOOST_AUTO_UNIT_TEST(target) target.unroute(); target.unroute(); target.unroute(senf::log::Target::REJECT); - target.unroute("senf::log::test::myStream", "", senf::log::IMPORTANT::value, + target.unroute("senf::log::test::myStream", "", senf::log::IMPORTANT::value, senf::log::Target::REJECT); target.unroute(1); target.flush(); @@ -110,7 +110,7 @@ BOOST_AUTO_UNIT_TEST(target) BOOST_CHECK_EQUAL( target.size(), 0u ); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_