summaryrefslogtreecommitdiff
path: root/cpp/src/tests/test_tools.h
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2010-10-21 19:05:01 +0000
committerAlan Conway <aconway@apache.org>2010-10-21 19:05:01 +0000
commit9be58b7519c45c682c36f8d70d8e9c7e1422a440 (patch)
tree1c7b7853aecea12187bde074f5710e62662ba23d /cpp/src/tests/test_tools.h
parent96df61d4f9c21fd330bdc2f30c571d047e4f722f (diff)
downloadqpid-python-9be58b7519c45c682c36f8d70d8e9c7e1422a440.tar.gz
Get rid of boost::regex in test code.
It was barely being used and it causes portability problems on older versions of boost. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1026103 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/test_tools.h')
-rw-r--r--cpp/src/tests/test_tools.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/cpp/src/tests/test_tools.h b/cpp/src/tests/test_tools.h
index bb2509fd32..de672f938a 100644
--- a/cpp/src/tests/test_tools.h
+++ b/cpp/src/tests/test_tools.h
@@ -23,7 +23,6 @@
#include <limits.h> // Include before boost/test headers.
#include <boost/test/test_tools.hpp>
#include <boost/assign/list_of.hpp>
-#include <boost/regex.hpp>
#include <boost/assign/list_of.hpp>
#include <vector>
#include <set>
@@ -75,21 +74,6 @@ bool operator == (const boost::assign_detail::generic_list<T>& b, const set<T>&
namespace qpid {
namespace tests {
-/** 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 <boost/regex.hpp> */
-#if (BOOST_VERSION < 103300)
- #define BOOST_CHECK_REGEX(re, text)
-#else
- #define BOOST_CHECK_REGEX(re, text) \
- BOOST_CHECK_PREDICATE(regexPredicate, (re)(text))
-#endif
-
/** Check if types of two objects (as given by typeinfo::name()) match. */
#define BOOST_CHECK_TYPEID_EQUAL(a,b) BOOST_CHECK_EQUAL(typeid(a).name(),typeid(b).name())