X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FTarget.test.cc;h=fbe00f484a67abe7ed10b2cc6a126134e0d9a8f2;hb=HEAD;hp=441bbd82a1f2b4880f557ecc502277dd96e016be;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git diff --git a/senf/Utils/Logger/Target.test.cc b/senf/Utils/Logger/Target.test.cc index 441bbd8..fbe00f4 100644 --- a/senf/Utils/Logger/Target.test.cc +++ b/senf/Utils/Logger/Target.test.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief Target unit tests */ @@ -34,20 +39,20 @@ #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(); } @@ -59,11 +64,11 @@ 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 +78,18 @@ SENF_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 +105,7 @@ SENF_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 +115,7 @@ SENF_AUTO_UNIT_TEST(target) BOOST_CHECK_EQUAL( target.size(), 0u ); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_