From 1d63a898503d20e3221be43fc222f0091971a0ce Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 30 May 2007 16:13:58 +0000 Subject: Logging infrastructure: See qpidd --long-help for details. * src/qpid/log/*: Logging infrastructure, QPID_LOG macro. * src/*: changed output to cout/cerr to logging. * src/qpidd.cpp: logging options. * src/tests/Makefile.am: fixed issues with valgrind * src/tests/kill|start_broker: use broker daemon options. * src/tests/run_test: run tests in valgrind. Disabled till leaks in client_test are fixed. * src/test/unit/logging.cpp: Logging unit test using boost test framework. Eventually we should move all unit tests to boost & drop CppUnit. * src/test/unit/test_tools.h: useful extensions to boost framework: Regular expression check, ostream << for vectors. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@542855 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/unit/test_tools.h | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 cpp/src/tests/unit/test_tools.h (limited to 'cpp/src/tests/unit/test_tools.h') diff --git a/cpp/src/tests/unit/test_tools.h b/cpp/src/tests/unit/test_tools.h new file mode 100644 index 0000000000..a941cf40eb --- /dev/null +++ b/cpp/src/tests/unit/test_tools.h @@ -0,0 +1,53 @@ +#ifndef TEST_TOOLS_H +#define TEST_TOOLS_H + +/* + * + * Copyright (c) 2006 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#define BOOST_AUTO_TEST_MAIN // Must come before #include +#include +#include +#include +#include + +/** Stream operator so BOOST_CHECK_EQUALS works on vectors. */ +namespace std { +template +ostream& operator <<(ostream& o, const vector& v) { + o << " {"; + typename vector::const_iterator i = v.begin(); + if (i != v.end()) + o << *i++; + while (i != v.end()) + o << ", " << *i++; + return o << "}"; +} +} // namespace std + +/** NB: order of parameters is regex first, in line with + * CHECK(expected, actual) convention. + */ +inline bool regexPredicate(const std::string& re, const std::string& text) { + return boost::regex_match(text, boost::regex(re)); +} + +/** Check for regular expression match. You must #include */ +#define BOOST_CHECK_REGEX(re, text) \ + BOOST_CHECK_PREDICATE(regexPredicate, (re)(text)) + +#endif /*!TEST_TOOLS_H*/ -- cgit v1.2.1